diff --git a/id3/id3v2frameids.cpp b/id3/id3v2frameids.cpp
index e943948..808ffce 100644
--- a/id3/id3v2frameids.cpp
+++ b/id3/id3v2frameids.cpp
@@ -57,8 +57,8 @@ std::uint32_t convertToShortId(std::uint32_t id)
         return sEncoderSettings;
     case lUnsynchronizedLyrics:
         return sUnsynchronizedLyrics;
-    case lGrouping:
-        return sGrouping;
+    case lAlbumArtist:
+        return sAlbumArtist;
     case lContentGroupDescription:
         return sContentGroupDescription;
     case lRecordLabel:
@@ -111,8 +111,8 @@ std::uint32_t convertToLongId(std::uint32_t id)
         return lEncoderSettings;
     case sUnsynchronizedLyrics:
         return lUnsynchronizedLyrics;
-    case sGrouping:
-        return lGrouping;
+    case sAlbumArtist:
+        return lAlbumArtist;
     case sContentGroupDescription:
         return lContentGroupDescription;
     case sRecordLabel:
diff --git a/id3/id3v2frameids.h b/id3/id3v2frameids.h
index bcd7a45..af6848e 100644
--- a/id3/id3v2frameids.h
+++ b/id3/id3v2frameids.h
@@ -27,7 +27,7 @@ enum KnownValue : std::uint32_t {
     lEncoderSettings = 0x54535345,
     lUnsynchronizedLyrics = 0x55534c54,
     lSynchronizedLyrics = 0x53594C54,
-    lGrouping = 0x54504532, // FIXME: rename to lAlbumArtist in v9
+    lAlbumArtist = 0x54504532,
     lContentGroupDescription = 0x54495431,
     lRecordLabel = 0x54505542,
     lUniqueFileId = 0x55464944,
@@ -53,7 +53,7 @@ enum KnownValue : std::uint32_t {
     sEncoderSettings = 0x545353,
     sUnsynchronizedLyrics = 0x554C54,
     sSynchronizedLyrics = 0x534C54,
-    sGrouping = 0x545032, // FIXME: rename to sAlbumArtist in v9
+    sAlbumArtist = 0x545032,
     sContentGroupDescription = 0x545431,
     sRecordLabel = 0x545042,
     sUniqueFileId = 0x554649,
diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp
index d67cc98..52b6259 100644
--- a/id3/id3v2tag.cpp
+++ b/id3/id3v2tag.cpp
@@ -184,7 +184,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
         case KnownField::Rating:
             return lRating;
         case KnownField::AlbumArtist:
-            return lGrouping;
+            return lAlbumArtist;
         default:;
         }
     } else {
@@ -234,7 +234,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
         case KnownField::Rating:
             return sRating;
         case KnownField::AlbumArtist:
-            return sGrouping;
+            return sAlbumArtist;
         default:;
         }
     }
@@ -281,7 +281,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
         return KnownField::Lyrics;
     case lSynchronizedLyrics:
         return KnownField::SynchronizedLyrics;
-    case lGrouping:
+    case lAlbumArtist:
         return KnownField::AlbumArtist;
     case lContentGroupDescription:
         return KnownField::Grouping;
@@ -321,7 +321,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
         return KnownField::Lyrics;
     case sSynchronizedLyrics:
         return KnownField::SynchronizedLyrics;
-    case sGrouping:
+    case sAlbumArtist:
         return KnownField::Grouping;
     case sRecordLabel:
         return KnownField::RecordLabel;