diff --git a/Makefile.android b/Makefile.android
index cf6d90c..a9f0d11 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -15,7 +15,7 @@ android_bluetoothd_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
 noinst_LTLIBRARIES += android/libhal-internal.la
 
 android_libhal_internal_la_SOURCES = android/hal.h android/hal-bluetooth.c \
-					android/hal_bt_sock.c \
+					android/hal-sock.c \
 					android/hardware/bluetooth.h \
 					android/hardware/bt_av.h \
 					android/hardware/bt_gatt.h \
@@ -53,7 +53,7 @@ EXTRA_DIST += android/Android.mk android/log.c android/device.c \
 		android/adapter.c android/main.c android/hal-msg.h \
 		android/hal.h
 
-EXTRA_DIST += android/hal_bt_sock.c android/hal-bluetooth.c
+EXTRA_DIST += android/hal-sock.c android/hal-bluetooth.c
 
 EXTRA_DIST += android/client/terminal.c \
 		android/client/haltest.c \
diff --git a/android/Android.mk b/android/Android.mk
index 753267a..53e328b 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -52,7 +52,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	hal-bluetooth.c \
-	hal_bt_sock.c \
+	hal-sock.c \
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
diff --git a/android/hal_bt_sock.c b/android/hal-sock.c
similarity index 100%
rename from android/hal_bt_sock.c
rename to android/hal-sock.c