diff --git a/Src/Fido2.Models/Metadata/AlternativeDescriptions.cs b/Src/Fido2.Models/Metadata/AlternativeDescriptions.cs
deleted file mode 100644
index 530c2bca..00000000
--- a/Src/Fido2.Models/Metadata/AlternativeDescriptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Fido2NetLib;
-
-/// <summary>
-/// This descriptor contains description in alternative languages.
-/// </summary>
-/// <remarks>
-/// <see href="https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-metadata-statement-v2.0-rd-20180702.html#alternativedescriptions-dictionary"/>
-/// </remarks>
-public class AlternativeDescriptions
-{
-    /// <summary>
-    /// Gets or sets alternative descriptions of the authenticator.
-    /// <para>
-    /// Contains IETF language codes as key (e.g. "ru-RU", "de", "fr-FR") and a localized description as value.
-    /// </para>
-    /// </summary>
-    /// <remarks>
-    /// Contains IETF language codes, defined by a primary language subtag, 
-    /// followed by a region subtag based on a two-letter country code from [ISO3166] alpha-2 (usually written in upper case).
-    /// <para>Each description SHALL NOT exceed a maximum length of 200 characters.</para>
-    /// <para>Description values can contain any UTF-8 characters.</para>
-    /// </remarks>
-    [JsonPropertyName("alternativeDescriptions")]
-    public Dictionary<string, string> IETFLanguageCodesMembers { get; set; }
-}
diff --git a/Src/Fido2.Models/Metadata/AuthenticatorStatus.cs b/Src/Fido2.Models/Metadata/AuthenticatorStatus.cs
index 54d0e46b..304d2ce8 100644
--- a/Src/Fido2.Models/Metadata/AuthenticatorStatus.cs
+++ b/Src/Fido2.Models/Metadata/AuthenticatorStatus.cs
@@ -6,7 +6,7 @@ namespace Fido2NetLib;
 /// Describes the status of an authenticator model as identified by its AAID and potentially some additional information (such as a specific attestation key).
 /// </summary>
 /// <remarks>
-/// <see href="https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-metadata-service-v2.0-rd-20180702.html#authenticatorstatus-enum"/>
+/// <see href="https://fidoalliance.org/specs/mds/fido-metadata-service-v3.0-ps-20210518.html#authenticatorstatus-enum"/>
 /// </remarks>
 [JsonConverter(typeof(JsonStringEnumConverter<AuthenticatorStatus>))]
 public enum AuthenticatorStatus
diff --git a/Src/Fido2.Models/Metadata/BiometricStatusReport.cs b/Src/Fido2.Models/Metadata/BiometricStatusReport.cs
index 669983a4..d557b9c3 100644
--- a/Src/Fido2.Models/Metadata/BiometricStatusReport.cs
+++ b/Src/Fido2.Models/Metadata/BiometricStatusReport.cs
@@ -7,7 +7,7 @@ namespace Fido2NetLib;
 /// Contains the current BiometricStatusReport of one of the authenticator's biometric component.
 /// </summary>
 /// <remarks>
-/// <see href="https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-metadata-service-v2.0-rd-20180702.html#biometricstatusreport-dictionary"/>
+/// <see href="https://fidoalliance.org/specs/mds/fido-metadata-service-v3.0-ps-20210518.html#biometricstatusreport-dictionary"/>
 /// </remarks>
 public class BiometricStatusReport
 {
diff --git a/Src/Fido2.Models/Metadata/MetadataStatement.cs b/Src/Fido2.Models/Metadata/MetadataStatement.cs
index af7dc054..e838136a 100644
--- a/Src/Fido2.Models/Metadata/MetadataStatement.cs
+++ b/Src/Fido2.Models/Metadata/MetadataStatement.cs
@@ -7,7 +7,7 @@ namespace Fido2NetLib;
 /// Represents the metadata statement.
 /// </summary>
 /// <remarks>
-/// <see href="https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-metadata-statement-v2.0-rd-20180702.html#metadata-keys"/>
+/// <see href="https://fidoalliance.org/specs/mds/fido-metadata-statement-v3.0-ps-20210518.html"/>
 /// </remarks>
 public class MetadataStatement
 {
@@ -48,11 +48,19 @@ public class MetadataStatement
     [JsonPropertyName("description"), Required]
     public string Description { get; set; }
 
+    /// <summary>
+    /// Gets or sets a human-readable, short description of the authenticator, in alternative languages. 
+    /// </summary>
+    /// <value>A dictionary where keys are IETF language codes (e.g. "de-AT" for Austrian-German) and values are human-readable descriptions.</value>
+    [JsonPropertyName("friendlyNames")]
+    public IDictionary<string, string> FriendlyNames { get; set; }
+
     /// <summary>
     /// Gets or set a list of human-readable short descriptions of the authenticator in different languages.
     /// </summary>
+    /// <value>A dictionary where keys are IETF language codes (e.g. "de-AT" for Austrian-German) and values are human-readable descriptions.</value>
     [JsonPropertyName("alternativeDescriptions")]
-    public AlternativeDescriptions IETFLanguageCodesMembers { get; set; }
+    public IDictionary<string, string> AlternativeDescriptions { get; set; }
 
     /// <summary>
     /// Gets or set earliest (i.e. lowest) trustworthy authenticatorVersion meeting the requirements specified in this metadata statement. 
diff --git a/Src/Fido2.Models/Metadata/StatusReport.cs b/Src/Fido2.Models/Metadata/StatusReport.cs
index 7ddcad5d..f2b860d9 100644
--- a/Src/Fido2.Models/Metadata/StatusReport.cs
+++ b/Src/Fido2.Models/Metadata/StatusReport.cs
@@ -7,7 +7,7 @@ namespace Fido2NetLib;
 /// Contains an AuthenticatorStatus and additional data associated with it, if any.
 /// </summary>
 /// <remarks>
-/// <see href="https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-metadata-service-v2.0-rd-20180702.html#statusreport-dictionary"/>
+/// <see href="https://fidoalliance.org/specs/mds/fido-metadata-service-v3.0-ps-20210518.html#statusreport-dictionary"/>
 /// </remarks>
 public sealed class StatusReport
 {