diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index c3b1aa9c42a..06f50b429f8 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1639,7 +1639,7 @@ class CYCLES_LIGHT_PT_beam_shape(CyclesButtonsPanel, Panel):
 
         col = layout.column()
         if light.type == 'SPOT':
-            col.prop(light, "spot_size", text="Spot Size")
+            col.prop(light, "spot_size", text="Angle")
             col.prop(light, "spot_blend", text="Blend", slider=True)
             col.prop(light, "show_cone")
         elif light.type == 'AREA':
diff --git a/scripts/addons_core/hydra_storm/ui.py b/scripts/addons_core/hydra_storm/ui.py
index a33de401252..672b4d7fbea 100644
--- a/scripts/addons_core/hydra_storm/ui.py
+++ b/scripts/addons_core/hydra_storm/ui.py
@@ -191,7 +191,7 @@ class STORM_HYDRA_LIGHT_PT_light(Panel):
 
         elif light.type == 'SPOT':
             col = main_col.column(align=True)
-            col.prop(light, 'spot_size', slider=True)
+            col.prop(light, 'spot_size', text="Angle", slider=True)
             col.prop(light, 'spot_blend', slider=True)
 
             main_col.prop(light, 'show_cone')
diff --git a/scripts/startup/bl_ui/properties_data_light.py b/scripts/startup/bl_ui/properties_data_light.py
index 902af19d3c4..2249bf64afc 100644
--- a/scripts/startup/bl_ui/properties_data_light.py
+++ b/scripts/startup/bl_ui/properties_data_light.py
@@ -255,7 +255,7 @@ class DATA_PT_spot(DataButtonsPanel, Panel):
 
         col = layout.column()
 
-        col.prop(light, "spot_size", text="Size")
+        col.prop(light, "spot_size", text="Angle")
         col.prop(light, "spot_blend", text="Blend", slider=True)
 
         col.prop(light, "show_cone")
diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py
index 2f086bd83d1..ced4c9ee51d 100644
--- a/scripts/startup/bl_ui/space_view3d.py
+++ b/scripts/startup/bl_ui/space_view3d.py
@@ -3049,11 +3049,11 @@ class VIEW3D_MT_object_context_menu(Menu):
             if light.type == 'SPOT':
                 layout.separator()
 
-                props = layout.operator("wm.context_modal_mouse", text="Adjust Spot Light Size")
+                props = layout.operator("wm.context_modal_mouse", text="Adjust Spot Light Beam Angle")
                 props.data_path_iter = "selected_editable_objects"
                 props.data_path_item = "data.spot_size"
                 props.input_scale = 0.01
-                props.header_text = rpt_("Spot Size: %.2f")
+                props.header_text = rpt_("Beam Angle: %.2f")
 
                 props = layout.operator("wm.context_modal_mouse", text="Adjust Spot Light Blend")
                 props.data_path_iter = "selected_editable_objects"
diff --git a/source/blender/makesrna/intern/rna_light.cc b/source/blender/makesrna/intern/rna_light.cc
index 271fec09e86..37409224e08 100644
--- a/source/blender/makesrna/intern/rna_light.cc
+++ b/source/blender/makesrna/intern/rna_light.cc
@@ -518,7 +518,7 @@ static void rna_def_spot_light(BlenderRNA *brna)
   prop = RNA_def_property(srna, "spot_size", PROP_FLOAT, PROP_ANGLE);
   RNA_def_property_float_sdna(prop, nullptr, "spotsize");
   RNA_def_property_range(prop, DEG2RADF(1.0f), DEG2RADF(180.0f));
-  RNA_def_property_ui_text(prop, "Spot Size", "Angle of the spotlight beam");
+  RNA_def_property_ui_text(prop, "Beam Angle", "Angular diameter of the spotlight beam");
   RNA_def_property_update(prop, 0, "rna_Light_draw_update");
 
   prop = RNA_def_property(srna, "show_cone", PROP_BOOLEAN, PROP_NONE);