diff --git a/musikr/src/main/cpp/JVMInputStream.cpp b/musikr/src/main/cpp/JVMInputStream.cpp
index eaf2e87e9..584fd0ab8 100644
--- a/musikr/src/main/cpp/JVMInputStream.cpp
+++ b/musikr/src/main/cpp/JVMInputStream.cpp
@@ -26,11 +26,11 @@ JVMInputStream::JVMInputStream(JNIEnv *env, jobject inputStream)
     : env(env), inputStream(inputStream) {
   if (!env->IsInstanceOf(
           inputStream,
-          env->FindClass("org/oxycblt/ktaglib/NativeInputStream"))) {
+          env->FindClass("org/oxycblt/musikr/metadata/NativeInputStream"))) {
     throw std::runtime_error("oStream is not an instance of TagLibOStream");
   }
   jclass inputStreamClass =
-      env->FindClass("org/oxycblt/ktaglib/NativeInputStream");
+      env->FindClass("org/oxycblt/musikr/metadata/NativeInputStream");
   inputStreamNameMethod =
       env->GetMethodID(inputStreamClass, "name", "()Ljava/lang/String;");
   inputStreamReadBlockMethod =
diff --git a/musikr/src/main/cpp/JVMMetadataBuilder.cpp b/musikr/src/main/cpp/JVMMetadataBuilder.cpp
index e4ebbe7a3..e5be63a8b 100644
--- a/musikr/src/main/cpp/JVMMetadataBuilder.cpp
+++ b/musikr/src/main/cpp/JVMMetadataBuilder.cpp
@@ -129,7 +129,7 @@ void JVMMetadataBuilder::setProperties(TagLib::AudioProperties *properties) {
 }
 
 jobject JVMMetadataBuilder::build() {
-  jclass propertiesClass = env->FindClass("org/oxycblt/ktaglib/Properties");
+  jclass propertiesClass = env->FindClass("org/oxycblt/musikr/metadata/Properties");
   jmethodID propertiesInit =
       env->GetMethodID(propertiesClass, "<init>", "(Ljava/lang/String;JII)V");
   jobject propertiesObj = env->NewObject(
@@ -138,11 +138,11 @@ jobject JVMMetadataBuilder::build() {
       properties->sampleRate());
   env->DeleteLocalRef(propertiesClass);
 
-  jclass metadataClass = env->FindClass("org/oxycblt/ktaglib/Metadata");
+  jclass metadataClass = env->FindClass("org/oxycblt/musikr/metadata/Metadata");
   jmethodID metadataInit =
       env->GetMethodID(metadataClass, "<init>",
                        "(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;[BLorg/"
-                       "oxycblt/ktaglib/Properties;)V");
+                       "oxycblt/musikr/metadata/Properties;)V");
   jobject id3v2Map = id3v2.getObject();
   jobject xiphMap = xiph.getObject();
   jobject mp4Map = mp4.getObject();