diff --git a/BoardConfig.mk b/BoardConfig.mk
index 95e5f25..aa29646 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -215,7 +215,7 @@ BOARD_HAVE_SAMSUNG_WIFI := true
 TARGET_LD_SHIM_LIBS := \
     /vendor/lib/libbauthserver.so|libbauthtzcommon_shim.so \
     /vendor/lib64/libbauthserver.so|libbauthtzcommon_shim.so \
-    /vendor/lib/hw/camera.msm8996.so|/vendor/lib/libshims_cameraclient.so
+    /vendor/lib/hw/camera.msm8996.so|/vendor/lib/libcameraclient_shim.so
 
 # inherit from the proprietary version
 -include vendor/samsung/gts3llte/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index a058efb..e51340b 100755
--- a/device.mk
+++ b/device.mk
@@ -146,7 +146,7 @@ PRODUCT_PACKAGES += \
     camera.device@3.2-impl \
     camera.device@3.3-impl \
     camera.device@3.4-impl \
-    libshims_cameraclient \
+    libcameraclient_shim \
     Snap
 
 # Connectivity Engine support (CNE)
diff --git a/shims/libshims_cameraclient/Android.mk b/shims/libcameraclient/Android.mk
similarity index 90%
rename from shims/libshims_cameraclient/Android.mk
rename to shims/libcameraclient/Android.mk
index 568ebbd..09d4e22 100644
--- a/shims/libshims_cameraclient/Android.mk
+++ b/shims/libcameraclient/Android.mk
@@ -16,9 +16,9 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := camera_cameraclient.cpp
+LOCAL_SRC_FILES := libcameraclient.cpp
 
-LOCAL_MODULE := libshims_cameraclient
+LOCAL_MODULE := libcameraclient_shim
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_VENDOR_MODULE := true
diff --git a/shims/libshims_cameraclient/camera_cameraclient.cpp b/shims/libcameraclient/libcameraclient.cpp
similarity index 99%
rename from shims/libshims_cameraclient/camera_cameraclient.cpp
rename to shims/libcameraclient/libcameraclient.cpp
index 4623ed6..d4cf71f 100644
--- a/shims/libshims_cameraclient/camera_cameraclient.cpp
+++ b/shims/libcameraclient/libcameraclient.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "camera_cameraclient.h"
+#include "libcameraclient.h"
 
 namespace android
 {
diff --git a/shims/libshims_cameraclient/camera_cameraclient.h b/shims/libcameraclient/libcameraclient.h
similarity index 100%
rename from shims/libshims_cameraclient/camera_cameraclient.h
rename to shims/libcameraclient/libcameraclient.h