diff --git a/core/roslib/cmake/roslib-extras.cmake.em b/core/roslib/cmake/roslib-extras.cmake.em
index ed89ff5a..bf4742b8 100644
--- a/core/roslib/cmake/roslib-extras.cmake.em
+++ b/core/roslib/cmake/roslib-extras.cmake.em
@@ -1,7 +1,7 @@
 # generated from ros/core/roslib/cmake/roslib-extras.cmake.em
 
-@[if BUILDSPACE]@
-# set path to gendeps executable in buildspace
+@[if DEVELSPACE]@
+# set path to gendeps executable in develspace
 set(gendeps_exe @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gendeps)
 @[else]@
 # set path to gendeps executable in installspace
diff --git a/core/roslib/env-hooks/10.ros.bat.em b/core/roslib/env-hooks/10.ros.bat.em
index 366e26f7..300d6f3b 100644
--- a/core/roslib/env-hooks/10.ros.bat.em
+++ b/core/roslib/env-hooks/10.ros.bat.em
@@ -21,11 +21,11 @@ setlocal EnableDelayedExpansion
 set ROS_PACKAGE_PATH_PARENTS=
 for /f %%a in ('python _parent_package_path.py') do set ROS_PACKAGE_PATH_PARENTS=!ROS_PACKAGE_PATH_PARENTS!%%a
 
-@[if BUILDSPACE]@
-REM env variables in buildspace
+@[if DEVELSPACE]@
+REM env variables in develspace
 set ROS_PACKAGE_PATH=@(CMAKE_SOURCE_DIR)$ROS_PACKAGE_PATH_PARENTS
 set ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)
-set ROS_ETC_DIR=@(CATKIN_BUILD_PREFIX)/@(CATKIN_PACKAGE_ETC_DESTINATION)
+set ROS_ETC_DIR=@(CATKIN_DEVEL_PREFIX)/@(CATKIN_PACKAGE_ETC_DESTINATION)
 @[else]@
 REM env variables in installspace
 set ROS_PACKAGE_PATH=@(CMAKE_INSTALL_PREFIX)/share:@(CMAKE_INSTALL_PREFIX)/stacks$ROS_PACKAGE_PATH_PARENTS
diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em
index 3805f75a..3f920345 100644
--- a/core/roslib/env-hooks/10.ros.sh.em
+++ b/core/roslib/env-hooks/10.ros.sh.em
@@ -11,10 +11,10 @@ from __future__ import print_function
 import os
 env_name = 'CMAKE_PREFIX_PATH'
 paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
-workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.CATKIN_WORKSPACE'))]
+workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
 paths = []
 for workspace in workspaces:
-    filename = os.path.join(workspace, '.CATKIN_WORKSPACE')
+    filename = os.path.join(workspace, '.catkin')
     data = ''
     with open(filename) as f:
         data = f.read()
@@ -29,10 +29,10 @@ EOF
 )
 export ROS_PACKAGE_PATH=`python -c "$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH"`
 
-@[if BUILDSPACE]@
-# env variables in buildspace
+@[if DEVELSPACE]@
+# env variables in develspace
 export ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)/../..
-export ROS_ETC_DIR=@(CATKIN_BUILD_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros
+export ROS_ETC_DIR=@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros
 @[else]@
 # env variables in installspace
 export ROS_ROOT=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_GLOBAL_SHARE_DESTINATION)/ros
diff --git a/tools/rosbash/CMakeLists.txt b/tools/rosbash/CMakeLists.txt
index 90ad3a89..cfb2b8cc 100644
--- a/tools/rosbash/CMakeLists.txt
+++ b/tools/rosbash/CMakeLists.txt
@@ -11,7 +11,7 @@ install(PROGRAMS scripts/rosrun
 # making toplevel forward script for bash script rosrun
 set(BASH_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/rosrun)
 configure_file(${catkin_EXTRAS_DIR}/templates/script.bash.in
-  ${CATKIN_BUILD_PREFIX}/bin/rosrun
+  ${CATKIN_DEVEL_PREFIX}/bin/rosrun
   @ONLY)
 
 catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
diff --git a/tools/rosbash/env-hooks/15.rosbash.bash.em b/tools/rosbash/env-hooks/15.rosbash.bash.em
index cf562f5e..f4335b9a 100644
--- a/tools/rosbash/env-hooks/15.rosbash.bash.em
+++ b/tools/rosbash/env-hooks/15.rosbash.bash.em
@@ -1,6 +1,6 @@
 # generated from rosbash/env-hooks/15.rosbash.bash.em
 
-@[if BUILDSPACE]@
+@[if DEVELSPACE]@
 . @(CMAKE_CURRENT_SOURCE_DIR)/rosbash
 @[else]@
 . @(CMAKE_INSTALL_PREFIX)/share/rosbash/rosbash
diff --git a/tools/rosbash/env-hooks/15.rosbash.tcsh.em b/tools/rosbash/env-hooks/15.rosbash.tcsh.em
index e18f091f..9c0ba3eb 100644
--- a/tools/rosbash/env-hooks/15.rosbash.tcsh.em
+++ b/tools/rosbash/env-hooks/15.rosbash.tcsh.em
@@ -1,6 +1,6 @@
 # generated from rosbash/env-hooks/15.rosbash.tcsh.em
 
-@[if BUILDSPACE]@
+@[if DEVELSPACE]@
 . @(CMAKE_CURRENT_SOURCE_DIR)/rostcsh
 @[else]@
 . @(CMAKE_INSTALL_PREFIX)/share/rosbash/rostcsh
diff --git a/tools/rosbash/env-hooks/15.rosbash.zsh.em b/tools/rosbash/env-hooks/15.rosbash.zsh.em
index c05dc6bc..49f271a5 100644
--- a/tools/rosbash/env-hooks/15.rosbash.zsh.em
+++ b/tools/rosbash/env-hooks/15.rosbash.zsh.em
@@ -1,6 +1,6 @@
 # generated from rosbash/env-hooks/15.rosbash.zsh.em
 
-@[if BUILDSPACE]@
+@[if DEVELSPACE]@
 . @(CMAKE_CURRENT_SOURCE_DIR)/roszsh
 @[else]@
 . @(CMAKE_INSTALL_PREFIX)/share/rosbash/roszsh
diff --git a/tools/rosunit/cmake/rosunit-extras.cmake.em b/tools/rosunit/cmake/rosunit-extras.cmake.em
index b07494c0..94d97ac5 100644
--- a/tools/rosunit/cmake/rosunit-extras.cmake.em
+++ b/tools/rosunit/cmake/rosunit-extras.cmake.em
@@ -1,8 +1,8 @@
 include(CMakeParseArguments)
 
 macro(rosunit_initialize_tests)
-@[if BUILDSPACE]@
-  # find program in buildspace
+@[if DEVELSPACE]@
+  # find program in develspace
   find_program_required(ROSUNIT_EXE rosunit
     PATHS @(PROJECT_SOURCE_DIR)/scripts
     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)