diff --git a/MSP-EXP430F5438-CC256x/example-ble/Makefile b/MSP-EXP430F5438-CC256x/example-ble/Makefile
index d3d02ca6d..77c058e27 100644
--- a/MSP-EXP430F5438-CC256x/example-ble/Makefile
+++ b/MSP-EXP430F5438-CC256x/example-ble/Makefile
@@ -34,7 +34,7 @@ COMMON = \
     ${BTSTACK_ROOT}/ble/att_server.c              \
     ${BTSTACK_ROOT}/ble/l2cap_le.c                \
 	${BTSTACK_ROOT}/ble/sm.c 				 	    \
-    ${BTSTACK_ROOT}/ble/central_device_db_memory.c  \
+    ${BTSTACK_ROOT}/ble/le_device_db_memory.c     \
 	${BTSTACK_ROOT}/chipset-cc256x/bt_control_cc256x.c   \
 	${BTSTACK_ROOT}/chipset-cc256x/bluetooth_init_cc2564_2.10.c \
     ${BTSTACK_ROOT}/src/hci_transport_h4_ehcill_dma.c \
diff --git a/MSP-EXP430F5438-CC256x/example-ble/ble_server.c b/MSP-EXP430F5438-CC256x/example-ble/ble_server.c
index 72237640d..71bea6c61 100644
--- a/MSP-EXP430F5438-CC256x/example-ble/ble_server.c
+++ b/MSP-EXP430F5438-CC256x/example-ble/ble_server.c
@@ -76,7 +76,7 @@
 #include "att.h"
 #include "att_server.h"
 #include "gap_le.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #define FONT_HEIGHT		12                    // Each character has 13 lines 
 #define FONT_WIDTH       8
@@ -292,8 +292,8 @@ int main(void)
     // set up l2cap_le
     l2cap_init();
     
-    // setup central device db
-    central_device_db_init();
+    // setup le device db
+    le_device_db_init();
 
     // setup SM: Display only
     sm_init();
diff --git a/ble/ancs_client_lib.c b/ble/ancs_client_lib.c
index 7ac30905a..397fada72 100644
--- a/ble/ancs_client_lib.c
+++ b/ble/ancs_client_lib.c
@@ -52,14 +52,6 @@
 #include "gatt_client.h"
 #include "sm.h"
 
