diff --git a/libraries/APM_BMP085/keywords.txt b/libraries/APM_BMP085/keywords.txt
deleted file mode 100644
index 8d1698ccbf..0000000000
--- a/libraries/APM_BMP085/keywords.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-APM_BMP085	KEYWORD1
-Init	KEYWORD2
-Read	KEYWORD2
-Press	KEYWORD2
-Temp	KEYWORD2
diff --git a/libraries/APM_BMP085/APM_BMP085.cpp b/libraries/AP_Baro/AP_Baro_BMP085.cpp
similarity index 100%
rename from libraries/APM_BMP085/APM_BMP085.cpp
rename to libraries/AP_Baro/AP_Baro_BMP085.cpp
diff --git a/libraries/APM_BMP085/APM_BMP085.h b/libraries/AP_Baro/AP_Baro_BMP085.h
similarity index 100%
rename from libraries/APM_BMP085/APM_BMP085.h
rename to libraries/AP_Baro/AP_Baro_BMP085.h
diff --git a/libraries/APM_BMP085/APM_BMP085_hil.cpp b/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp
similarity index 100%
rename from libraries/APM_BMP085/APM_BMP085_hil.cpp
rename to libraries/AP_Baro/AP_Baro_BMP085_hil.cpp
diff --git a/libraries/APM_BMP085/APM_BMP085_hil.h b/libraries/AP_Baro/AP_Baro_BMP085_hil.h
similarity index 100%
rename from libraries/APM_BMP085/APM_BMP085_hil.h
rename to libraries/AP_Baro/AP_Baro_BMP085_hil.h
diff --git a/libraries/APM_BMP085/examples/APM_BMP085_test/APM_BMP085_test.pde b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde
similarity index 100%
rename from libraries/APM_BMP085/examples/APM_BMP085_test/APM_BMP085_test.pde
rename to libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde
diff --git a/libraries/APM_BMP085/examples/APM_BMP085_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile
similarity index 100%
rename from libraries/APM_BMP085/examples/APM_BMP085_test/Makefile
rename to libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile