diff --git a/rtt_roscomm/CMakeLists.txt b/rtt_roscomm/CMakeLists.txt
index d5efc936..64cedc83 100644
--- a/rtt_roscomm/CMakeLists.txt
+++ b/rtt_roscomm/CMakeLists.txt
@@ -34,7 +34,7 @@ orocos_generate_package(
 )
 
 install(PROGRAMS 
-  scripts/create_rtt_pkg
+  scripts/create_rtt_msgs
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(
@@ -50,5 +50,5 @@ install(PROGRAMS cmake/create_boost_header.py DESTINATION ${CATKIN_PACKAGE_SHARE
 file(COPY src/templates DESTINATION "${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/src")
 install(DIRECTORY src/templates DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src)
 
-# This one will only be used by create_rtt_pkg with `rospack find rtt_roscomm` => no devel-space installation
+# This one will only be used by create_rtt_msgs with `rospack find rtt_roscomm` => no devel-space installation
 install(DIRECTORY rtt_roscomm_pkg_template DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/rtt_roscomm/scripts/create_rtt_pkg b/rtt_roscomm/scripts/create_rtt_msgs
similarity index 100%
rename from rtt_roscomm/scripts/create_rtt_pkg
rename to rtt_roscomm/scripts/create_rtt_msgs
diff --git a/tests/rtt_roscomm_tests/test/message_package/test_message_package.bash b/tests/rtt_roscomm_tests/test/message_package/test_message_package.bash
index 77861825..b45a3c60 100755
--- a/tests/rtt_roscomm_tests/test/message_package/test_message_package.bash
+++ b/tests/rtt_roscomm_tests/test/message_package/test_message_package.bash
@@ -18,6 +18,6 @@ catkin_make -j1
 # Generate and build the rtt typekit package
 source devel/setup.bash
 cd src
-rosrun rtt_roscomm create_rtt_pkg my_msgs
+rosrun rtt_roscomm create_rtt_msgs my_msgs
 cd ..
 catkin_make -j1