-// #include "btstack_memory.h"
-// #include "hci.h"
-// #include "hci_dump.h"
-// #include "l2cap.h"
-// #include "att_server.h"
-// #include "central_device_db.h"
-
-
 // ancs_client.h Start
 typedef enum ancs_chunk_parser_state {
     W4_ATTRIBUTE_ID,
diff --git a/ble/att_server.c b/ble/att_server.c
index f8916fe68..a23acb633 100644
--- a/ble/att_server.c
+++ b/ble/att_server.c
@@ -59,7 +59,7 @@
 #include "att.h"
 #include "att_dispatch.h"
 #include "gap_le.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #include "att_server.h"
 
diff --git a/ble/central_device_db.h b/ble/le_device_db.h
similarity index 100%
rename from ble/central_device_db.h
rename to ble/le_device_db.h
diff --git a/ble/central_device_db_memory.c b/ble/le_device_db_memory.c
similarity index 99%
rename from ble/central_device_db_memory.c
rename to ble/le_device_db_memory.c
index 4502e23db..976f9001e 100644
--- a/ble/central_device_db_memory.c
+++ b/ble/le_device_db_memory.c
@@ -35,7 +35,7 @@
  *
  */
  
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/ble/central_device_db_dummy.c b/ble/le_device_dummy.c
similarity index 98%
rename from ble/central_device_db_dummy.c
rename to ble/le_device_dummy.c
index 14f270d13..469de55ee 100644
--- a/ble/central_device_db_dummy.c
+++ b/ble/le_device_dummy.c
@@ -34,7 +34,7 @@
  * contact@bluekitchen-gmbh.com
  *
  */
-#include  "central_device_db.h"
+#include  "le_device_db.h"
 
  // Central Device db interface
 void le_device_db_init(){}
diff --git a/ble/sm.c b/ble/sm.c
index 6c9d799e3..70ebb4a04 100644
--- a/ble/sm.c
+++ b/ble/sm.c
@@ -42,7 +42,7 @@
 #include "debug.h"
 #include "hci.h"
 #include "l2cap.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 #include "sm.h"
 #include "gap_le.h"
 
diff --git a/ble/sm_minimal.c b/ble/sm_minimal.c
index 8ae47802d..a5a3c0474 100644
--- a/ble/sm_minimal.c
+++ b/ble/sm_minimal.c
@@ -41,7 +41,7 @@
 #include "debug.h"
 #include "hci.h"
 #include "l2cap.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 #include "sm.h"
 #include "gap_le.h"
 
diff --git a/docs/manual/btstack_gettingstarted.tex b/docs/manual/btstack_gettingstarted.tex
index 01d16c93a..6b5dd69d9 100644
--- a/docs/manual/btstack_gettingstarted.tex
+++ b/docs/manual/btstack_gettingstarted.tex
@@ -1257,8 +1257,8 @@ void setup(void){
   // set up l2cap_le
   l2cap_init();
     
-  // setup central device db
-  central_device_db_init();
+  // setup le device db
+  le_device_db_init();
 
   // setup SM: Display only
   sm_init();
diff --git a/docs/manual/example_spp_le_counter.tex b/docs/manual/example_spp_le_counter.tex
index 01aa87ad6..7bc8983ea 100644
--- a/docs/manual/example_spp_le_counter.tex
+++ b/docs/manual/example_spp_le_counter.tex
@@ -40,8 +40,8 @@ void setup(void){
 
     hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO);
 
-    // setup central device db
-    central_device_db_init();
+    // setup le device db
+    le_device_db_init();
 
     // setup SM: Display only
     sm_init();
diff --git a/example/embedded/Makefile.inc b/example/embedded/Makefile.inc
index 70b69d8c9..eba6ad9fb 100644
--- a/example/embedded/Makefile.inc
+++ b/example/embedded/Makefile.inc
@@ -47,11 +47,11 @@ GATT_CLIENT += \
 
 SM_REAL += \
 	sm.c 				 	    \
-    central_device_db_memory.c  \
+    le_device_db_memory.c  \
 
 SM_MINIMAL += \
 	sm_minimal.c  		 	    \
-    central_device_db_dummy.c   \
+    le_db_dummy.c   \
 
 PAN += \
 	pan.c \
diff --git a/example/embedded/ancs_client.c b/example/embedded/ancs_client.c
index 9d4eeb498..bec433769 100644
--- a/example/embedded/ancs_client.c
+++ b/example/embedded/ancs_client.c
@@ -66,7 +66,7 @@
 
 #include "att.h"
 #include "att_server.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 #include "gap_le.h"
 #include "gatt_client.h"
 #include "sm.h"
diff --git a/example/embedded/ble_peripheral.c b/example/embedded/ble_peripheral.c
index 45dd045af..9df8ac76b 100644
--- a/example/embedded/ble_peripheral.c
+++ b/example/embedded/ble_peripheral.c
@@ -63,7 +63,7 @@
 #include "att.h"
 #include "att_server.h"
 #include "gap_le.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #define HEARTBEAT_PERIOD_MS 1000
 
diff --git a/example/embedded/spp_and_le_counter.c b/example/embedded/spp_and_le_counter.c
index 459f3d346..3477c7345 100644
--- a/example/embedded/spp_and_le_counter.c
+++ b/example/embedded/spp_and_le_counter.c
@@ -65,7 +65,7 @@
 
 #include "att.h"
 #include "att_server.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 #include "gap_le.h"
 #include "sm.h"
 
diff --git a/platforms/ez430-rf2560/Makefile b/platforms/ez430-rf2560/Makefile
index 7fb70c11b..9931a3651 100644
--- a/platforms/ez430-rf2560/Makefile
+++ b/platforms/ez430-rf2560/Makefile
@@ -73,7 +73,7 @@ SDP_CLIENT += \
 BLE = \
 	att.c 					  \
 	att_server.c     		  \
-	central_device_db_memory.c  \
+	le_device_db_memory.c     \
 	sm.c                      \
 	att_dispatch.c            \
 	l2cap_le.c 				  \
diff --git a/platforms/libusb/Makefile b/platforms/libusb/Makefile
index c55cae233..e1f3207fc 100644
--- a/platforms/libusb/Makefile
+++ b/platforms/libusb/Makefile
@@ -7,7 +7,7 @@ COMMON += hci_transport_h2_libusb.c run_loop_posix.c remote_device_db_fs.c
 
 
 include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
-
+# CC = gcc-fsf-4.9
 CFLAGS  += -g -Wall 
 # CFLAGS += -Werror
 
@@ -29,4 +29,6 @@ ifneq ($(OS),Windows_NT)
 EXAMPLES += ${EXAMPLES_CLI}
 endif
 
+EXAMPLES += sam3u_benchmark
+
 all: ${BTSTACK_ROOT}/include/btstack/version.h ${EXAMPLES}
diff --git a/platforms/msp-exp430f5438-cc2564b/Makefile b/platforms/msp-exp430f5438-cc2564b/Makefile
index ba198ea87..e1ebc6a12 100644
--- a/platforms/msp-exp430f5438-cc2564b/Makefile
+++ b/platforms/msp-exp430f5438-cc2564b/Makefile
@@ -73,7 +73,7 @@ SDP_CLIENT += \
 BLE = \
 	att.c 					  \
 	att_server.c     		  \
-	central_device_db_memory.c  \
+	le_device_db_memory.c  \
 	sm.c                      \
 	att_dispatch.c            \
 	l2cap_le.c 				  \
diff --git a/platforms/msp-exp430f5438-cc2564b/example/ble_server.c b/platforms/msp-exp430f5438-cc2564b/example/ble_server.c
index 9bfb4ced6..8d7b1bfca 100644
--- a/platforms/msp-exp430f5438-cc2564b/example/ble_server.c
+++ b/platforms/msp-exp430f5438-cc2564b/example/ble_server.c
@@ -72,7 +72,7 @@
 #include "att.h"
 #include "att_server.h"
 #include "gap_le.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #define FONT_HEIGHT		12                    // Each character has 13 lines 
 #define FONT_WIDTH       8
@@ -256,8 +256,8 @@ int btstack_main(int argc, const char * argv[]){
     // set up l2cap_le
     l2cap_init();
     
-    // setup central device db
-    central_device_db_init();
+    // setup le device db
+    le_device_db_init();
 
     // setup SM: Display only
     sm_init();
diff --git a/platforms/msp430f5229lp-cc2564b/Makefile b/platforms/msp430f5229lp-cc2564b/Makefile
index 15cc8e244..32bb73802 100644
--- a/platforms/msp430f5229lp-cc2564b/Makefile
+++ b/platforms/msp430f5229lp-cc2564b/Makefile
@@ -75,7 +75,7 @@ SDP_CLIENT += \
 BLE = \
 	att.c 					  \
 	att_server.c     		  \
-	central_device_db_memory.c  \
+	le_device_db_memory.c     \
 	sm.c                      \
 	att_dispatch.c            \
 	l2cap_le.c 				  \
diff --git a/platforms/msp430f5229lp-cc2564b/example/ble_server.c b/platforms/msp430f5229lp-cc2564b/example/ble_server.c
index dc497100d..ffbb3d5a8 100644
--- a/platforms/msp430f5229lp-cc2564b/example/ble_server.c
+++ b/platforms/msp430f5229lp-cc2564b/example/ble_server.c
@@ -70,7 +70,7 @@
 #include "att.h"
 #include "att_server.h"
 #include "gap_le.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 
 #define FONT_HEIGHT		12                    // Each character has 13 lines 
 #define FONT_WIDTH       8
@@ -229,8 +229,8 @@ int btstack_main(int argc, const char * argv[]){
     // set up l2cap_le
     l2cap_init();
     
-    // setup central device db
-    central_device_db_init();
+    // setup le device db
+    le_device_db_init();
 
     // setup SM: Display only
     sm_init();
diff --git a/platforms/mtk/Makefile b/platforms/mtk/Makefile
index 32c15425e..26eadb67c 100644
--- a/platforms/mtk/Makefile
+++ b/platforms/mtk/Makefile
@@ -33,7 +33,7 @@ libBTstack_OBJS  = 		 \
 
 BTdaemon_OBJS = $(libBTstack_OBJS)   \
 	att_dispatch.o              \
-	central_device_db_memory.o  \
+	ledevice_db_memory.o        \
     att.o                       \
     att_server.o                \
 	gatt_client.o               \
diff --git a/platforms/posix/src/Makefile.in b/platforms/posix/src/Makefile.in
index f35b9f273..86ea7a49e 100644
--- a/platforms/posix/src/Makefile.in
+++ b/platforms/posix/src/Makefile.in
@@ -46,7 +46,7 @@ BTdaemon_SOURCES =                          \
     $(BTSTACK_ROOT)/ble/att.c               \
     $(BTSTACK_ROOT)/ble/att_server.c        \
     $(BTSTACK_ROOT)/ble/sm.c                \
-    $(BTSTACK_ROOT)/ble/central_device_db_memory.c \
+    $(BTSTACK_ROOT)/ble/le_device_db_memory.c \
     $(usb_sources)                          \
     $(remote_device_db_sources)             \
 
diff --git a/platforms/posix/src/daemon.c b/platforms/posix/src/daemon.c
index baeaa93bf..d323a4a98 100644
--- a/platforms/posix/src/daemon.c
+++ b/platforms/posix/src/daemon.c
@@ -78,7 +78,7 @@
 #include "gatt_client.h"
 #include "att_server.h"
 #include "att.h"
-#include "central_device_db.h"
+#include "le_device_db.h"
 #include "sm.h"
 #endif
 
@@ -1814,7 +1814,7 @@ int main (int argc,  char * const * argv){
     // sm_set_authentication_requirements( SM_AUTHREQ_BONDING | SM_AUTHREQ_MITM_PROTECTION); 
 
     // GATT Server - empty attribute database
-    central_device_db_init();
+    le_device_db_init();
     att_server_init(NULL, NULL, NULL);    
 
 #endif
diff --git a/platforms/stm32-f103rb-nucleo/Makefile b/platforms/stm32-f103rb-nucleo/Makefile
index b18a85270..6cebaaa15 100644
--- a/platforms/stm32-f103rb-nucleo/Makefile
+++ b/platforms/stm32-f103rb-nucleo/Makefile
@@ -43,7 +43,7 @@ COMMON = \
 BLE = \
 	att.c 					  \
 	att_server.c     		  \
-	central_device_db_memory.c  \
+	le_device_db_memory.c  \
 	sm.c                      \
 	att_dispatch.c            \
 #	gatt_client.c             \
diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile
index 9ffac85d9..7b34257e2 100644
--- a/test/security_manager/Makefile
+++ b/test/security_manager/Makefile
@@ -20,7 +20,7 @@ COMMON = \
     ${BTSTACK_ROOT}/src/hci_cmds.c					\
     ${BTSTACK_ROOT}/src/hci_dump.c					\
     ${BTSTACK_ROOT}/ble/sm.c     					\
-    ${BTSTACK_ROOT}/ble/central_device_db_memory.c  \
+    ${BTSTACK_ROOT}/ble/le_device_db_memory.c       \
     rijndael.c 										\
     mock.c