diff --git a/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.md b/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.md
index 5806104f65..daa71f718a 100644
--- a/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.md
+++ b/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.md
@@ -21,11 +21,11 @@ When you run the sample, the app will load a web map which contains premium cont
 
 ## Relevant API
 
- * AuthenticationManager
- * OAuthConfiguration
- * PortalItem
- * ServerInfo
- 
+* AuthenticationManager
+* OAuthConfiguration
+* PortalItem
+* ServerInfo
+
 ## Additional information
 
 The workflow presented in this sample works for most SAML based enterprise (IWA, PKI, Okta, etc.) & social (facebook, google, etc.) identity providers for ArcGIS Online or Portal. For more information click [here](https://doc.arcgis.com/en/arcgis-online/administer/enterprise-logins.htm).
diff --git a/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.metadata.json b/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.metadata.json
index 8251ee215c..be0b512474 100644
--- a/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.metadata.json
+++ b/src/Android/Xamarin.Android/Samples/Security/OAuth/readme.metadata.json
@@ -7,9 +7,13 @@
         "OAuth.jpg"
     ],
     "keywords": [
-        "Authentication",
         "OAuth",
-        "Security"
+        "OAuth2",
+        "authentication",
+        "cloud",
+        "credential",
+        "portal",
+        "security"
     ],
     "nuget_packages": {
         "Esri.ArcGISRuntime": "100.7.0"
@@ -19,9 +23,10 @@
         "/net/latest/android/sample-code/oauth.htm"
     ],
     "relevant_apis": [
-        "ArcGISPortal",
         "AuthenticationManager",
-        "Credential"
+        "OAuthConfiguration",
+        "PortalItem",
+        "ServerInfo"
     ],
     "snippets": [
         "OAuth.cs"
diff --git a/src/Forms/Shared/Samples/Security/OAuth/readme.md b/src/Forms/Shared/Samples/Security/OAuth/readme.md
index 5806104f65..daa71f718a 100644
--- a/src/Forms/Shared/Samples/Security/OAuth/readme.md
+++ b/src/Forms/Shared/Samples/Security/OAuth/readme.md
@@ -21,11 +21,11 @@ When you run the sample, the app will load a web map which contains premium cont
 
 ## Relevant API
 
- * AuthenticationManager
- * OAuthConfiguration
- * PortalItem
- * ServerInfo
- 
+* AuthenticationManager
+* OAuthConfiguration
+* PortalItem
+* ServerInfo
+
 ## Additional information
 
 The workflow presented in this sample works for most SAML based enterprise (IWA, PKI, Okta, etc.) & social (facebook, google, etc.) identity providers for ArcGIS Online or Portal. For more information click [here](https://doc.arcgis.com/en/arcgis-online/administer/enterprise-logins.htm).
diff --git a/src/Forms/Shared/Samples/Security/OAuth/readme.metadata.json b/src/Forms/Shared/Samples/Security/OAuth/readme.metadata.json
index 60faef4cf7..26b4402585 100644
--- a/src/Forms/Shared/Samples/Security/OAuth/readme.metadata.json
+++ b/src/Forms/Shared/Samples/Security/OAuth/readme.metadata.json
@@ -7,9 +7,13 @@
         "OAuth.jpg"
     ],
     "keywords": [
-        "Authentication",
         "OAuth",
-        "Security"
+        "OAuth2",
+        "authentication",
+        "cloud",
+        "credential",
+        "portal",
+        "security"
     ],
     "nuget_packages": {
         "Esri.ArcGISRuntime": "100.7.0"
@@ -19,9 +23,10 @@
         "/net/latest/forms/sample-code/oauth.htm"
     ],
     "relevant_apis": [
-        "ArcGISPortal",
         "AuthenticationManager",
-        "Credential"
+        "OAuthConfiguration",
+        "PortalItem",
+        "ServerInfo"
     ],
     "snippets": [
         "OAuth.xaml",
diff --git a/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.md b/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.md
index 5806104f65..daa71f718a 100644
--- a/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.md
+++ b/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.md
@@ -21,11 +21,11 @@ When you run the sample, the app will load a web map which contains premium cont
 
 ## Relevant API
 
- * AuthenticationManager
- * OAuthConfiguration
- * PortalItem
- * ServerInfo
- 
+* AuthenticationManager
+* OAuthConfiguration
+* PortalItem
+* ServerInfo
+
 ## Additional information
 
 The workflow presented in this sample works for most SAML based enterprise (IWA, PKI, Okta, etc.) & social (facebook, google, etc.) identity providers for ArcGIS Online or Portal. For more information click [here](https://doc.arcgis.com/en/arcgis-online/administer/enterprise-logins.htm).
diff --git a/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.metadata.json b/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.metadata.json
index 5361d673af..1954344507 100644
--- a/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.metadata.json
+++ b/src/UWP/ArcGISRuntime.UWP.Viewer/Samples/Security/OAuth/readme.metadata.json
@@ -7,9 +7,13 @@
         "OAuth.jpg"
     ],
     "keywords": [
-        "Authentication",
         "OAuth",
-        "Security"
+        "OAuth2",
+        "authentication",
+        "cloud",
+        "credential",
+        "portal",
+        "security"
     ],
     "nuget_packages": {
         "Esri.ArcGISRuntime": "100.7.0"
@@ -19,9 +23,10 @@
         "/net/latest/uwp/sample-code/oauth.htm"
     ],
     "relevant_apis": [
-        "ArcGISPortal",
         "AuthenticationManager",
-        "Credential"
+        "OAuthConfiguration",
+        "PortalItem",
+        "ServerInfo"
     ],
     "snippets": [
         "OAuth.xaml",
diff --git a/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.md b/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.md
index 5806104f65..daa71f718a 100644
--- a/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.md
+++ b/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.md
@@ -21,11 +21,11 @@ When you run the sample, the app will load a web map which contains premium cont
 
 ## Relevant API
 
- * AuthenticationManager
- * OAuthConfiguration
- * PortalItem
- * ServerInfo
- 
+* AuthenticationManager
+* OAuthConfiguration
+* PortalItem
+* ServerInfo
+
 ## Additional information
 
 The workflow presented in this sample works for most SAML based enterprise (IWA, PKI, Okta, etc.) & social (facebook, google, etc.) identity providers for ArcGIS Online or Portal. For more information click [here](https://doc.arcgis.com/en/arcgis-online/administer/enterprise-logins.htm).
diff --git a/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.metadata.json b/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.metadata.json
index 3a62ebc854..c57e3b884f 100644
--- a/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.metadata.json
+++ b/src/WPF/ArcGISRuntime.WPF.Viewer/Samples/Security/OAuth/readme.metadata.json
@@ -7,9 +7,13 @@
         "OAuth.jpg"
     ],
     "keywords": [
-        "Authentication",
         "OAuth",
-        "Security"
+        "OAuth2",
+        "authentication",
+        "cloud",
+        "credential",
+        "portal",
+        "security"
     ],
     "nuget_packages": {
         "Esri.ArcGISRuntime": "100.7.0"
@@ -19,9 +23,10 @@
         "/net/latest/wpf/sample-code/oauth.htm"
     ],
     "relevant_apis": [
-        "ArcGISPortal",
         "AuthenticationManager",
-        "Credential"
+        "OAuthConfiguration",
+        "PortalItem",
+        "ServerInfo"
     ],
     "snippets": [
         "OAuth.xaml",
diff --git a/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.md b/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.md
index 5806104f65..daa71f718a 100644
--- a/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.md
+++ b/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.md
@@ -21,11 +21,11 @@ When you run the sample, the app will load a web map which contains premium cont
 
 ## Relevant API
 
- * AuthenticationManager
- * OAuthConfiguration
- * PortalItem
- * ServerInfo
- 
+* AuthenticationManager
+* OAuthConfiguration
+* PortalItem
+* ServerInfo
+
 ## Additional information
 
 The workflow presented in this sample works for most SAML based enterprise (IWA, PKI, Okta, etc.) & social (facebook, google, etc.) identity providers for ArcGIS Online or Portal. For more information click [here](https://doc.arcgis.com/en/arcgis-online/administer/enterprise-logins.htm).
diff --git a/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.metadata.json b/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.metadata.json
index 1c6e40363b..5536af46ad 100644
--- a/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.metadata.json
+++ b/src/iOS/Xamarin.iOS/Samples/Security/OAuth/readme.metadata.json
@@ -7,9 +7,13 @@
         "OAuth.jpg"
     ],
     "keywords": [
-        "Authentication",
         "OAuth",
-        "Security"
+        "OAuth2",
+        "authentication",
+        "cloud",
+        "credential",
+        "portal",
+        "security"
     ],
     "nuget_packages": {
         "Esri.ArcGISRuntime": "100.7.0"
@@ -19,9 +23,10 @@
         "/net/latest/ios/sample-code/oauth.htm"
     ],
     "relevant_apis": [
-        "ArcGISPortal",
         "AuthenticationManager",
-        "Credential"
+        "OAuthConfiguration",
+        "PortalItem",
+        "ServerInfo"
     ],
     "snippets": [
         "OAuth.cs"