diff --git a/extract-files.sh b/extract-files.sh
index 9b72a34..b14045a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -89,6 +89,10 @@ function blob_fixup() {
         patchelf --add-needed libqsap_shim.so "${2}"
         ;;
 
+    vendor/lib/libmot_gpu_mapper.so)
+        sed -i "s/libgui/libwui/" "${2}"
+        ;;
+
     esac
 }
 
@@ -107,4 +111,4 @@ if [[ "$ONLY_COMMON" = "false" ]] && [[ -s "${DEVICE_DIR}"/proprietary-files.txt
     extract "${DEVICE_DIR}"/proprietary-files.txt "$SRC" "${KANG}" --section "${SECTION}"
 fi
 
-"$COMMON_DIR"/setup-makefiles.sh
\ No newline at end of file
+"$COMMON_DIR"/setup-makefiles.sh
diff --git a/libshims/Android.mk b/libshims/Android.mk
index 793861d..d8ca8f3 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -23,3 +23,11 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libgui_vendor
+LOCAL_MODULE := libwui
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8953.mk b/msm8953.mk
index 53a61f6..cfc68e0 100644
--- a/msm8953.mk
+++ b/msm8953.mk
@@ -80,7 +80,7 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
     camera.device@1.0-impl \
     camera.device@3.2-impl \
-    libgui_vendor \
+    libwui \
     vendor.qti.hardware.camera.device@1.0 \
     vendor.qti.hardware.camera.device@1.0_vendor \
     MotCamera2