diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986ff95..a59c9bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(rosbridge_gui_example)
+project(rosbridge_gui)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
@@ -82,7 +82,7 @@ find_package(catkin REQUIRED COMPONENTS
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
 #  INCLUDE_DIRS include
-#  LIBRARIES rosbridge_gui_example
+#  LIBRARIES rosbridge_gui
 #  CATKIN_DEPENDS roscpp rospy std_msgs
 #  DEPENDS system_lib
 )
@@ -99,8 +99,8 @@ include_directories(
 )
 
 ## Declare a cpp library
-# add_library(rosbridge_gui_example
-#   src/${PROJECT_NAME}/rosbridge_gui_example.cpp
+# add_library(rosbridge_gui
+#   src/${PROJECT_NAME}/rosbridge_gui.cpp
 # )
 
 ## Declare a cpp executable
@@ -108,7 +108,7 @@ include_directories(
 
 ## Add cmake target dependencies of the executable/library
 ## as an example, message headers may need to be generated before nodes
-# add_dependencies(rosbridge_gui_example_node rosbridge_gui_example_generate_messages_cpp)
+# add_dependencies(rosbridge_gui_node rosbridge_gui_generate_messages_cpp)
 
 ## Specify libraries to link a library or executable target against
 
@@ -127,7 +127,7 @@ include_directories(
 # )
 
 ## Mark executables and/or libraries for installation
-# install(TARGETS rosbridge_gui_example rosbridge_gui_example_node
+# install(TARGETS rosbridge_gui rosbridge_gui_node
 #   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 #   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 #   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
@@ -152,7 +152,7 @@ include_directories(
 #############
 
 ## Add gtest based cpp test target and link libraries
-# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_gui_example.cpp)
+# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_gui.cpp)
 # if(TARGET ${PROJECT_NAME}-test)
 #   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
 # endif()
diff --git a/data/test_bag_2015-07-01-12-38-32.bag b/data/test_bag_2015-07-01-12-38-32.bag
new file mode 100644
index 0000000..4ca6e05
Binary files /dev/null and b/data/test_bag_2015-07-01-12-38-32.bag differ
diff --git a/launch.bash b/launch.bash
index 3f66973..8958e3d 100644
--- a/launch.bash
+++ b/launch.bash
@@ -19,7 +19,7 @@ trap "kill_child_processes 1 $$; exit 0" INT
 
 chmod a+x src/bagger.py
 
-x-terminal-emulator -e "roslaunch rosbridge_gui_example all.launch" &
+x-terminal-emulator -e "roslaunch rosbridge_gui all.launch" &
 x-terminal-emulator -e "python -m SimpleHTTPServer 8000" &
 x-terminal-emulator -e "rosrun web_video_server web_video_server"
 
diff --git a/launch/all.launch b/launch/all.launch
index 879051b..759dad6 100644
--- a/launch/all.launch
+++ b/launch/all.launch
@@ -1,5 +1,5 @@
 <launch>
 	<include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" />
-    <include file="$(find rosbridge_gui_example)/launch/bagger.launch" />
-    <include file="$(find rosbridge_gui_example)/launch/talker.launch" />
+    <include file="$(find rosbridge_gui)/launch/bagger.launch" />
+    <include file="$(find rosbridge_gui)/launch/talker.launch" />
 </launch>
diff --git a/launch/bagger.launch b/launch/bagger.launch
index 371dd4a..45f048c 100644
--- a/launch/bagger.launch
+++ b/launch/bagger.launch
@@ -1,3 +1,3 @@
 <launch>
-   <node name="bagger" pkg="rosbridge_gui_example" type="bagger.py" /> 
+   <node name="bagger" pkg="rosbridge_gui" type="bagger.py" />
 </launch>
diff --git a/launch/talker.launch b/launch/talker.launch
index d1c7241..51399f1 100644
--- a/launch/talker.launch
+++ b/launch/talker.launch
@@ -1,3 +1,3 @@
 <launch>
-   <node name="talker" pkg="rosbridge_gui_example" type="talker.py" /> 
+   <node name="talker" pkg="rosbridge_gui" type="talker.py" />
 </launch>
diff --git a/package.xml b/package.xml
index 2f1e587..ff79b60 100644
--- a/package.xml
+++ b/package.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <package>
-  <name>rosbridge_gui_example</name>
+  <name>rosbridge_gui</name>
   <version>0.0.0</version>
-  <description>The rosbridge_gui_example package</description>
+  <description>The rosbridge_gui package</description>
 
-  <!-- One maintainer tag required, multiple allowed, one person per tag --> 
+  <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
   <maintainer email="turner.glen@gmail.com">glen</maintainer>
@@ -47,4 +47,4 @@
     <!-- Other tools can request additional information be placed here -->
 
   </export>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/bagger.py b/src/bagger.py
index 3b48c8e..74977f7 100755
--- a/src/bagger.py
+++ b/src/bagger.py
@@ -14,7 +14,7 @@ class Bagger(object):
         self.pub = rospy.Publisher("bag_notifier", String, queue_size=10)
         self.proc = None
         rospack = rospkg.RosPack()
-        self.data_path = os.path.join(rospack.get_path("rosbridge_gui_example"), "data")
+        self.data_path = os.path.join(rospack.get_path("rosbridge_gui"), "data")
 
     def callback(self, msg):
         if msg.data == "STOP" and self.proc is not None: