diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
index 0725c729..a0e842e0 100644
--- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
+++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
@@ -93,7 +93,7 @@ PropertyMap UniqueFileIdentifierFrame::asProperties() const
 {
   PropertyMap map;
   if(d->owner == "http://musicbrainz.org") {
-    map.insert("MUSICBRAINZ_RECORDINGID", String(d->identifier));
+    map.insert("MUSICBRAINZ_TRACKID", String(d->identifier));
   }
   else {
     map.unsupportedData().append(frameID() + String("/") + d->owner);
diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 372778b1..37d96846 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -127,7 +127,7 @@ Frame *Frame::createTextualFrame(const String &key, const StringList &values) //
         return frame;
     }
   }
-  if(key == "MUSICBRAINZ_RECORDINGID" && values.size() == 1) {
+  if(key == "MUSICBRAINZ_TRACKID" && values.size() == 1) {
     UniqueFileIdentifierFrame *frame = new UniqueFileIdentifierFrame("http://musicbrainz.org", values.front().data(String::UTF8));
     return frame;
   }
@@ -394,9 +394,9 @@ static const char *frameTranslation[][2] = {
 
 static const TagLib::uint txxxFrameTranslationSize = 7;
 static const char *txxxFrameTranslation[][2] = {
-  { "MusicBrainz Album Id", "MUSICBRAINZ_RELEASEID" },
+  { "MusicBrainz Album Id", "MUSICBRAINZ_ALBUMID" },
   { "MusicBrainz Artist Id", "MUSICBRAINZ_ARTISTID" },
-  { "MusicBrainz Album Artist Id", "MUSICBRAINZ_RELEASEARTISTID" },
+  { "MusicBrainz Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
   { "MusicBrainz Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
   { "MusicBrainz Work Id", "MUSICBRAINZ_WORKID" },
   { "Acoustid Id", "ACOUSTID_ID" },
diff --git a/taglib/toolkit/tpropertymap.h b/taglib/toolkit/tpropertymap.h
index 8073003e..c6d19fef 100644
--- a/taglib/toolkit/tpropertymap.h
+++ b/taglib/toolkit/tpropertymap.h
@@ -78,12 +78,12 @@ namespace TagLib {
    *
    * MusicBrainz identifiers:
    * 
-   *  - MUSICBRAINZ_RECORDINGID
-   *  - MUSICBRAINZ_RELEASEID
+   *  - MUSICBRAINZ_TRACKID
+   *  - MUSICBRAINZ_ALBUMID
    *  - MUSICBRAINZ_RELEASEGROUPID
    *  - MUSICBRAINZ_WORKID
    *  - MUSICBRAINZ_ARTISTID
-   *  - MUSICBRAINZ_RELEASEARTISTID
+   *  - MUSICBRAINZ_ALBUMARTISTID
    *  - ACOUSTID_ID
    *  - ACOUSTID_FINGERPRINT
    *  - MUSICIP_PUID
diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index b48bd68f..48faf306 100644
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -683,11 +683,11 @@ public:
     CPPUNIT_ASSERT(properties.contains("LYRICS"));
     CPPUNIT_ASSERT(properties.contains("LYRICS:TEST"));
 
-    CPPUNIT_ASSERT(properties.contains("MUSICBRAINZ_RECORDINGID"));
-    CPPUNIT_ASSERT_EQUAL(String("152454b9-19ba-49f3-9fc9-8fc26545cf41"), properties["MUSICBRAINZ_RECORDINGID"].front());
+    CPPUNIT_ASSERT(properties.contains("MUSICBRAINZ_TRACKID"));
+    CPPUNIT_ASSERT_EQUAL(String("152454b9-19ba-49f3-9fc9-8fc26545cf41"), properties["MUSICBRAINZ_TRACKID"].front());
 
-    CPPUNIT_ASSERT(properties.contains("MUSICBRAINZ_RELEASEID"));
-    CPPUNIT_ASSERT_EQUAL(String("95c454a5-d7e0-4d8f-9900-db04aca98ab3"), properties["MUSICBRAINZ_RELEASEID"].front());
+    CPPUNIT_ASSERT(properties.contains("MUSICBRAINZ_ALBUMID"));
+    CPPUNIT_ASSERT_EQUAL(String("95c454a5-d7e0-4d8f-9900-db04aca98ab3"), properties["MUSICBRAINZ_ALBUMID"].front());
 
     tag.removeUnsupportedProperties(properties.unsupportedData());
     CPPUNIT_ASSERT(tag.frameList("APIC").isEmpty());