diff --git a/homeassistant/components/smartthings/strings.json b/homeassistant/components/smartthings/strings.json
index 2c77f7b9fe0..607583c8941 100644
--- a/homeassistant/components/smartthings/strings.json
+++ b/homeassistant/components/smartthings/strings.json
@@ -405,7 +405,7 @@
         }
       },
       "oven_setpoint": {
-        "name": "Set point"
+        "name": "Setpoint"
       },
       "energy_difference": {
         "name": "Energy difference"
@@ -472,13 +472,13 @@
         }
       },
       "thermostat_cooling_setpoint": {
-        "name": "Cooling set point"
+        "name": "Cooling setpoint"
       },
       "thermostat_fan_mode": {
         "name": "Fan mode"
       },
       "thermostat_heating_setpoint": {
-        "name": "Heating set point"
+        "name": "Heating setpoint"
       },
       "thermostat_mode": {
         "name": "Mode"
diff --git a/tests/components/smartthings/snapshots/test_sensor.ambr b/tests/components/smartthings/snapshots/test_sensor.ambr
index 2884ded50af..f5fe09cc4d5 100644
--- a/tests/components/smartthings/snapshots/test_sensor.ambr
+++ b/tests/components/smartthings/snapshots/test_sensor.ambr
@@ -3635,7 +3635,7 @@
     'state': 'others',
   })
 # ---
-# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_set_point-entry]
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_setpoint-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -3648,7 +3648,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.microwave_set_point',
+    'entity_id': 'sensor.microwave_setpoint',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -3660,7 +3660,7 @@
     }),
     'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
     'original_icon': None,
-    'original_name': 'Set point',
+    'original_name': 'Setpoint',
     'platform': 'smartthings',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -3669,15 +3669,15 @@
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_set_point-state]
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_setpoint-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'Microwave Set point',
+      'friendly_name': 'Microwave Setpoint',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.microwave_set_point',
+    'entity_id': 'sensor.microwave_setpoint',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -4033,7 +4033,7 @@
     'state': 'bake',
   })
 # ---
-# name: test_all_entities[da_ks_oven_01061][sensor.oven_set_point-entry]
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_setpoint-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -4046,7 +4046,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.oven_set_point',
+    'entity_id': 'sensor.oven_setpoint',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -4058,7 +4058,7 @@
     }),
     'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
     'original_icon': None,
-    'original_name': 'Set point',
+    'original_name': 'Setpoint',
     'platform': 'smartthings',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -4067,15 +4067,15 @@
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_all_entities[da_ks_oven_01061][sensor.oven_set_point-state]
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_setpoint-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'Oven Set point',
+      'friendly_name': 'Oven Setpoint',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.oven_set_point',
+    'entity_id': 'sensor.oven_setpoint',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -4488,7 +4488,7 @@
     'state': 'bake',
   })
 # ---
-# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_set_point-entry]
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_setpoint-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -4501,7 +4501,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.vulcan_set_point',
+    'entity_id': 'sensor.vulcan_setpoint',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -4513,7 +4513,7 @@
     }),
     'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
     'original_icon': None,
-    'original_name': 'Set point',
+    'original_name': 'Setpoint',
     'platform': 'smartthings',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -4522,15 +4522,15 @@
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_set_point-state]
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_setpoint-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'Vulcan Set point',
+      'friendly_name': 'Vulcan Setpoint',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.vulcan_set_point',
+    'entity_id': 'sensor.vulcan_setpoint',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -11374,7 +11374,7 @@
     'state': 'cool',
   })
 # ---
-# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_set_point-entry]
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_setpoint-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -11387,7 +11387,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.office_cooling_set_point',
+    'entity_id': 'sensor.office_cooling_setpoint',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -11399,7 +11399,7 @@
     }),
     'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
     'original_icon': None,
-    'original_name': 'Cooling set point',
+    'original_name': 'Cooling setpoint',
     'platform': 'smartthings',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -11408,15 +11408,15 @@
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_set_point-state]
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_setpoint-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'Office Cooling set point',
+      'friendly_name': 'Office Cooling setpoint',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.office_cooling_set_point',
+    'entity_id': 'sensor.office_cooling_setpoint',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,