diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index dcf81280f41..a00fbb4db04 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -409,7 +409,7 @@
     </string-array>
 
     <!-- Sim Cards display numbers. Range of data usage. -->
-    <string-array name="data_usage_data_range">
+    <string-array name="sim_card_data_range">
         <!-- Last 4 digits [CHAR LIMIT=40]-->
         <item>Last 4 digits</item>
         <!-- First 4 digits [CHAR LIMIT=40]-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 64776a8da5b..bd54b7c457a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -623,10 +623,10 @@
     <string name="okay">OK</string>
 
     <!-- Button label for generic YES action [CHAR LIMIT=20] -->
-    <string name="okay">YES</string>
+    <string name="yes_all_caps">YES</string>
 
     <!-- Button label for generic NO action [CHAR LIMIT=20] -->
-    <string name="okay">NO</string>
+    <string name="no_all_caps">NO</string>
 
     <!-- Button label for generic FORGET action [CHAR LIMIT=20] -->
     <string name="forget">FORGET</string>
@@ -1289,7 +1289,7 @@
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
     <!-- Wifi Assistant title string.  [CHAR LIMIT=40] -->
-    <string name="wifi_assistant_setup">Wi\u2011Fi Assistant</string>
+    <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
     <!-- Wifi Assistant No, thanks string.  Text to say no to wifi assistant. [CHAR LIMIT=20] -->
     <string name="wifi_assistant_no_thanks">NO, THANKS</string>
     <!-- Wifi Assistant setup string.  Text to say yes to wifi assistant and begin setup. [CHAR LIMIT=20] -->
@@ -1791,7 +1791,7 @@
     <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
     <string name="wifi_hotspot_configure_ap_text">Wi\u2011Fi hotspot setup</string>
     <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=40] -->
-    <string name="wifi_hotspot_configure_ap_text">AndroidAP WPA2 PSK portable Wi\u2011Fi hotspot</string>
+    <string name="wifi_hotspot_configure_ap_text_summary">AndroidAP WPA2 PSK portable Wi\u2011Fi hotspot</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
     <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi\u2011Fi hotspot</string>
     <!-- Default access point SSID used for tethering -->