diff --git a/.project b/.project
index 30e95c1635f8c915aa82405389161a5a74126b92..9f7b0779445dddcf989aa56bcab0b6c5448f75d9 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>rosjava_tools</name>
+	<name>rosjava_build_tools</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/.pydevproject b/.pydevproject
index c9648ba1d0173844007c4d1307f8c5b00309cc1b..ea37f3283a099e4a1098eb8615c61d85bf15422d 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/rosjava_tools/src</path>
+<path>/rosjava_build_tools/src</path>
 </pydev_pathproperty>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d02a476a9ff512254722e6329355135db20ed685..67e2e9b007a6f147da6d660a17a245b8a4f8a6ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 ##############################################################################
 
 cmake_minimum_required(VERSION 2.8.3)
-project(rosjava_tools)
+project(rosjava_build_tools)
 
 ##############################################################################
 # Catkin
@@ -22,12 +22,12 @@ catkin_add_env_hooks(15.rosjava SHELLS bash DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR
 # Have to install gradle here so we can retain executable permissions
 # If we do via setup.py with the data subsection, it loses permissions
 install(
-    PROGRAMS src/rosjava_tools/gradle/gradlew
+    PROGRAMS src/rosjava_build_tools/gradle/gradlew
     DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
     )
 
 install(
-    DIRECTORY src/rosjava_tools/gradle/gradle
+    DIRECTORY src/rosjava_build_tools/gradle/gradle
     DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
   )
 
diff --git a/README.md b/README.md
index c7f8ccdb127c051c9620048ffa7c9a719d26c9ba..89df68889d6f586f17203ee9aaa3daac7b2a1b60 100644
--- a/README.md
+++ b/README.md
@@ -12,19 +12,19 @@ scripts.
 > cd ~/rosjava/src
 > catkin_init_workspace .
 > wstool init .
-> wstool set rosjava_tools --git https://github.com/ros-java/rosjava_tools -v hydro-devel
+> wstool set rosjava_build_tools --git https://github.com/rosjava/rosjava_build_tools -v hydro-devel
 > wstool set rosjava_core --git https://github.com/rosjava/rosjava_core -v hydro-devel
 > wstool update
 > cd ~/rosjava
 > catkin_make
 ```
 
-The only changes made to the `rosjava_core` repo was to add a `package.xml` with a depends on `rosjava_tools` and a
+The only changes made to the `rosjava_core` repo was to add a `package.xml` with a depends on `rosjava_build_tools` and a
 changes to the `CMakeLists.txt` as follows:
 
 ```
 ...
-find_package(catkin REQUIRED rosjava_tools)
+find_package(catkin REQUIRED rosjava_build_tools)
 
 catkin_rosjava_setup()
 ```
@@ -47,7 +47,7 @@ It also adds a global and package `gradle-clean` target.
 
 ## Android Build Demo
 
-Refer to http://ros.org/wiki/rosjava_tools.
+Refer to http://ros.org/wiki/rosjava_build_tools.
 
 ## Moving
 
diff --git a/android_apps.rosinstall b/android_apps.rosinstall
index 0e862c074bb79606c80c1122f43dcacea60c7027..0b2e1350123338b33e4b618048dc3fb7551bc635 100644
--- a/android_apps.rosinstall
+++ b/android_apps.rosinstall
@@ -1,5 +1,5 @@
 #
-# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
+# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
 #
 # Take out for now - awful dependencies on create and follower messages
 # {'git': {'local-name': 'turtlebot_android', 'version': 'hydro-devel', 'uri':'https://github.com/turtlebot/turtlebot_android'}},
diff --git a/android_core.rosinstall b/android_core.rosinstall
index 467380ca3c18dc30fe49a5ec9332cf196e6c6826..3ab04b00f103bdf463aa502001b3dee09d4a266b 100644
--- a/android_core.rosinstall
+++ b/android_core.rosinstall
@@ -1,5 +1,5 @@
 #
-# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
+# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
 #
 [
 {'git': {'local-name': 'android_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/android_core'}},
diff --git a/env-hooks/15.rosjava.bash.em b/env-hooks/15.rosjava.bash.em
index dcbedf1d7620bf14770eda5b484737e6760d80c1..53562312148f6cc14cb6d6da9ae29e4b2e2d11b2 100644
--- a/env-hooks/15.rosjava.bash.em
+++ b/env-hooks/15.rosjava.bash.em
@@ -4,7 +4,7 @@
 export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py`
 export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py --deployment-repository`
 @[else]@
-export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_tools/generate_ros_maven_path.py`
+export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_ros_maven_path.py`
 @[end if]@
 
 
diff --git a/package.xml b/package.xml
index a1d0c5124acd40dbc343ec982dfd71ea7a8a2de7..9623d7140c2a10b735815862c428ad57b4334e24 100644
--- a/package.xml
+++ b/package.xml
@@ -1,14 +1,14 @@
 <package>
-  <name>rosjava_tools</name>
+  <name>rosjava_build_tools</name>
   <version>0.1.12</version>
   <description>
     Simple tools and catkin modules for rosjava development. 
   </description>
   <maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
   <license>BSD</license>
-  <url type="website">http://ros.org/wiki/rosjava_tools</url>
-  <url type="repository">https://github.com/ros-java/rosjava_tools</url>
-  <url type="bugtracker">https://github.com/ros-java/rosjava_tools/issues</url>
+  <url type="website">http://ros.org/wiki/rosjava_build_tools</url>
+  <url type="repository">https://github.com/ros-java/rosjava_build_tools</url>
+  <url type="bugtracker">https://github.com/ros-java/rosjava_build_tools/issues</url>
   <author email="d.stonier@gmail.com">Daniel Stonier</author>
 
   <buildtool_depend>catkin</buildtool_depend>
diff --git a/rosjava.rosinstall b/rosjava.rosinstall
index 8c914cea017eca83b1b66773077a4583cde68cf3..e2b8570e2eca8bd3d8353bf0a35878a72f212ff4 100644
--- a/rosjava.rosinstall
+++ b/rosjava.rosinstall
@@ -5,7 +5,7 @@
 #
 # rocon_msgs is currently included since it is still changing reasonably often in source and less so in deb.
 [
-{'git': {'local-name': 'rosjava_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_tools.git'}},
+{'git': {'local-name': 'rosjava_build_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
 {'git': {'local-name': 'rosjava_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_core.git'}},
 {'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite.git'}},
 {'git': {'local-name': 'rosjava_extras', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_extras.git'}},
diff --git a/scripts/catkin_create_android_library_pkg b/scripts/catkin_create_android_library_pkg
index df162f82303644cc9530321ec5ba3f5b1438de9d..2be396386b0ff16cf04cd001badc652d7bce6ed1 100755
--- a/scripts/catkin_create_android_library_pkg
+++ b/scripts/catkin_create_android_library_pkg
@@ -11,8 +11,8 @@ import argparse
 import os
 import sys
 
-from rosjava_tools import create_android_package
-import rosjava_tools.console as console
+from rosjava_build_tools import create_android_package
+import rosjava_build_tools.console as console
 
 ##############################################################################
 # Main
diff --git a/scripts/catkin_create_android_pkg b/scripts/catkin_create_android_pkg
index e6b27c9efa5e3c301131e2e20c82fb4725fa4bda..8abff1309c6c54b6ed695d9da41a58cf4e980fdd 100755
--- a/scripts/catkin_create_android_pkg
+++ b/scripts/catkin_create_android_pkg
@@ -11,8 +11,8 @@ import argparse
 import os
 import sys
 
-from rosjava_tools import create_android_package
-import rosjava_tools.console as console
+from rosjava_build_tools import create_android_package
+import rosjava_build_tools.console as console
 
 ##############################################################################
 # Main
diff --git a/scripts/catkin_create_android_repo b/scripts/catkin_create_android_repo
index e92767c0762f8fc7fa8868c9614d046aa6f046a1..5356e282627640a4763a28a5ddb7d0550b763de7 100755
--- a/scripts/catkin_create_android_repo
+++ b/scripts/catkin_create_android_repo
@@ -11,8 +11,8 @@ import argparse
 import os
 import sys
 
-from rosjava_tools import init_android_repo
-import rosjava_tools.console as console
+from rosjava_build_tools import init_android_repo
+import rosjava_build_tools.console as console
 
 ##############################################################################
 # Main
diff --git a/setup.py b/setup.py
index a432a20ecebd05b43294c12f4e1cf05554800f10..c6816e89400a7d957aec84c16003b0169f14e800 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,13 @@ from distutils.core import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(
-    packages=['rosjava_tools'],
+    packages=['rosjava_build_tools'],
     package_dir={'': 'src'},
     scripts=['scripts/catkin_create_android_repo',
              'scripts/catkin_create_android_pkg',
              'scripts/catkin_create_android_library_pkg'
             ],
-    package_data = {'rosjava_tools': [
+    package_data = {'rosjava_build_tools': [
            'templates/android_package/*',
            'templates/init_repo/*',
         ]},
diff --git a/src/rosjava_tools/__init__.py b/src/rosjava_build_tools/__init__.py
similarity index 83%
rename from src/rosjava_tools/__init__.py
rename to src/rosjava_build_tools/__init__.py
index 625e73b1701c3518d36be7e036c06cf33f682fcf..000048303119e6ba85715d6f4d2f5873b3fa8932 100644
--- a/src/rosjava_tools/__init__.py
+++ b/src/rosjava_build_tools/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # License: Apache 2.0
-#   https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
+#   https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
 #
 
 ##############################################################################
diff --git a/src/rosjava_tools/console.py b/src/rosjava_build_tools/console.py
similarity index 97%
rename from src/rosjava_tools/console.py
rename to src/rosjava_build_tools/console.py
index b5681767ab1f071d38ca33e13b468174666d243d..0f1fa1ba79357f617206126c8055e73df7bf0021 100644
--- a/src/rosjava_tools/console.py
+++ b/src/rosjava_build_tools/console.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # License: Apache 2.0
-#   https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
+#   https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
 #
 
 ##############################################################################
diff --git a/src/rosjava_tools/create_package.py b/src/rosjava_build_tools/create_package.py
similarity index 99%
rename from src/rosjava_tools/create_package.py
rename to src/rosjava_build_tools/create_package.py
index 049cb195a433628c72d60cad144ea0fcf2254a45..1b14a4a82ee28a7c86da247d4e4c85c1b9b21f6d 100644
--- a/src/rosjava_tools/create_package.py
+++ b/src/rosjava_build_tools/create_package.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # License: Apache 2.0
-#   https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
+#   https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
 #
 
 ##############################################################################
diff --git a/src/rosjava_tools/gradle/Readme.md b/src/rosjava_build_tools/gradle/Readme.md
similarity index 100%
rename from src/rosjava_tools/gradle/Readme.md
rename to src/rosjava_build_tools/gradle/Readme.md
diff --git a/src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.jar b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.jar
rename to src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.properties b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.properties
rename to src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/rosjava_tools/gradle/gradlew b/src/rosjava_build_tools/gradle/gradlew
similarity index 100%
rename from src/rosjava_tools/gradle/gradlew
rename to src/rosjava_build_tools/gradle/gradlew
diff --git a/src/rosjava_tools/init_repo.py b/src/rosjava_build_tools/init_repo.py
similarity index 97%
rename from src/rosjava_tools/init_repo.py
rename to src/rosjava_build_tools/init_repo.py
index 31096debf9a7e5be9a76f16ffb1b932141eb23f1..1db93152da048b8ced737d52fc0bfec8f4cfde74 100644
--- a/src/rosjava_tools/init_repo.py
+++ b/src/rosjava_build_tools/init_repo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # License: Apache 2.0
-#   https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
+#   https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
 #
 
 ##############################################################################
@@ -120,8 +120,8 @@ def create_catkin_package_files(package_name, package_path, args):
     '''
     try:
         build_depends = []
-        if 'rosjava_tools' not in args.dependencies:
-            build_depends.append(catkin_pkg.package.Dependency('rosjava_tools'))
+        if 'rosjava_build_tools' not in args.dependencies:
+            build_depends.append(catkin_pkg.package.Dependency('rosjava_build_tools'))
         for depend_name in args.dependencies:
             build_depends.append(catkin_pkg.package.Dependency(depend_name))
         package_template = PackageTemplate._create_package_template(
diff --git a/src/rosjava_tools/templates/android_package/build.gradle.in b/src/rosjava_build_tools/templates/android_package/build.gradle.in
similarity index 100%
rename from src/rosjava_tools/templates/android_package/build.gradle.in
rename to src/rosjava_build_tools/templates/android_package/build.gradle.in
diff --git a/src/rosjava_tools/templates/init_repo/CMakeLists.txt.in b/src/rosjava_build_tools/templates/init_repo/CMakeLists.txt.in
similarity index 89%
rename from src/rosjava_tools/templates/init_repo/CMakeLists.txt.in
rename to src/rosjava_build_tools/templates/init_repo/CMakeLists.txt.in
index 8dbfb9a616b325f8f3c386935cbf7279620ca516..0b6c4e8b8de5cc267b6b4c3110f1442ee5c66f50 100644
--- a/src/rosjava_tools/templates/init_repo/CMakeLists.txt.in
+++ b/src/rosjava_build_tools/templates/init_repo/CMakeLists.txt.in
@@ -9,6 +9,6 @@ project(%(repo_name)s)
 # Catkin
 ##############################################################################
 
-find_package(catkin REQUIRED rosjava_tools)
+find_package(catkin REQUIRED rosjava_build_tools)
 catkin_android_setup()
 catkin_package()
diff --git a/src/rosjava_tools/templates/init_repo/build.gradle.in b/src/rosjava_build_tools/templates/init_repo/build.gradle.in
similarity index 100%
rename from src/rosjava_tools/templates/init_repo/build.gradle.in
rename to src/rosjava_build_tools/templates/init_repo/build.gradle.in
diff --git a/src/rosjava_tools/templates/init_repo/settings.gradle b/src/rosjava_build_tools/templates/init_repo/settings.gradle
similarity index 100%
rename from src/rosjava_tools/templates/init_repo/settings.gradle
rename to src/rosjava_build_tools/templates/init_repo/settings.gradle
diff --git a/src/rosjava_tools/utils.py b/src/rosjava_build_tools/utils.py
similarity index 97%
rename from src/rosjava_tools/utils.py
rename to src/rosjava_build_tools/utils.py
index 735d54eb4246343f9f8d89fcb1d2ba8629f98b14..c7aaffb2d9dc0120ff24602db3328d4822cc202d 100644
--- a/src/rosjava_tools/utils.py
+++ b/src/rosjava_build_tools/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # License: Apache 2.0
-#   https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
+#   https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
 #
 
 ##############################################################################