diff --git a/src/gallium/drivers/nv20/Makefile b/src/gallium/drivers/nv20/Makefile
index 4ba7ce586d6..76aafbe8f0b 100644
--- a/src/gallium/drivers/nv20/Makefile
+++ b/src/gallium/drivers/nv20/Makefile
@@ -1,20 +1,21 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-LIBNAME = nv10
+LIBNAME = nv20
 
 DRIVER_SOURCES = \
-	nv10_clear.c \
-	nv10_context.c \
-	nv10_fragprog.c \
-	nv10_fragtex.c \
-	nv10_miptree.c \
-	nv10_prim_vbuf.c \
-	nv10_screen.c \
-	nv10_state.c \
-	nv10_state_emit.c \
-	nv10_surface.c \
-	nv10_vbo.c
+	nv20_clear.c \
+	nv20_context.c \
+	nv20_fragprog.c \
+	nv20_fragtex.c \
+	nv20_miptree.c \
+	nv20_prim_vbuf.c \
+	nv20_screen.c \
+	nv20_state.c \
+	nv20_state_emit.c \
+	nv20_surface.c \
+	nv20_vbo.c \
+	nv20_vertprog.c
 
 C_SOURCES = \
 	$(COMMON_SOURCES) \
diff --git a/src/gallium/drivers/nv20/nv10_clear.c b/src/gallium/drivers/nv20/nv20_clear.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_clear.c
rename to src/gallium/drivers/nv20/nv20_clear.c
diff --git a/src/gallium/drivers/nv20/nv10_context.c b/src/gallium/drivers/nv20/nv20_context.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_context.c
rename to src/gallium/drivers/nv20/nv20_context.c
diff --git a/src/gallium/drivers/nv20/nv10_context.h b/src/gallium/drivers/nv20/nv20_context.h
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_context.h
rename to src/gallium/drivers/nv20/nv20_context.h
diff --git a/src/gallium/drivers/nv20/nv10_fragprog.c b/src/gallium/drivers/nv20/nv20_fragprog.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_fragprog.c
rename to src/gallium/drivers/nv20/nv20_fragprog.c
diff --git a/src/gallium/drivers/nv20/nv10_fragtex.c b/src/gallium/drivers/nv20/nv20_fragtex.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_fragtex.c
rename to src/gallium/drivers/nv20/nv20_fragtex.c
diff --git a/src/gallium/drivers/nv20/nv10_miptree.c b/src/gallium/drivers/nv20/nv20_miptree.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_miptree.c
rename to src/gallium/drivers/nv20/nv20_miptree.c
diff --git a/src/gallium/drivers/nv20/nv10_prim_vbuf.c b/src/gallium/drivers/nv20/nv20_prim_vbuf.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_prim_vbuf.c
rename to src/gallium/drivers/nv20/nv20_prim_vbuf.c
diff --git a/src/gallium/drivers/nv20/nv10_screen.c b/src/gallium/drivers/nv20/nv20_screen.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_screen.c
rename to src/gallium/drivers/nv20/nv20_screen.c
diff --git a/src/gallium/drivers/nv20/nv10_screen.h b/src/gallium/drivers/nv20/nv20_screen.h
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_screen.h
rename to src/gallium/drivers/nv20/nv20_screen.h
diff --git a/src/gallium/drivers/nv20/nv10_state.c b/src/gallium/drivers/nv20/nv20_state.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_state.c
rename to src/gallium/drivers/nv20/nv20_state.c
diff --git a/src/gallium/drivers/nv20/nv10_state.h b/src/gallium/drivers/nv20/nv20_state.h
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_state.h
rename to src/gallium/drivers/nv20/nv20_state.h
diff --git a/src/gallium/drivers/nv20/nv10_state_emit.c b/src/gallium/drivers/nv20/nv20_state_emit.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_state_emit.c
rename to src/gallium/drivers/nv20/nv20_state_emit.c
diff --git a/src/gallium/drivers/nv20/nv10_surface.c b/src/gallium/drivers/nv20/nv20_surface.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_surface.c
rename to src/gallium/drivers/nv20/nv20_surface.c
diff --git a/src/gallium/drivers/nv20/nv10_vbo.c b/src/gallium/drivers/nv20/nv20_vbo.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv10_vbo.c
rename to src/gallium/drivers/nv20/nv20_vbo.c
diff --git a/src/gallium/drivers/nv20/nv30_vertprog.c b/src/gallium/drivers/nv20/nv20_vertprog.c
similarity index 100%
rename from src/gallium/drivers/nv20/nv30_vertprog.c
rename to src/gallium/drivers/nv20/nv20_vertprog.c