diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 8fc8972..95e685c 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -80,4 +80,6 @@
     <string name="config_mms_user_agent">Wileyfox-Swift/1.0</string>
     <string name="config_mms_user_agent_profile_url">http://ua-profiles.cyngn.com/crackling/crackling-1016c1298e.rdf</string>
 
+    <bool name="config_eap_sim_based_auth_supported">true</bool>
+
 </resources>
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index 871ec94..6e6947f 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -231,31 +231,31 @@ bin/irsc_util
 vendor/lib64/libdsi_netctrl.so
 -vendor/lib64/libdsutils.so
 -vendor/lib64/libidl.so
--vendor/lib64/libqcci_legacy.so
+vendor/lib64/libqcci_legacy.so
 vendor/lib64/libqdi.so
 vendor/lib64/libqdp.so
-vendor/lib64/libqmi_cci.so
+-vendor/lib64/libqmi_cci.so
 -vendor/lib64/libqmi_client_qmux.so
 vendor/lib64/libqmi_common_so.so
 vendor/lib64/libqmi_csi.so
 vendor/lib64/libqmi_encdec.so
 -vendor/lib64/libqmiservices.so
--vendor/lib64/libqmi.so
+vendor/lib64/libqmi.so
 vendor/lib64/libsmemlog.so
 -vendor/lib/libdiag.so
 vendor/lib/libdsi_netctrl.so
 -vendor/lib/libdsutils.so
 -vendor/lib/libidl.so
--vendor/lib/libqcci_legacy.so
+vendor/lib/libqcci_legacy.so
 vendor/lib/libqdi.so
 vendor/lib/libqdp.so
-vendor/lib/libqmi_cci.so
+-vendor/lib/libqmi_cci.so
 -vendor/lib/libqmi_client_qmux.so
 vendor/lib/libqmi_common_so.so
 vendor/lib/libqmi_csi.so
 vendor/lib/libqmi_encdec.so
 -vendor/lib/libqmiservices.so
--vendor/lib/libqmi.so
+vendor/lib/libqmi.so
 vendor/lib/libsmemlog.so
 
 # Radio
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 802be31..f52b5cf 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -120,11 +120,9 @@ PRODUCT_PACKAGES += \\
     libdsutils \\
     libidl \\
     libmdmdetect \\
-    libqcci_legacy \\
-    libqmi \\
+    libqmi_cci \\
     libqmi_client_qmux \\
-    libqmiservices \\
-    libqmi
+    libqmiservices
 
 PRODUCT_PACKAGES += \\
     libtime_genoff
@@ -349,23 +347,10 @@ LOCAL_MULTILIB := both
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libqcci_legacy
+LOCAL_MODULE := libqmi_cci
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqcci_legacy.so
-LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqcci_legacy.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MULTILIB := both
-include \$(BUILD_PREBUILT)
-
-include \$(CLEAR_VARS)
-LOCAL_MODULE := libqmi
-LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqmi.so
-LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqmi.so
+LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqmi_cci.so
+LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqmi_cci.so
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES