diff --git a/libclearkeydrmengine/Android.mk b/libclearkeydrmengine/Android.mk
index 43b720d1..7f45fadb 100644
--- a/libclearkeydrmengine/Android.mk
+++ b/libclearkeydrmengine/Android.mk
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \
     frameworks/av/include \
     vendor/widevine/libclearkeydrmengine/include \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libwvclearkeycryptoplugin \
@@ -31,4 +31,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 # Sublibraries Needed:
 include vendor/widevine/libclearkeydrmengine/crypto/Android.mk
-include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk
+include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk
diff --git a/libclearkeydrmengine/crypto/Android.mk b/libclearkeydrmengine/crypto/Android.mk
index f4a7cb76..7a080850 100644
--- a/libclearkeydrmengine/crypto/Android.mk
+++ b/libclearkeydrmengine/crypto/Android.mk
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_MODULE := libwvclearkeycryptoplugin
 
diff --git a/libclearkeydrmengine/crypto/test/Android.mk b/libclearkeydrmengine/crypto/test/Android.mk
index 895e3302..5a27aa6d 100644
--- a/libclearkeydrmengine/crypto/test/Android.mk
+++ b/libclearkeydrmengine/crypto/test/Android.mk
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \
     external/gtest/include \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \
diff --git a/libclearkeydrmengine/inttest/Android.mk b/libclearkeydrmengine/inttest/Android.mk
index a8bc22cf..37d91235 100644
--- a/libclearkeydrmengine/inttest/Android.mk
+++ b/libclearkeydrmengine/inttest/Android.mk
@@ -11,8 +11,8 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/mock \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/mock \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \
diff --git a/libwvdrmengine/oemcrypto/include/OEMCryptoDASH.h b/libclearkeydrmengine/oemcrypto/include/OEMCryptoDASH.h
similarity index 100%
rename from libwvdrmengine/oemcrypto/include/OEMCryptoDASH.h
rename to libclearkeydrmengine/oemcrypto/include/OEMCryptoDASH.h
diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libclearkeydrmengine/oemcrypto/mock/Android.mk
similarity index 86%
rename from libwvdrmengine/oemcrypto/mock/Android.mk
rename to libclearkeydrmengine/oemcrypto/mock/Android.mk
index e7fa9aaa..e9daf8df 100644
--- a/libwvdrmengine/oemcrypto/mock/Android.mk
+++ b/libclearkeydrmengine/oemcrypto/mock/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES := MockOEMCrypto.cpp \
         OEMCryptoWrapper.cpp \
         wvcrc.cpp \
 
-LOCAL_C_INCLUDES += vendor/widevine/libwvdrmengine/oemcrypto/include \
+LOCAL_C_INCLUDES += vendor/widevine/libclearkeydrmengine/oemcrypto/include \
         external/openssl/include \
         external/openssh
 
diff --git a/libwvdrmengine/oemcrypto/mock/MockOEMCrypto.cpp b/libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.cpp
similarity index 100%
rename from libwvdrmengine/oemcrypto/mock/MockOEMCrypto.cpp
rename to libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.cpp
diff --git a/libwvdrmengine/oemcrypto/mock/MockOEMCrypto.h b/libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.h
similarity index 100%
rename from libwvdrmengine/oemcrypto/mock/MockOEMCrypto.h
rename to libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.h
diff --git a/libwvdrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp b/libclearkeydrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp
similarity index 100%
rename from libwvdrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp
rename to libclearkeydrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp
diff --git a/libwvdrmengine/oemcrypto/mock/wvcrc.cpp b/libclearkeydrmengine/oemcrypto/mock/wvcrc.cpp
similarity index 100%
rename from libwvdrmengine/oemcrypto/mock/wvcrc.cpp
rename to libclearkeydrmengine/oemcrypto/mock/wvcrc.cpp
diff --git a/libwvdrmengine/oemcrypto/mock/wvcrc32.h b/libclearkeydrmengine/oemcrypto/mock/wvcrc32.h
similarity index 100%
rename from libwvdrmengine/oemcrypto/mock/wvcrc32.h
rename to libclearkeydrmengine/oemcrypto/mock/wvcrc32.h
diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libclearkeydrmengine/oemcrypto/test/Android.mk
similarity index 76%
rename from libwvdrmengine/oemcrypto/test/Android.mk
rename to libclearkeydrmengine/oemcrypto/test/Android.mk
index 5dc3fe28..9e60ef90 100644
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libclearkeydrmengine/oemcrypto/test/Android.mk
@@ -9,8 +9,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES += \
     bionic \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/mock \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/mock \
     external/gtest/include \
     external/openssl/include \
     external/stlport/stlport \
@@ -34,4 +34,4 @@ LOCAL_MODULE:=test-oemcrypto
 include $(BUILD_EXECUTABLE)
 
 # Sublibraries Needed:
-include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk
+include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk
diff --git a/libwvdrmengine/oemcrypto/test/TestOEMCrypto.cpp b/libclearkeydrmengine/oemcrypto/test/TestOEMCrypto.cpp
similarity index 100%
rename from libwvdrmengine/oemcrypto/test/TestOEMCrypto.cpp
rename to libclearkeydrmengine/oemcrypto/test/TestOEMCrypto.cpp
diff --git a/libclearkeydrmengine/test/Android.mk b/libclearkeydrmengine/test/Android.mk
index fca8ef4e..62ef8b08 100644
--- a/libclearkeydrmengine/test/Android.mk
+++ b/libclearkeydrmengine/test/Android.mk
@@ -14,7 +14,7 @@ LOCAL_C_INCLUDES := \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/include \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \