diff --git a/musikr/src/main/jni/shim/id3v1_shim.cpp b/musikr/src/main/jni/shim/id3v1_shim.cpp
index 8e6abcebe..9c1da1582 100644
--- a/musikr/src/main/jni/shim/id3v1_shim.cpp
+++ b/musikr/src/main/jni/shim/id3v1_shim.cpp
@@ -1,31 +1,31 @@
 #include "id3v1_shim.hpp"
 
 namespace taglib_shim {
-    std::unique_ptr<String> ID3v1Tag_title(const ID3v1::Tag& tag) {
-        return std::make_unique<String>(tag.title());
+    std::unique_ptr<TagLib::String> ID3v1Tag_title(const TagLib::ID3v1::Tag& tag) {
+        return std::make_unique<TagLib::String>(tag.title());
     }
 
-    std::unique_ptr<String> ID3v1Tag_artist(const ID3v1::Tag& tag) {
-        return std::make_unique<String>(tag.artist());
+    std::unique_ptr<TagLib::String> ID3v1Tag_artist(const TagLib::ID3v1::Tag& tag) {
+        return std::make_unique<TagLib::String>(tag.artist());
     }
 
-    std::unique_ptr<String> ID3v1Tag_album(const ID3v1::Tag& tag) {
-        return std::make_unique<String>(tag.album());
+    std::unique_ptr<TagLib::String> ID3v1Tag_album(const TagLib::ID3v1::Tag& tag) {
+        return std::make_unique<TagLib::String>(tag.album());
     }
 
-    std::unique_ptr<String> ID3v1Tag_comment(const ID3v1::Tag& tag) {
-        return std::make_unique<String>(tag.comment());
+    std::unique_ptr<TagLib::String> ID3v1Tag_comment(const TagLib::ID3v1::Tag& tag) {
+        return std::make_unique<TagLib::String>(tag.comment());
     }
 
-    uint ID3v1Tag_genreIndex(const ID3v1::Tag& tag) {
-        return tag.genreIndex();
+    uint ID3v1Tag_genreIndex(const TagLib::ID3v1::Tag& tag) {
+        return tag.genreNumber();
     }
 
-    uint ID3v1Tag_year(const ID3v1::Tag& tag) {
+    uint ID3v1Tag_year(const TagLib::ID3v1::Tag& tag) {
         return tag.year();
     }
 
-    uint ID3v1Tag_track(const ID3v1::Tag& tag) {
+    uint ID3v1Tag_track(const TagLib::ID3v1::Tag& tag) {
         return tag.track();
     }
 } 
\ No newline at end of file