diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ContrastAdaptiveSharpening.pass b/Gems/Atom/Feature/Common/Assets/Passes/ContrastAdaptiveSharpening.pass
index 44ab6f4a52..8e8df3cc52 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ContrastAdaptiveSharpening.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ContrastAdaptiveSharpening.pass
@@ -58,7 +58,7 @@
             "PassData": {
                 "$type": "ComputePassData",
                 "ShaderAsset": {
-                    "FilePath": "Shaders/Postprocessing/ContrastAdaptiveSharpening.shader"
+                    "FilePath": "Shaders/PostProcessing/ContrastAdaptiveSharpening.shader"
                 },
                 "Make Fullscreen Pass": true,
                 "ShaderDataMappings": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapSkyBox.pass b/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapSkyBox.pass
index bd8ce6ed01..c098d50379 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapSkyBox.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapSkyBox.pass
@@ -54,7 +54,7 @@
             "PassData": {
                 "$type": "FullscreenTrianglePassData",
                 "ShaderAsset": {
-                    "FilePath": "shaders/skybox/skybox.shader"
+                    "FilePath": "Shaders/SkyBox/SkyBox.shader"
                 },
                 "PipelineViewTag": "MainCamera",
                 "ShaderDataMappings": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass b/Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
index cd548d0aea..da18e91a0c 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
@@ -90,7 +90,7 @@
                         "DrawListTag": "reflectionprobeblendweight",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionprobeblendweight.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeBlendWeight.shader"
                         }
                     }
                 },
@@ -204,7 +204,7 @@
                         "DrawListTag": "reflectionproberenderouter",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionproberenderouter.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeRenderOuter.shader"
                         }
                     }
                 },
@@ -254,7 +254,7 @@
                         "DrawListTag": "reflectionproberenderinner",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionproberenderinner.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeRenderInner.shader"
                         }
                     }
                 },
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass b/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
index b3d7ef0241..64292da63c 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
@@ -85,7 +85,7 @@
                         "DrawListTag": "reflectionprobeblendweight",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionprobeblendweight.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeBlendWeight.shader"
                         }
                     }
                 },
@@ -192,7 +192,7 @@
                         "DrawListTag": "reflectionproberenderouter",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionproberenderouter.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeRenderOuter.shader"
                         }
                     }
                 },
@@ -242,7 +242,7 @@
                         "DrawListTag": "reflectionproberenderinner",
                         "PipelineViewTag": "MainCamera",
                         "PassSrgShaderAsset": {
-                            "FilePath": "shaders/reflections/reflectionproberenderinner.shader"
+                            "FilePath": "Shaders/Reflections/ReflectionProbeRenderInner.shader"
                         }
                     }
                 },
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/SkyBox.pass b/Gems/Atom/Feature/Common/Assets/Passes/SkyBox.pass
index fb16271ba7..2cdcf4daa0 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/SkyBox.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/SkyBox.pass
@@ -21,7 +21,7 @@
             "PassData": {
                 "$type": "FullscreenTrianglePassData",
                 "ShaderAsset": {
-                    "FilePath": "shaders/skybox/skybox.shader"
+                    "FilePath": "Shaders/SkyBox/SkyBox.shader"
                 },
                 "PipelineViewTag": "MainCamera",
                 "ShaderDataMappings": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/SkyBox_TwoOutputs.pass b/Gems/Atom/Feature/Common/Assets/Passes/SkyBox_TwoOutputs.pass
index 0ed7b39288..a8bd39aa88 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/SkyBox_TwoOutputs.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/SkyBox_TwoOutputs.pass
@@ -26,7 +26,7 @@
             "PassData": {
                 "$type": "FullscreenTrianglePassData",
                 "ShaderAsset": {
-                    "FilePath": "shaders/skybox/skybox_twooutputs.shader"
+                    "FilePath": "Shaders/SkyBox/SkyBox_TwoOutputs.shader"
                 },
                 "PipelineViewTag": "MainCamera",
                 "ShaderDataMappings": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/Taa.pass b/Gems/Atom/Feature/Common/Assets/Passes/Taa.pass
index f1ba156007..131c862205 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/Taa.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/Taa.pass
@@ -87,7 +87,7 @@
             "PassData": {
                 "$type": "TaaPassData",
                 "ShaderAsset": {
-                    "FilePath": "Shaders/Postprocessing/Taa.shader"
+                    "FilePath": "Shaders/PostProcessing/Taa.shader"
                 },
                 "Make Fullscreen Pass": true,
                 "ShaderDataMappings": {