diff --git a/assets/voxygen/shaders/figure/frag.glsl b/assets/voxygen/shaders/figure-frag.glsl
similarity index 100%
rename from assets/voxygen/shaders/figure/frag.glsl
rename to assets/voxygen/shaders/figure-frag.glsl
diff --git a/assets/voxygen/shaders/figure/vert.glsl b/assets/voxygen/shaders/figure-vert.glsl
similarity index 100%
rename from assets/voxygen/shaders/figure/vert.glsl
rename to assets/voxygen/shaders/figure-vert.glsl
diff --git a/assets/voxygen/shaders/postprocess/frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl
similarity index 100%
rename from assets/voxygen/shaders/postprocess/frag.glsl
rename to assets/voxygen/shaders/postprocess-frag.glsl
diff --git a/assets/voxygen/shaders/postprocess/vert.glsl b/assets/voxygen/shaders/postprocess-vert.glsl
similarity index 100%
rename from assets/voxygen/shaders/postprocess/vert.glsl
rename to assets/voxygen/shaders/postprocess-vert.glsl
diff --git a/assets/voxygen/shaders/skybox/frag.glsl b/assets/voxygen/shaders/skybox-frag.glsl
similarity index 100%
rename from assets/voxygen/shaders/skybox/frag.glsl
rename to assets/voxygen/shaders/skybox-frag.glsl
diff --git a/assets/voxygen/shaders/skybox/vert.glsl b/assets/voxygen/shaders/skybox-vert.glsl
similarity index 100%
rename from assets/voxygen/shaders/skybox/vert.glsl
rename to assets/voxygen/shaders/skybox-vert.glsl
diff --git a/assets/voxygen/shaders/terrain/frag.glsl b/assets/voxygen/shaders/terrain-frag.glsl
similarity index 100%
rename from assets/voxygen/shaders/terrain/frag.glsl
rename to assets/voxygen/shaders/terrain-frag.glsl
diff --git a/assets/voxygen/shaders/terrain/vert.glsl b/assets/voxygen/shaders/terrain-vert.glsl
similarity index 100%
rename from assets/voxygen/shaders/terrain/vert.glsl
rename to assets/voxygen/shaders/terrain-vert.glsl
diff --git a/assets/voxygen/shaders/ui/frag.glsl b/assets/voxygen/shaders/ui-frag.glsl
similarity index 100%
rename from assets/voxygen/shaders/ui/frag.glsl
rename to assets/voxygen/shaders/ui-frag.glsl
diff --git a/assets/voxygen/shaders/ui/vert.glsl b/assets/voxygen/shaders/ui-vert.glsl
similarity index 100%
rename from assets/voxygen/shaders/ui/vert.glsl
rename to assets/voxygen/shaders/ui-vert.glsl
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 0003e467d6..6f4853d433 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -453,7 +453,7 @@ struct GfxPipeline<P: gfx::pso::PipelineInit> {
     pso: gfx::pso::PipelineState<gfx_backend::Resources, P::Meta>,
 }
 
-/// Create new the pipelines used by the renderer.
+/// Creates all the pipelines used to render.
 fn create_pipelines(
     factory: &mut gfx_backend::Factory,
     shader_reload_indicator: &mut ReloadIndicator,
@@ -490,9 +490,9 @@ fn create_pipelines(
     let skybox_pipeline = create_pipeline(
         factory,
         skybox::pipe::new(),
-        &assets::load_watched::<String>("voxygen.shaders.skybox.vert", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.skybox-vert", shader_reload_indicator)
             .unwrap(),
-        &assets::load_watched::<String>("voxygen.shaders.skybox.frag", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.skybox-frag", shader_reload_indicator)
             .unwrap(),
         &include_ctx,
     )?;
@@ -501,9 +501,9 @@ fn create_pipelines(
     let figure_pipeline = create_pipeline(
         factory,
         figure::pipe::new(),
-        &assets::load_watched::<String>("voxygen.shaders.figure.vert", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.figure-vert", shader_reload_indicator)
             .unwrap(),
-        &assets::load_watched::<String>("voxygen.shaders.figure.frag", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.figure-frag", shader_reload_indicator)
             .unwrap(),
         &include_ctx,
     )?;
@@ -512,9 +512,9 @@ fn create_pipelines(
     let terrain_pipeline = create_pipeline(
         factory,
         terrain::pipe::new(),
-        &assets::load_watched::<String>("voxygen.shaders.terrain.vert", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.terrain-vert", shader_reload_indicator)
             .unwrap(),
-        &assets::load_watched::<String>("voxygen.shaders.terrain.frag", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.terrain-frag", shader_reload_indicator)
             .unwrap(),
         &include_ctx,
     )?;
@@ -523,9 +523,9 @@ fn create_pipelines(
     let ui_pipeline = create_pipeline(
         factory,
         ui::pipe::new(),
-        &assets::load_watched::<String>("voxygen.shaders.ui.vert", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.ui-vert", shader_reload_indicator)
             .unwrap(),
-        &assets::load_watched::<String>("voxygen.shaders.ui.frag", shader_reload_indicator)
+        &assets::load_watched::<String>("voxygen.shaders.ui-frag", shader_reload_indicator)
             .unwrap(),
         &include_ctx,
     )?;
@@ -535,12 +535,12 @@ fn create_pipelines(
         factory,
         postprocess::pipe::new(),
         &assets::load_watched::<String>(
-            "voxygen.shaders.postprocess.vert",
+            "voxygen.shaders.postprocess-vert",
             shader_reload_indicator,
         )
         .unwrap(),
         &assets::load_watched::<String>(
-            "voxygen.shaders.postprocess.frag",
+            "voxygen.shaders.postprocess-frag",
             shader_reload_indicator,
         )
         .unwrap(),