diff --git a/materialsystem/stdshaders/DecalBaseTimesLightmapAlphaBlendSelfIllum_dx8.cpp b/materialsystem/stdshaders/DecalBaseTimesLightmapAlphaBlendSelfIllum_dx8.cpp
index 42e5ef7924..b81228eba4 100644
--- a/materialsystem/stdshaders/DecalBaseTimesLightmapAlphaBlendSelfIllum_dx8.cpp
+++ b/materialsystem/stdshaders/DecalBaseTimesLightmapAlphaBlendSelfIllum_dx8.cpp
@@ -6,7 +6,7 @@
 
 #include "BaseVSShader.h"
 #include "lightmappedgeneric_vs11.inc"
-#include "lightmappedgeneric_decal.inc"
+#include "LightmappedGeneric_Decal.inc"
 #include "mathlib/bumpvects.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
diff --git a/materialsystem/stdshaders/MonitorScreen_dx8.cpp b/materialsystem/stdshaders/MonitorScreen_dx8.cpp
index f1412902e2..8927cd1f6a 100644
--- a/materialsystem/stdshaders/MonitorScreen_dx8.cpp
+++ b/materialsystem/stdshaders/MonitorScreen_dx8.cpp
@@ -6,7 +6,7 @@
 
 #include "BaseVSShader.h"
 
-#include "unlittwotexture.inc"
+#include "UnlitTwoTexture.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp b/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
index 331f8f172e..898d07676a 100644
--- a/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
+++ b/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
@@ -9,7 +9,7 @@
 #include "BaseVSShader.h"
 #include "convar.h"
 
-#include "worldvertextransition.inc"
+#include "WorldVertexTransition.inc"
 #include "worldvertextransition_vs14.inc"
 #include "worldvertextransition_seamless.inc"
 #include "lightmappedgeneric_vs11.inc"
diff --git a/materialsystem/stdshaders/cable_dx8.cpp b/materialsystem/stdshaders/cable_dx8.cpp
index 9e3c98ddb1..c914e3244b 100644
--- a/materialsystem/stdshaders/cable_dx8.cpp
+++ b/materialsystem/stdshaders/cable_dx8.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "cable.inc"
+#include "Cable.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/debugluxel.cpp b/materialsystem/stdshaders/debugluxel.cpp
index 328dfb6bbf..f180bc386d 100644
--- a/materialsystem/stdshaders/debugluxel.cpp
+++ b/materialsystem/stdshaders/debugluxel.cpp
@@ -6,7 +6,7 @@
 // $NoKeywords: $
 //===========================================================================//
 
-#include "shaderlib/CShader.h"
+#include "shaderlib/cshader.h"
 
 #include "debugluxel_ps20b.inc"
 #include "debugluxel_ps20.inc"
diff --git a/materialsystem/stdshaders/gooinglass.cpp b/materialsystem/stdshaders/gooinglass.cpp
index 4b04621478..c9a6816456 100644
--- a/materialsystem/stdshaders/gooinglass.cpp
+++ b/materialsystem/stdshaders/gooinglass.cpp
@@ -7,7 +7,7 @@
 
 #include "BaseVSShader.h"
 
-#include "bumpmappedenvmap.inc"
+#include "BumpmappedEnvmap.inc"
 
 #include "lightmappedgeneric_vs11.inc"
 
diff --git a/materialsystem/stdshaders/introscreenspaceeffect_dx80.cpp b/materialsystem/stdshaders/introscreenspaceeffect_dx80.cpp
index 3769da354c..10be6142ba 100644
--- a/materialsystem/stdshaders/introscreenspaceeffect_dx80.cpp
+++ b/materialsystem/stdshaders/introscreenspaceeffect_dx80.cpp
@@ -7,8 +7,8 @@
 
 #include "BaseVSShader.h"
 
-#include "ScreenSpaceEffect_vs11.inc"
-#include "IntroScreenSpaceEffect_ps11.inc"
+#include "screenspaceeffect_vs11.inc"
+#include "introscreenspaceeffect_ps11.inc"
 
 DEFINE_FALLBACK_SHADER( IntroScreenSpaceEffect, IntroScreenSpaceEffect_dx80 )
 
