diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index fefd0cf0d89..3b0260437df 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -110,13 +110,13 @@
     <string name="basic_sensor_name_total_rx_gb">Total Rx GB</string>
     <string name="basic_sensor_name_total_tx_gb">Total Tx GB</string>
     <string name="basic_sensor_name_weight">Weight</string>
-    <string name="basic_sensor_name_wifi_bssid">WiFi BSSID</string>
-    <string name="basic_sensor_name_wifi_frequency">WiFi frequency</string>
-    <string name="basic_sensor_name_wifi_ip">WiFi IP address</string>
-    <string name="basic_sensor_name_wifi_link_speed">WiFi link speed</string>
-    <string name="basic_sensor_name_wifi_signal">WiFi signal strength</string>
-    <string name="basic_sensor_name_wifi_state">WiFi state</string>
-    <string name="basic_sensor_name_wifi">WiFi connection</string>
+    <string name="basic_sensor_name_wifi_bssid">Wi-Fi BSSID</string>
+    <string name="basic_sensor_name_wifi_frequency">Wi-Fi frequency</string>
+    <string name="basic_sensor_name_wifi_ip">Wi-Fi IP address</string>
+    <string name="basic_sensor_name_wifi_link_speed">Wi-Fi link speed</string>
+    <string name="basic_sensor_name_wifi_signal">Wi-Fi signal strength</string>
+    <string name="basic_sensor_name_wifi_state">Wi-Fi state</string>
+    <string name="basic_sensor_name_wifi">Wi-Fi connection</string>
     <string name="basic_sensor_name_hotspot_state">Hotspot state</string>
     <string name="binary_sensor">Binary sensor</string>
     <string name="biometric_message">Unlock using your biometric or screen lock credentials</string>
@@ -224,7 +224,7 @@
     <string name="enable_all_sensors_summary">All required permissions will be requested upon enabling</string>
     <string name="enable_all_sensors">Enable all sensors</string>
     <string name="enable_location_tracking_description">Enabling this sensor will allow the Home Assistant application to track your location and report it back to your instance of Home Assistant. Ensure that you enable background access to location, otherwise we cannot enable location tracking. Your location data is sent directly to your Home Assistant instance and is never sent to a 3rd party.</string>
-    <string name="enable_location_tracking_prompt">This app collects location data to enable location tracking, WiFi connection status, and URL decision making even when the app is closed or not in use.</string>
+    <string name="enable_location_tracking_prompt">This app collects location data to enable location tracking, Wi-Fi connection status, and URL decision making even when the app is closed or not in use.</string>
     <string name="enable_location_tracking">Enable location tracking</string>
     <string name="enable_remaining_sensors">Enable %1$d sensors</string>
     <string name="enable_sensor">Enable sensor</string>
@@ -426,7 +426,7 @@
     <string name="manage_shortcuts_summary">Manage launcher shortcuts</string>
     <string name="manage_shortcuts">Manage shortcuts</string>
     <string name="manage_ssids_input_exists">This SSID already exists.</string>
-    <string name="manage_ssids_input">New WiFi SSID</string>
+    <string name="manage_ssids_input">New Wi-Fi SSID</string>
     <string name="manage_ssids_introduction">The internal connection URL will be used when connected to one of the listed SSIDs.</string>
     <string name="manage_ssids">Manage SSID(s)</string>
     <string name="manage_this_notification">Manage this notification</string>
@@ -615,7 +615,7 @@
     <string name="sensor_description_headphone">Whether headphones are plugged into the device</string>
     <string name="sensor_description_headset_mounted">Whether the headset is currently in use</string>
     <string name="sensor_description_high_accuracy_mode">Whether high accuracy mode is active on the device</string>
-    <string name="sensor_description_hotspot">Whether the WIFI hotspot is enabled</string>
+    <string name="sensor_description_hotspot">Whether the Wi-Fi hotspot is enabled</string>
     <string name="sensor_description_interactive">Whether the device is in an interactive state</string>
     <string name="sensor_description_internal_storage">Information about the total and available storage space internally</string>
     <string name="sensor_description_ip6_addresses">The IPv6 addresses bound to the currently active network interface</string>
@@ -660,13 +660,13 @@
     <string name="sensor_description_volume_music">Volume level for music on the device</string>
     <string name="sensor_description_volume_ring">Volume level for the ringer on the device</string>
     <string name="sensor_description_weight">Last recorded weight in Health Connect</string>
-    <string name="sensor_description_wifi_bssid">The MAC address of the currently connected WiFi access point. Enabling the \"Get current BSSID\" toggle will create a new setting allowing you to rename the state sent back to Home Assistant for the chosen MAC address. The toggle will default to off after the current BSSID is stored, so you will need to enable it once for each BSSID you wish to rename. You can also clear out the value to remove the setting in the next update.</string>
+    <string name="sensor_description_wifi_bssid">The MAC address of the currently connected Wi-Fi access point. Enabling the \"Get current BSSID\" toggle will create a new setting allowing you to rename the state sent back to Home Assistant for the chosen MAC address. The toggle will default to off after the current BSSID is stored, so you will need to enable it once for each BSSID you wish to rename. You can also clear out the value to remove the setting in the next update.</string>
     <string name="sensor_description_wifi_connection">The name of the network the device is currently connected to</string>
     <string name="sensor_description_wifi_frequency">The frequency band of the connected network</string>
     <string name="sensor_description_wifi_ip">The current IP address of the device on the network</string>
     <string name="sensor_description_wifi_link_speed">The current link speed of the device to the connected network</string>
-    <string name="sensor_description_wifi_signal">The signal strength of the device to the WiFi network</string>
-    <string name="sensor_description_wifi_state">Whether WiFi is enabled on the device</string>
+    <string name="sensor_description_wifi_signal">The signal strength of the device to the Wi-Fi network</string>
+    <string name="sensor_description_wifi_state">Whether Wi-Fi is enabled on the device</string>
     <string name="sensor_description_work_profile">Whether the work profile is currently active on the device</string>
     <string name="sensor_name_activity">Activity sensors</string>
     <string name="sensor_name_alarm">Alarm sensor</string>