diff --git a/urdf_editor/CMakeLists.txt b/urdf_editor/CMakeLists.txt
index b6a4c99..6396f5c 100644
--- a/urdf_editor/CMakeLists.txt
+++ b/urdf_editor/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(urdf_builder)
+project(urdf_editor)
 
 find_package(catkin REQUIRED
   COMPONENTS
diff --git a/urdf_editor/launch/start.launch b/urdf_editor/launch/start.launch
index abcb47a..af99276 100644
--- a/urdf_editor/launch/start.launch
+++ b/urdf_editor/launch/start.launch
@@ -6,7 +6,7 @@
   <arg name="debug_new_win" default="true" />
 
   <arg     if="$(arg debug)" name="launch_prefix"
-    value="gdb -x $(find urdf_builder)/launch/gdb_settings.gdb --ex run --args" />
+    value="gdb -x $(find urdf_editor)/launch/gdb_settings.gdb --ex run --args" />
   <arg unless="$(arg debug)" name="launch_prefix" value="" />
 
   <!-- bit of a dance to only start in a new window if 'debug == true'
@@ -18,6 +18,6 @@
     value="$(arg launch_prefix2) $(arg launch_prefix)" />
   <arg unless="$(arg debug)" name="launch_prefix3" value="$(arg launch_prefix)" />
 
-  <node name="urdf_editor" pkg="urdf_builder" type="urdf_builder" required="true"
+  <node name="urdf_editor" pkg="urdf_editor" type="urdf_editor" required="true"
     launch-prefix="$(arg launch_prefix3)" output="screen"/>
 </launch>
diff --git a/urdf_editor/package.xml b/urdf_editor/package.xml
index e558ce0..0445342 100644
--- a/urdf_editor/package.xml
+++ b/urdf_editor/package.xml
@@ -1,5 +1,5 @@
 <package>
-  <name>urdf_builder</name>
+  <name>urdf_editor</name>
   <version>0.0.1</version>
   <description>
      This is an editor for creating and modifying urdf files.
diff --git a/urdf_editor/src/main.cpp b/urdf_editor/src/main.cpp
index 8e23c28..98601dd 100644
--- a/urdf_editor/src/main.cpp
+++ b/urdf_editor/src/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char *argv[])
 {
   if (!ros::isInitialized())
   {
-    ros::init(argc, argv, "urdf_builder");
+    ros::init(argc, argv, "urdf_editor");
   }
 
   QApplication a(argc, argv);