diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
index efe3ebe0f4a..34ecf7146f5 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
@@ -57,8 +57,8 @@ GPU_SHADER_CREATE_INFO(eevee_legacy_lights_lib)
     .additional_info("eevee_legacy_raytrace_lib")
     .uniform_buf(5, "ShadowBlock", "shadow_block", Frequency::PASS)
     .uniform_buf(6, "LightBlock", "light_block", Frequency::PASS)
-    .push_constant(Type::IVEC4, "lightGroups")
-    .push_constant(Type::IVEC4, "lightGroupShadows")
+    .push_constant(Type::IVEC4, "light_groups_in")
+    .push_constant(Type::IVEC4, "light_group_shadows_in")
     .sampler(8, ImageType::SHADOW_2D_ARRAY, "shadowCubeTexture")
     .sampler(9, ImageType::SHADOW_2D_ARRAY, "shadowCascadeTexture")
     /* GooEngine: Use slots 15,16 as others are already taken. */
diff --git a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
index d53594a1923..142bde0e037 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
+++ b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
@@ -232,10 +232,8 @@ BLI_STATIC_ASSERT_ALIGN(SSSProfileBlock, 16)
 #    define alphaHashScale common_block._alphaHashScale
 #    define cameraUvScaleBias common_block._cameraUvScaleBias
 #    define planarClipPlane common_block._planarClipPlane
-/*
-#    define lightGroups light_groups
-#    define lightGroupShadows light_group_shadows
-*/
+#    define lightGroups light_groups_in
+#    define lightGroupShadows light_group_shadows_in
 
 /* ProbeBlock */
 #    define probes_data probe_block._probes_data
diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index 6cdc8d18b7a..ed3281aecd4 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -1847,10 +1847,10 @@ void DRW_shgroup_add_material_resources(DRWShadingGroup *grp, GPUMaterial *mater
 
   int light_groups[4];
   GPU_material_light_group_bits_get(material, light_groups);
-  DRW_shgroup_uniform_ivec4_copy(grp, "lightGroups", light_groups);
+  DRW_shgroup_uniform_ivec4_copy(grp, "light_groups_in", light_groups);
 
   GPU_material_light_group_shadow_bits_get(material, light_groups);
-  DRW_shgroup_uniform_ivec4_copy(grp, "lightGroupShadows", light_groups);
+  DRW_shgroup_uniform_ivec4_copy(grp, "light_group_shadows_in", light_groups);
 }
 
 GPUVertFormat *DRW_shgroup_instance_format_array(const DRWInstanceAttrFormat attrs[],