diff --git a/android/Android.mk b/android/Android.mk
index 53c766b..616a338 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -21,7 +21,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	main.c \
-	adapter.c \
+	bluetooth.c \
 	hidhost.c \
 	socket.c \
 	ipc.c ipc.h \
diff --git a/android/Makefile.am b/android/Makefile.am
index e81d1a5..c90c0a3 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -16,7 +16,7 @@ android_bluetoothd_SOURCES = android/main.c \
 				src/eir.h src/eir.c \
 				src/shared/util.h src/shared/util.c \
 				src/shared/mgmt.h src/shared/mgmt.c \
-				android/adapter.h android/adapter.c \
+				android/bluetooth.h android/bluetooth.c \
 				android/hidhost.h android/hidhost.c \
 				android/ipc.h android/ipc.c \
 				android/a2dp.h android/a2dp.c \
@@ -79,7 +79,7 @@ android_haltest_LDFLAGS = -pthread
 
 endif
 
-EXTRA_DIST += android/Android.mk android/adapter.c android/main.c \
+EXTRA_DIST += android/Android.mk android/bluetooth.c android/main.c \
 		android/hal-msg.h android/hal.h
 
 EXTRA_DIST += android/hal-bluetooth.c \
diff --git a/android/adapter.c b/android/bluetooth.c
similarity index 97%
rename from android/adapter.c
rename to android/bluetooth.c
index 3f135be..7a33d4f 100644
--- a/android/adapter.c
+++ b/android/bluetooth.c
@@ -44,7 +44,7 @@
 #include "hal-msg.h"
 #include "ipc.h"
 #include "utils.h"
-#include "adapter.h"
+#include "bluetooth.h"
 
 #define DEVICE_ID_SOURCE	0x0002	/* USB */
 #define DEVICE_ID_VENDOR	0x1d6b	/* Linux Foundation */
@@ -55,8 +55,8 @@
 /* Default discoverable timeout 120sec as in Android */
 #define DEFAULT_DISCOVERABLE_TIMEOUT 120
 
-#define BASELEN_PROP_CHANGED sizeof(struct hal_ev_adapter_props_changed) \
-				+ (sizeof(struct hal_property))
+#define BASELEN_PROP_CHANGED (sizeof(struct hal_ev_adapter_props_changed) \
+				+ (sizeof(struct hal_property)))
 
 static uint16_t option_index = MGMT_INDEX_NONE;
 
@@ -1275,8 +1275,8 @@ static void clear_uuids(void)
 					sizeof(cp), &cp, NULL, NULL, NULL);
 }
 
-static void read_info_complete(uint8_t status, uint16_t length, const void *param,
-							void *user_data)
+static void read_info_complete(uint8_t status, uint16_t length,
+					const void *param, void *user_data)
 {
 	const struct mgmt_rp_read_info *rp = param;
 	bt_adapter_ready cb = user_data;
diff --git a/android/adapter.h b/android/bluetooth.h
similarity index 100%
rename from android/adapter.h
rename to android/bluetooth.h
diff --git a/android/main.c b/android/main.c
index 553f2e0..ec8d362 100644
--- a/android/main.c
+++ b/android/main.c
@@ -46,7 +46,7 @@
 
 #include "lib/bluetooth.h"
 
-#include "adapter.h"
+#include "bluetooth.h"
 #include "socket.h"
 #include "hidhost.h"
 #include "hal-msg.h"