diff --git a/Android.mk b/Android.mk
index ceba610..d4c1410 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,7 +63,7 @@
 )
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := org.apache.http.legacy
+LOCAL_MODULE := org.apache.http.legacy.boot
 LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
 LOCAL_SRC_FILES := $(apache_http_src_files)
@@ -82,7 +82,7 @@
 
 LOCAL_DROIDDOC_OPTIONS:= \
     -stubpackages $(subst $(space),:,$(apache_http_packages)) \
-    -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/apache-http-stubs_intermediates/src \
+    -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/src \
     -nodocs
 
 LOCAL_SDK_VERSION := 21
@@ -95,10 +95,11 @@
 ###############################################
 # Build the stub source files into a jar.
 include $(CLEAR_VARS)
-LOCAL_MODULE := apache-http-stubs
+LOCAL_MODULE := org.apache.http.legacy
 LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
 LOCAL_SOURCE_FILES_ALL_GENERATED := true
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # Make sure to run droiddoc first to generate the stub source files.
 $(full_classes_compiled_jar) : $(apache_http_stubs_gen_stamp)
 $(full_classes_jack) : $(apache_http_stubs_gen_stamp)
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..694f8d2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,3 +47,5 @@
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/apache-http-stubs_intermediates)