diff --git a/homeassistant/components/light/services.yaml b/homeassistant/components/light/services.yaml
index c59d9e22483..2cd5921d794 100644
--- a/homeassistant/components/light/services.yaml
+++ b/homeassistant/components/light/services.yaml
@@ -199,7 +199,7 @@ turn_on:
       example: "[255, 100, 100]"
       selector:
         color_rgb:
-    kelvin: &kelvin
+    color_temp_kelvin: &color_temp_kelvin
       filter: *color_temp_support
       selector:
         color_temp:
@@ -316,7 +316,7 @@ toggle:
   fields:
     transition: *transition
     rgb_color: *rgb_color
-    kelvin: *kelvin
+    color_temp_kelvin: *color_temp_kelvin
     brightness_pct: *brightness_pct
     effect: *effect
     advanced_fields:
diff --git a/homeassistant/components/light/strings.json b/homeassistant/components/light/strings.json
index d4b709f65aa..7a53f2569e7 100644
--- a/homeassistant/components/light/strings.json
+++ b/homeassistant/components/light/strings.json
@@ -19,8 +19,8 @@
     "field_flash_name": "Flash",
     "field_hs_color_description": "Color in hue/sat format. A list of two integers. Hue is 0-360 and Sat is 0-100.",
     "field_hs_color_name": "Hue/Sat color",
-    "field_kelvin_description": "Color temperature in Kelvin.",
-    "field_kelvin_name": "Color temperature",
+    "field_color_temp_kelvin_description": "Color temperature in Kelvin.",
+    "field_color_temp_kelvin_name": "Color temperature",
     "field_profile_description": "Name of a light profile to use.",
     "field_profile_name": "Profile",
     "field_rgb_color_description": "The color in RGB format. A list of three integers between 0 and 255 representing the values of red, green, and blue.",
@@ -328,9 +328,9 @@
           "name": "[%key:component::light::common::field_color_temp_name%]",
           "description": "[%key:component::light::common::field_color_temp_description%]"
         },
-        "kelvin": {
-          "name": "[%key:component::light::common::field_kelvin_name%]",
-          "description": "[%key:component::light::common::field_kelvin_description%]"
+        "color_temp_kelvin": {
+          "name": "[%key:component::light::common::field_color_temp_kelvin_name%]",
+          "description": "[%key:component::light::common::field_color_temp_kelvin_description%]"
         },
         "brightness": {
           "name": "[%key:component::light::common::field_brightness_name%]",
@@ -426,9 +426,9 @@
           "name": "[%key:component::light::common::field_color_temp_name%]",
           "description": "[%key:component::light::common::field_color_temp_description%]"
         },
-        "kelvin": {
-          "name": "[%key:component::light::common::field_kelvin_name%]",
-          "description": "[%key:component::light::common::field_kelvin_description%]"
+        "color_temp_kelvin": {
+          "name": "[%key:component::light::common::field_color_temp_kelvin_name%]",
+          "description": "[%key:component::light::common::field_color_temp_kelvin_description%]"
         },
         "brightness": {
           "name": "[%key:component::light::common::field_brightness_name%]",