diff --git a/materialsystem/stdshaders/lightmappedgeneric_decal.cpp b/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
index 9e74b5cfc4..2395d9a7db 100644
--- a/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
+++ b/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "lightmappedgeneric_decal.inc"
+#include "LightmappedGeneric_Decal.inc"
 #include "mathlib/bumpvects.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
diff --git a/materialsystem/stdshaders/particlesphere_dx8.cpp b/materialsystem/stdshaders/particlesphere_dx8.cpp
index 422c7c3027..e873a200f9 100644
--- a/materialsystem/stdshaders/particlesphere_dx8.cpp
+++ b/materialsystem/stdshaders/particlesphere_dx8.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "particlesphere_vs11.inc"
+#include "ParticleSphere_vs11.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/refract_dx80.cpp b/materialsystem/stdshaders/refract_dx80.cpp
index b6e6e5a05b..040bf7caa8 100644
--- a/materialsystem/stdshaders/refract_dx80.cpp
+++ b/materialsystem/stdshaders/refract_dx80.cpp
@@ -8,8 +8,8 @@
 
 #include "BaseVSShader.h"
 
-#include "refract_model_vs11.inc"
-#include "refract_world_vs11.inc"
+#include "Refract_model_vs11.inc"
+#include "Refract_world_vs11.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/shadowmodel_dx8.cpp b/materialsystem/stdshaders/shadowmodel_dx8.cpp
index e7d7228a0f..409623b981 100644
--- a/materialsystem/stdshaders/shadowmodel_dx8.cpp
+++ b/materialsystem/stdshaders/shadowmodel_dx8.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "shadowmodel.inc"
+#include "ShadowModel.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/shatteredglass_dx8.cpp b/materialsystem/stdshaders/shatteredglass_dx8.cpp
index e62a05e536..3f3e5a0cd2 100644
--- a/materialsystem/stdshaders/shatteredglass_dx8.cpp
+++ b/materialsystem/stdshaders/shatteredglass_dx8.cpp
@@ -8,9 +8,9 @@
 
 
 #include "BaseVSShader.h"
-#include "shatteredglass.inc"
-#include "shatteredglass_envmap.inc"
-#include "shatteredglass_envmapsphere.inc"
+#include "ShatteredGlass.inc"
+#include "ShatteredGlass_EnvMap.inc"
+#include "ShatteredGlass_EnvMapSphere.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/teeth_dx8.cpp b/materialsystem/stdshaders/teeth_dx8.cpp
index d91626d8b9..e6c47e6380 100644
--- a/materialsystem/stdshaders/teeth_dx8.cpp
+++ b/materialsystem/stdshaders/teeth_dx8.cpp
@@ -6,7 +6,7 @@
 
 #include "BaseVSShader.h"
 
-#include "teeth.inc"
+#include "Teeth.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/unlittwotexture_dx8.cpp b/materialsystem/stdshaders/unlittwotexture_dx8.cpp
index b44afa6e5a..93087afa4d 100644
--- a/materialsystem/stdshaders/unlittwotexture_dx8.cpp
+++ b/materialsystem/stdshaders/unlittwotexture_dx8.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "unlittwotexture.inc"
+#include "UnlitTwoTexture.inc"
 #include "cloak_blended_pass_helper.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
diff --git a/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp b/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
index 31addf4295..b415ba8547 100644
--- a/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
+++ b/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
@@ -8,8 +8,8 @@
 
 #include "BaseVSShader.h"
 
-#include "vertexlitgeneric_vs11.inc"
-#include "vertexlitgeneric_selfillumonly.inc"
+#include "VertexLitGeneric_vs11.inc"
+#include "VertexLitGeneric_SelfIllumOnly.inc"
 #include "emissive_scroll_blended_pass_helper.h"
 #include "flesh_interior_blended_pass_helper.h"
 #include "cloak_blended_pass_helper.h"
