diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index 8158364d252..f3619081875 100644
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -4,8 +4,8 @@ include $(TOP)/configs/current
 LIBNAME = svga
 
 C_SOURCES = \
-	svgadump/st_shader_dump.c \
-	svgadump/st_shader_op.c \
+	svgadump/svga_shader_dump.c \
+	svgadump/svga_shader_op.c \
 	svgadump/svga_dump.c \
 	svga_cmd.c \
 	svga_context.c \
diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
index ff9645fc03a..737b791ceb0 100644
--- a/src/gallium/drivers/svga/SConscript
+++ b/src/gallium/drivers/svga/SConscript
@@ -60,8 +60,8 @@ sources = [
     'svga_tgsi_insn.c',
     
     'svgadump/svga_dump.c',
-    'svgadump/st_shader_dump.c',
-    'svgadump/st_shader_op.c',
+    'svgadump/svga_shader_dump.c',
+    'svgadump/svga_shader_op.c',
 ]
 
 svga = env.ConvenienceLibrary(
diff --git a/src/gallium/drivers/svga/svga_tgsi.c b/src/gallium/drivers/svga/svga_tgsi.c
index 44d0930bc0a..81eea1a145a 100644
--- a/src/gallium/drivers/svga/svga_tgsi.c
+++ b/src/gallium/drivers/svga/svga_tgsi.c
@@ -32,7 +32,7 @@
 #include "tgsi/tgsi_scan.h"
 #include "util/u_memory.h"
 
-#include "svgadump/st_shader_dump.h"
+#include "svgadump/svga_shader_dump.h"
 
 #include "svga_context.h"
 #include "svga_tgsi.h"
diff --git a/src/gallium/drivers/svga/svgadump/svga_dump.c b/src/gallium/drivers/svga/svgadump/svga_dump.c
index 180dde8dc13..c6c353f58e2 100644
--- a/src/gallium/drivers/svga/svgadump/svga_dump.c
+++ b/src/gallium/drivers/svga/svgadump/svga_dump.c
@@ -31,7 +31,7 @@
  */
 
 #include "svga_types.h"
-#include "st_shader_dump.h"
+#include "svga_shader_dump.h"
 #include "svga3d_reg.h"
 
 #include "util/u_debug.h"
diff --git a/src/gallium/drivers/svga/svgadump/svga_dump.py b/src/gallium/drivers/svga/svgadump/svga_dump.py
index 3cb29c395b6..288e753296e 100755
--- a/src/gallium/drivers/svga/svgadump/svga_dump.py
+++ b/src/gallium/drivers/svga/svgadump/svga_dump.py
@@ -291,7 +291,7 @@ def main():
     print ' */'
     print
     print '#include "svga_types.h"'
-    print '#include "shader_dump/st_shader_dump.h"'
+    print '#include "svga_shader_dump.h"'
     print '#include "svga3d_reg.h"'
     print
     print '#include "pipe/p_debug.h"'
diff --git a/src/gallium/drivers/svga/svgadump/st_shader.h b/src/gallium/drivers/svga/svgadump/svga_shader.h
similarity index 100%
rename from src/gallium/drivers/svga/svgadump/st_shader.h
rename to src/gallium/drivers/svga/svgadump/svga_shader.h
diff --git a/src/gallium/drivers/svga/svgadump/st_shader_dump.c b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
similarity index 99%
rename from src/gallium/drivers/svga/svgadump/st_shader_dump.c
rename to src/gallium/drivers/svga/svgadump/svga_shader_dump.c
index d65cc93bfd2..c654126d3a8 100644
--- a/src/gallium/drivers/svga/svgadump/st_shader_dump.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
@@ -30,9 +30,9 @@
  * @author Michal Krol <michal@vmware.com>
  */
 
-#include "st_shader.h"
-#include "st_shader_dump.h"
-#include "st_shader_op.h"
+#include "svga_shader.h"
+#include "svga_shader_dump.h"
+#include "svga_shader_op.h"
 #include "util/u_debug.h"
 
 #include "../svga_hw_reg.h"
diff --git a/src/gallium/drivers/svga/svgadump/st_shader_dump.h b/src/gallium/drivers/svga/svgadump/svga_shader_dump.h
similarity index 100%
rename from src/gallium/drivers/svga/svgadump/st_shader_dump.h
rename to src/gallium/drivers/svga/svgadump/svga_shader_dump.h
diff --git a/src/gallium/drivers/svga/svgadump/st_shader_op.c b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
similarity index 99%
rename from src/gallium/drivers/svga/svgadump/st_shader_op.c
rename to src/gallium/drivers/svga/svgadump/svga_shader_op.c
index 2c05382ab92..cecc22106b2 100644
--- a/src/gallium/drivers/svga/svgadump/st_shader_op.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
@@ -31,7 +31,7 @@
  */
 
 #include "util/u_debug.h"
-#include "st_shader_op.h"
+#include "svga_shader_op.h"
 
 #include "../svga_hw_reg.h"
 #include "svga3d_shaderdefs.h"
diff --git a/src/gallium/drivers/svga/svgadump/st_shader_op.h b/src/gallium/drivers/svga/svgadump/svga_shader_op.h
similarity index 100%
rename from src/gallium/drivers/svga/svgadump/st_shader_op.h
rename to src/gallium/drivers/svga/svgadump/svga_shader_op.h