diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index afae91f..0789298 100644
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -56,10 +56,10 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_profile_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_profile_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
 LOCAL_CFLAGS := $(libext2_profile_cflags)
-LOCAL_MODULE := libext2_profile_host
+LOCAL_MODULE := libext2_profile-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
@@ -156,7 +156,7 @@
 LOCAL_SRC_FILES := $(e2fsck_src_files)
 LOCAL_C_INCLUDES := $(e2fsck_c_includes)
 LOCAL_CFLAGS := $(e2fsck_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2fsck_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e2fsck_shared_libraries))
 LOCAL_MODULE := e2fsck_host
 LOCAL_MODULE_STEM := e2fsck
 LOCAL_MODULE_TAGS := optional
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 7682ce1..c64d414 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -79,14 +79,14 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_blkid_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_blkid_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
 ifeq ($(HOST_OS),linux)
 LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
 else
 LOCAL_CFLAGS := $(libext2_blkid_cflags)
 endif
-LOCAL_MODULE := libext2_blkid_host
+LOCAL_MODULE := libext2_blkid-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index 5a89b38..b91b7c0 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -81,7 +81,7 @@
 LOCAL_SRC_FILES := $(libext2_e2p_src_files)
 LOCAL_C_INCLUDES := $(libext2_e2p_c_includes)
 LOCAL_CFLAGS := $(libext2_e2p_cflags)
-LOCAL_MODULE := libext2_e2p_host
+LOCAL_MODULE := libext2_e2p-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 7724bb1..999d8fc 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -70,7 +70,7 @@
 else
 LOCAL_CFLAGS := $(libext2_com_err_cflags)
 endif
-LOCAL_MODULE := libext2_com_err_host
+LOCAL_MODULE := libext2_com_err-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index fd7bb85..05a3079 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -149,7 +149,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2fs_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2fs_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2fs_c_includes)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
 ifeq ($(HOST_OS),linux)
@@ -157,7 +157,7 @@
 else
 LOCAL_CFLAGS := $(libext2fs_cflags)
 endif
-LOCAL_MODULE := libext2fs_host
+LOCAL_MODULE := libext2fs-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/quota/Android.mk b/lib/quota/Android.mk
index ef599ea..d102ec3 100644
--- a/lib/quota/Android.mk
+++ b/lib/quota/Android.mk
@@ -66,8 +66,8 @@
 LOCAL_SRC_FILES := $(libext2_quota_src_files)
 LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
 LOCAL_CFLAGS := $(libext2_quota_cflags)
-LOCAL_MODULE := libext2_quota_host
+LOCAL_MODULE := libext2_quota-host
 LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_quota_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_quota_shared_libraries))
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk
index bebfe2f..b26521e 100644
--- a/lib/uuid/Android.mk
+++ b/lib/uuid/Android.mk
@@ -62,7 +62,7 @@
 LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
 LOCAL_CFLAGS := $(libext2_uuid_cflags)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libext2_uuid_host
+LOCAL_MODULE := libext2_uuid-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
@@ -87,7 +87,7 @@
 LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
 LOCAL_CFLAGS := $(libext2_uuid_cflags)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libext2_uuid_host
+LOCAL_MODULE := libext2_uuid-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/misc/Android.mk b/misc/Android.mk
index b5af5c2..79ba61d 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -73,7 +73,7 @@
 else
 LOCAL_CFLAGS := $(mke2fs_cflags)
 endif
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(mke2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(mke2fs_shared_libraries))
 LOCAL_MODULE := mke2fs_host
 LOCAL_MODULE_STEM := mke2fs
 LOCAL_MODULE_TAGS := optional
@@ -181,7 +181,7 @@
 LOCAL_SRC_FILES := $(tune2fs_src_files)
 LOCAL_C_INCLUDES := $(tune2fs_c_includes)
 LOCAL_CFLAGS := $(tune2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(tune2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(tune2fs_shared_libraries))
 LOCAL_MODULE := tune2fs_host
 LOCAL_MODULE_STEM := tune2fs
 LOCAL_MODULE_TAGS := optional
@@ -252,7 +252,7 @@
 LOCAL_SRC_FILES := $(badblocks_src_files)
 LOCAL_C_INCLUDES := $(badblocks_c_includes)
 LOCAL_CFLAGS := $(badblocks_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(badblocks_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(badblocks_shared_libraries))
 LOCAL_MODULE := badblocks_host
 LOCAL_MODULE_STEM := badblocks
 LOCAL_MODULE_TAGS := optional
@@ -321,7 +321,7 @@
 LOCAL_SRC_FILES := $(chattr_src_files)
 LOCAL_C_INCLUDES := $(chattr_c_includes)
 LOCAL_CFLAGS := $(chattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(chattr_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(chattr_shared_libraries))
 LOCAL_MODULE := chattr_host
 LOCAL_MODULE_STEM := chattr
 LOCAL_MODULE_TAGS := optional
@@ -390,7 +390,7 @@
 LOCAL_SRC_FILES := $(lsattr_src_files)
 LOCAL_C_INCLUDES := $(lsattr_c_includes)
 LOCAL_CFLAGS := $(lsattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(lsattr_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(lsattr_shared_libraries))
 LOCAL_MODULE := lsattr_host
 LOCAL_MODULE_STEM := lsattr
 LOCAL_MODULE_TAGS := optional
diff --git a/resize/Android.mk b/resize/Android.mk
index 41f9fe0..42b25ce 100644
--- a/resize/Android.mk
+++ b/resize/Android.mk
@@ -61,7 +61,7 @@
 LOCAL_SRC_FILES := $(resize2fs_src_files)
 LOCAL_C_INCLUDES := $(resize2fs_c_includes)
 LOCAL_CFLAGS := $(resize2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(resize2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(resize2fs_shared_libraries))
 LOCAL_MODULE := resize2fs_host
 LOCAL_MODULE_STEM := resize2fs
 LOCAL_MODULE_TAGS := optional