diff --git a/materialsystem/stdshaders/water_dx80.cpp b/materialsystem/stdshaders/water_dx80.cpp
index 2f31bb5b11..9ef38ff082 100644
--- a/materialsystem/stdshaders/water_dx80.cpp
+++ b/materialsystem/stdshaders/water_dx80.cpp
@@ -9,9 +9,9 @@
 #include "BaseVSShader.h"
 #include "mathlib/vmatrix.h"
 
-#include "water_vs11.inc"
-#include "watercheappervertexfresnel_vs11.inc"
-#include "watercheap_vs11.inc"
+#include "Water_vs11.inc"
+#include "WaterCheapPerVertexFresnel_vs11.inc"
+#include "WaterCheap_vs11.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/water_dx81.cpp b/materialsystem/stdshaders/water_dx81.cpp
index 764ffe9edc..5d6396e87c 100644
--- a/materialsystem/stdshaders/water_dx81.cpp
+++ b/materialsystem/stdshaders/water_dx81.cpp
@@ -8,8 +8,8 @@
 #include "BaseVSShader.h"
 #include "mathlib/vmatrix.h"
 
-#include "water_ps14.inc"
-#include "watercheap_vs14.inc"
+#include "Water_ps14.inc"
+#include "WaterCheap_vs14.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/worldvertexalpha_dx8.cpp b/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
index 0ea139ee1b..02be92d3fc 100644
--- a/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
+++ b/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
@@ -8,7 +8,7 @@
 
 #include "BaseVSShader.h"
 
-#include "worldvertexalpha.inc"
+#include "WorldVertexAlpha.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
diff --git a/materialsystem/stdshaders/wscript b/materialsystem/stdshaders/wscript
index 67c33abb1a..979c2b64b7 100644
--- a/materialsystem/stdshaders/wscript
+++ b/materialsystem/stdshaders/wscript
@@ -139,8 +139,8 @@ def build(bld):
 	source_dx8 = [
 		'BaseVSShader.cpp',					
 		'BlurFilterX_dx80.cpp',
-		'Bik_dx80.cpp',
-		'Bik_dx81.cpp',
+		'bik_dx80.cpp',
+		'bik_dx81.cpp',
 		'BlurFilterY_dx80.cpp',
 		'BufferClearObeyStencil_dx8.cpp',
 		'cable_dx8.cpp',
@@ -318,18 +318,19 @@ def build(bld):
 		idx      = bld.get_taskgen_count()
 	)
 
-	bld.shlib(
-		source   = source_dx6,
-		target   = PROJECT_NAME + 'dx6',
-		name     = PROJECT_NAME + 'dx6',
-		features = 'c cxx',
-		includes = includes,
-		defines  = defines_dx6,
-		use      = libs,
-		install_path = install_path,
-		subsystem = bld.env.MSVC_SUBSYSTEM,
-		idx      = bld.get_taskgen_count()
-	)
+	# TODO_ENHANCED(xutaxkamay):
+	# bld.shlib(
+	# 	source   = source_dx6,
+	# 	target   = PROJECT_NAME + 'dx6',
+	# 	name     = PROJECT_NAME + 'dx6',
+	# 	features = 'c cxx',
+	# 	includes = includes,
+	# 	defines  = defines_dx6,
+	# 	use      = libs,
+	# 	install_path = install_path,
+	# 	subsystem = bld.env.MSVC_SUBSYSTEM,
+	# 	idx      = bld.get_taskgen_count()
+	# )
 
 	bld.shlib(
 		source   = source_dbg,
@@ -342,4 +343,4 @@ def build(bld):
 		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
-	)
\ No newline at end of file
+	)
diff --git a/materialsystem/stdshaders/yuv.cpp b/materialsystem/stdshaders/yuv.cpp
index dba70dc388..6b3e368d78 100644
--- a/materialsystem/stdshaders/yuv.cpp
+++ b/materialsystem/stdshaders/yuv.cpp
@@ -7,7 +7,7 @@
 
 #include "BaseVSShader.h"
 
-#include "screenspaceeffect.inc"
+#include "ScreenSpaceEffect.inc"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"