diff --git a/bevy_derive/src/lib.rs b/bevy_derive/src/lib.rs
index eb80a20c16..064fbdd3d2 100644
--- a/bevy_derive/src/lib.rs
+++ b/bevy_derive/src/lib.rs
@@ -99,7 +99,7 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream {
         .collect::<Vec<&Field>>();
 
     let shader_def_field_names = shader_def_fields.iter().map(|field| &field.ident);
-    let shader_def_field_name_strs = shader_def_fields.iter().map(|field| field.ident.as_ref().unwrap().to_string());
+    let shader_def_field_names_screaming_snake = shader_def_fields.iter().map(|field| field.ident.as_ref().unwrap().to_string().to_screaming_snake_case());
 
     let struct_name = &ast.ident;
     let struct_name_screaming_snake = struct_name.to_string().to_screaming_snake_case();
@@ -161,7 +161,7 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream {
             fn get_shader_defs(&self) -> Option<Vec<String>> {
                 use bevy::render::render_graph::ShaderDefSuffixProvider;
                 let mut potential_shader_defs: Vec<(&'static str, Option<&'static str>)> = vec![
-                    #((#shader_def_field_name_strs, self.#shader_def_field_names.get_shader_def()),)*
+                    #((#shader_def_field_names_screaming_snake, self.#shader_def_field_names.get_shader_def()),)*
                 ];
 
                 Some(potential_shader_defs.drain(..)
diff --git a/examples/custom_shader.rs b/examples/custom_shader.rs
index 24768f5687..cfaab23c1c 100644
--- a/examples/custom_shader.rs
+++ b/examples/custom_shader.rs
@@ -60,7 +60,7 @@ fn main() {
                                 void main() {
                                     o_Target = color;
 
-                                # ifdef MY_MATERIAL_always_red
+                                # ifdef MY_MATERIAL_ALWAYS_RED
                                     o_Target = vec4(0.8, 0.0, 0.0, 1.0);
                                 # endif
                                 }
diff --git a/src/render/color.rs b/src/render/color.rs
index 5b103d3c01..c1712c67f5 100644
--- a/src/render/color.rs
+++ b/src/render/color.rs
@@ -24,8 +24,8 @@ impl From<Handle<Texture>> for ColorSource {
 impl ShaderDefSuffixProvider for ColorSource {
     fn get_shader_def(&self) -> Option<&'static str> {
         match *self {
-            ColorSource::Color(_) => Some("_color"),
-            ColorSource::Texture(_) => Some("_texture"),
+            ColorSource::Color(_) => Some("_COLOR"),
+            ColorSource::Texture(_) => Some("_TEXTURE"),
         }
     }
 }
diff --git a/src/render/render_graph/pipelines/forward/forward.frag b/src/render/render_graph/pipelines/forward/forward.frag
index 73bda68c6c..5734aafafa 100644
--- a/src/render/render_graph/pipelines/forward/forward.frag
+++ b/src/render/render_graph/pipelines/forward/forward.frag
@@ -23,7 +23,7 @@ layout(set = 0, binding = 1) uniform Lights {
     Light SceneLights[MAX_LIGHTS];
 };
 
-# ifdef STANDARD_MATERIAL_albedo_texture
+# ifdef STANDARD_MATERIAL_ALBEDO_TEXTURE
 layout(set = 1, binding = 1) uniform texture2D StandardMaterial_albedo_texture;
 layout(set = 1, binding = 2) uniform sampler StandardMaterial_albedo_sampler;
 # else
@@ -33,7 +33,7 @@ layout(set = 1, binding = 1) uniform StandardMaterial_albedo {
 # endif
 
 void main() {
-# ifdef STANDARD_MATERIAL_albedo_texture
+# ifdef STANDARD_MATERIAL_ALBEDO_TEXTURE
     vec4 Albedo = texture(
         sampler2D(StandardMaterial_albedo_texture, StandardMaterial_albedo_sampler),
         v_Uv);
diff --git a/src/render/render_graph/uniform.rs b/src/render/render_graph/uniform.rs
index 8e4208b53d..e2a7d2577a 100644
--- a/src/render/render_graph/uniform.rs
+++ b/src/render/render_graph/uniform.rs
@@ -28,11 +28,6 @@ impl ShaderDefSuffixProvider for bool {
     }
 }
 
-// pub struct UniformInfo<'a> {
-//   pub name: &'a str,
-//   pub
-// }
-
 pub struct UniformInfo<'a> {
     pub name: &'a str,
     pub bind_type: BindType,