diff --git a/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl b/Gems/Atom/RPI/Assets/Shaders/DecomposeMsImage.azsl
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl
rename to Gems/Atom/RPI/Assets/Shaders/DecomposeMsImage.azsl
diff --git a/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.shader b/Gems/Atom/RPI/Assets/Shaders/DecomposeMsImage.shader
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.shader
rename to Gems/Atom/RPI/Assets/Shaders/DecomposeMsImage.shader
diff --git a/Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl b/Gems/Atom/RPI/Assets/Shaders/ImagePreview.azsl
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl
rename to Gems/Atom/RPI/Assets/Shaders/ImagePreview.azsl
diff --git a/Gems/Atom/RPI/Assets/Shader/ImagePreview.shader b/Gems/Atom/RPI/Assets/Shaders/ImagePreview.shader
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/ImagePreview.shader
rename to Gems/Atom/RPI/Assets/Shaders/ImagePreview.shader
diff --git a/Gems/Atom/RPI/Assets/Shader/ImagePreview.shadervariantlist b/Gems/Atom/RPI/Assets/Shaders/ImagePreview.shadervariantlist
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/ImagePreview.shadervariantlist
rename to Gems/Atom/RPI/Assets/Shaders/ImagePreview.shadervariantlist
diff --git a/Gems/Atom/RPI/Assets/Shader/SceneAndViewSrgs.azsl b/Gems/Atom/RPI/Assets/Shaders/SceneAndViewSrgs.azsl
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/SceneAndViewSrgs.azsl
rename to Gems/Atom/RPI/Assets/Shaders/SceneAndViewSrgs.azsl
diff --git a/Gems/Atom/RPI/Assets/Shader/SceneAndViewSrgs.shader b/Gems/Atom/RPI/Assets/Shaders/SceneAndViewSrgs.shader
similarity index 100%
rename from Gems/Atom/RPI/Assets/Shader/SceneAndViewSrgs.shader
rename to Gems/Atom/RPI/Assets/Shaders/SceneAndViewSrgs.shader
diff --git a/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake b/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
index 9e89427a70..40478da961 100644
--- a/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
+++ b/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
@@ -7,10 +7,10 @@
 # 
 
 set(FILES
-    Shader/DecomposeMsImage.azsl
-    Shader/DecomposeMsImage.shader
-    Shader/ImagePreview.azsl
-    Shader/ImagePreview.shader
+    Shaders/DecomposeMsImage.azsl
+    Shaders/DecomposeMsImage.shader
+    Shaders/ImagePreview.azsl
+    Shaders/ImagePreview.shader
     ShaderLib/Atom/RPI/Math.azsli
     ShaderLib/Atom/RPI/TangentSpace.azsli
     ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
index 1b7b32c1e9..7f57b30326 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
@@ -32,7 +32,7 @@ namespace AZ
 
             //! The asset cache relative path of the only common shader asset for the RPI system that is used
             //! as means to load the layout for scene srg and view srg. This is used to create any RPI::Scene.
-            AZStd::string m_commonSrgsShaderAssetPath = "shader/sceneandviewsrgs.azshader";
+            AZStd::string m_commonSrgsShaderAssetPath = "shaders/sceneandviewsrgs.azshader";
 
             ImageSystemDescriptor m_imageSystemDescriptor;
             GpuQuerySystemDescriptor m_gpuQuerySystemDescriptor;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
index c19ae565d0..890e87a7a5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
@@ -121,7 +121,7 @@ namespace AZ
             m_fence->Init(*device, RHI::FenceState::Reset);
 
             // Load shader and srg
-            const char* ShaderPath = "shader/decomposemsimage.azshader";
+            const char* ShaderPath = "shaders/decomposemsimage.azshader";
             m_decomposeShader = LoadCriticalShader(ShaderPath);
 
             if (m_decomposeShader == nullptr)
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
index 105936f64d..74d52fd64d 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
@@ -244,7 +244,7 @@ namespace AZ
             m_needsShaderLoad = false;
 
             // Load Shader
-            const char* ShaderPath = "shader/imagepreview.azshader";
+            const char* ShaderPath = "shaders/imagepreview.azshader";
             Data::Asset<ShaderAsset> shaderAsset = RPI::FindShaderAsset(ShaderPath);
             m_shader = Shader::FindOrCreate(shaderAsset);
             if (m_shader == nullptr)
diff --git a/Gems/Atom/RPI/Registry/atom_rpi.setreg b/Gems/Atom/RPI/Registry/atom_rpi.setreg
index bcbade5d38..16ce8b3bd7 100644
--- a/Gems/Atom/RPI/Registry/atom_rpi.setreg
+++ b/Gems/Atom/RPI/Registry/atom_rpi.setreg
@@ -3,7 +3,7 @@
         "Atom": {
             "RPI": {
                 "Initialization": {
-                    "CommonSrgsShaderAssetPath": "shader/sceneandviewsrgs.azshader",
+                    "CommonSrgsShaderAssetPath": "shaders/sceneandviewsrgs.azshader",
                     "ImageSystemDescriptor": {
                         "AssetStreamingImagePoolSize": 2147483648, // 2 * 1024 * 1024 * 1024
                         "SystemStreamingImagePoolSize": 134217728, // 128 * 1024 * 1024