diff --git a/Tools/adb_upload_to_bebop.sh b/Tools/adb_upload_to_bebop.sh
index b372b45520..c8b16d98f7 100755
--- a/Tools/adb_upload_to_bebop.sh
+++ b/Tools/adb_upload_to_bebop.sh
@@ -34,7 +34,7 @@ adb shell mount -o remount,rw /
 adb shell touch /home/root/parameters
 adb shell mkdir -p /data/ftp/internal_000/fs/microsd
 
-${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-strip \
+${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-strip \
   -R .comment -R .gnu.version \
   ../build_posix_bebop_default/src/firmware/posix/px4
 
diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake
index a65ed2da79..9cefbf6f9a 100644
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@@ -1,6 +1,6 @@
 include(posix/px4_impl_posix)
 
-set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake)
+set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake)
 
 add_definitions(
 	-D__PX4_POSIX_BEBOP
@@ -9,7 +9,7 @@ add_definitions(
 	)
 
 set(CMAKE_PROGRAM_PATH
-	"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
+	"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
 	${CMAKE_PROGRAM_PATH}
 	)
 
diff --git a/cmake/configs/posix_rpi_cross.cmake b/cmake/configs/posix_rpi_cross.cmake
index e665f01dad..b2eec3aa9c 100644
--- a/cmake/configs/posix_rpi_cross.cmake
+++ b/cmake/configs/posix_rpi_cross.cmake
@@ -1,13 +1,13 @@
 include(configs/posix_rpi_common)
 
 if("$ENV{RPI_USE_CLANG}" STREQUAL "1")
-	set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake)
+	set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake)
 else()
-	set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake)
+	set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake)
 endif()
 
 
 set(CMAKE_PROGRAM_PATH
-	"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
+	"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
 	${CMAKE_PROGRAM_PATH}
 )
diff --git a/cmake/posix/px4_impl_posix.cmake b/cmake/posix/px4_impl_posix.cmake
index 205ec34534..493447641a 100644
--- a/cmake/posix/px4_impl_posix.cmake
+++ b/cmake/posix/px4_impl_posix.cmake
@@ -274,7 +274,7 @@ elseif ("${BOARD}" STREQUAL "rpi" AND "$ENV{RPI_USE_CLANG}" STREQUAL "1")
 		-m32
 		--target=arm-linux-gnueabihf
 		-ccc-gcc-name arm-linux-gnueabihf
-		--sysroot=${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/)
+		--sysroot=${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/arm-linux-gnueabihf/libc/)
 
 	set(added_c_flags ${POSIX_CMAKE_C_FLAGS} ${clang_added_flags})
 	list(APPEND added_cxx_flags ${POSIX_CMAKE_CXX_FLAGS} ${clang_added_flags})
diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
similarity index 88%
rename from cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
rename to cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
index 38679de71c..985b8189e7 100644
--- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
+++ b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
@@ -15,7 +15,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 # specify the cross compiler
 # requires a symbolic link typically from /usr/bin/clang
 find_program(C_COMPILER clang
-	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 	NO_DEFAULT_PATH
 	)
 
@@ -25,7 +25,7 @@ endif()
 cmake_force_c_compiler(${C_COMPILER} Clang)
 
 find_program(CXX_COMPILER clang++
-	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 	NO_DEFAULT_PATH
 	)
 
@@ -38,7 +38,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} Clang)
 foreach(tool objcopy nm ld)
 	string(TOUPPER ${tool} TOOL)
 	find_program(${TOOL} arm-linux-gnueabihf-${tool}
-		PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+		PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 		NO_DEFAULT_PATH
 		)
 	if(NOT ${TOOL})
diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
similarity index 90%
rename from cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
rename to cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
index aa85ceeca5..a60f272914 100644
--- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
+++ b/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
@@ -30,7 +30,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 
 # specify the cross compiler
 find_program(C_COMPILER arm-linux-gnueabihf-gcc
-	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 	NO_DEFAULT_PATH
 	)
 
@@ -40,7 +40,7 @@ endif()
 cmake_force_c_compiler(${C_COMPILER} GNU)
 
 find_program(CXX_COMPILER arm-linux-gnueabihf-g++
-	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+	PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 	NO_DEFAULT_PATH
 	)
 
@@ -53,7 +53,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} GNU)
 foreach(tool objcopy nm ld)
 	string(TOUPPER ${tool} TOOL)
 	find_program(${TOOL} arm-linux-gnueabihf-${tool}
-		PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
+		PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
 		NO_DEFAULT_PATH
 		)
 	if(NOT ${TOOL})