diff --git a/CMakeLists.txt b/CMakeLists.txt
index b815a497..68bb73ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,23 +500,23 @@ set(GL3-Header
 	)
 
 set(SOFT-Source
-	${REF_SRC_DIR}/soft/r_aclip.c
-	${REF_SRC_DIR}/soft/r_alias.c
-	${REF_SRC_DIR}/soft/r_bsp.c
-	${REF_SRC_DIR}/soft/r_draw.c
-	${REF_SRC_DIR}/soft/r_edge.c
-	${REF_SRC_DIR}/soft/r_image.c
-	${REF_SRC_DIR}/soft/r_light.c
-	${REF_SRC_DIR}/soft/r_main.c
-	${REF_SRC_DIR}/soft/r_misc.c
-	${REF_SRC_DIR}/soft/r_model.c
-	${REF_SRC_DIR}/soft/r_part.c
-	${REF_SRC_DIR}/soft/r_poly.c
-	${REF_SRC_DIR}/soft/r_polyse.c
-	${REF_SRC_DIR}/soft/r_rast.c
-	${REF_SRC_DIR}/soft/r_scan.c
-	${REF_SRC_DIR}/soft/r_sprite.c
-	${REF_SRC_DIR}/soft/r_surf.c
+	${REF_SRC_DIR}/soft/sw_aclip.c
+	${REF_SRC_DIR}/soft/sw_alias.c
+	${REF_SRC_DIR}/soft/sw_bsp.c
+	${REF_SRC_DIR}/soft/sw_draw.c
+	${REF_SRC_DIR}/soft/sw_edge.c
+	${REF_SRC_DIR}/soft/sw_image.c
+	${REF_SRC_DIR}/soft/sw_light.c
+	${REF_SRC_DIR}/soft/sw_main.c
+	${REF_SRC_DIR}/soft/sw_misc.c
+	${REF_SRC_DIR}/soft/sw_model.c
+	${REF_SRC_DIR}/soft/sw_part.c
+	${REF_SRC_DIR}/soft/sw_poly.c
+	${REF_SRC_DIR}/soft/sw_polyse.c
+	${REF_SRC_DIR}/soft/sw_rast.c
+	${REF_SRC_DIR}/soft/sw_scan.c
+	${REF_SRC_DIR}/soft/sw_sprite.c
+	${REF_SRC_DIR}/soft/sw_surf.c
 	${REF_SRC_DIR}/files/pcx.c
 	${REF_SRC_DIR}/files/stb.c
 	${REF_SRC_DIR}/files/wal.c
diff --git a/Makefile b/Makefile
index a11cd503..8b674545 100755
--- a/Makefile
+++ b/Makefile
@@ -940,23 +940,23 @@ endif
 # ----------
 
 REFSOFT_OBJS_ := \
-	src/client/refresh/soft/r_aclip.o \
-	src/client/refresh/soft/r_alias.o \
-	src/client/refresh/soft/r_bsp.o \
-	src/client/refresh/soft/r_draw.o \
-	src/client/refresh/soft/r_edge.o \
-	src/client/refresh/soft/r_image.o \
-	src/client/refresh/soft/r_light.o \
-	src/client/refresh/soft/r_main.o \
-	src/client/refresh/soft/r_misc.o \
-	src/client/refresh/soft/r_model.o \
-	src/client/refresh/soft/r_part.o \
-	src/client/refresh/soft/r_poly.o \
-	src/client/refresh/soft/r_polyse.o \
-	src/client/refresh/soft/r_rast.o \
-	src/client/refresh/soft/r_scan.o \
-	src/client/refresh/soft/r_sprite.o \
-	src/client/refresh/soft/r_surf.o \
+	src/client/refresh/soft/sw_aclip.o \
+	src/client/refresh/soft/sw_alias.o \
+	src/client/refresh/soft/sw_bsp.o \
+	src/client/refresh/soft/sw_draw.o \
+	src/client/refresh/soft/sw_edge.o \
+	src/client/refresh/soft/sw_image.o \
+	src/client/refresh/soft/sw_light.o \
+	src/client/refresh/soft/sw_main.o \
+	src/client/refresh/soft/sw_misc.o \
+	src/client/refresh/soft/sw_model.o \
+	src/client/refresh/soft/sw_part.o \
+	src/client/refresh/soft/sw_poly.o \
+	src/client/refresh/soft/sw_polyse.o \
+	src/client/refresh/soft/sw_rast.o \
+	src/client/refresh/soft/sw_scan.o \
+	src/client/refresh/soft/sw_sprite.o \
+	src/client/refresh/soft/sw_surf.o \
 	src/client/refresh/files/pcx.o \
 	src/client/refresh/files/stb.o \
 	src/client/refresh/files/wal.o \
diff --git a/src/client/refresh/soft/r_aclip.c b/src/client/refresh/soft/sw_aclip.c
similarity index 100%
rename from src/client/refresh/soft/r_aclip.c
rename to src/client/refresh/soft/sw_aclip.c
diff --git a/src/client/refresh/soft/r_alias.c b/src/client/refresh/soft/sw_alias.c
similarity index 100%
rename from src/client/refresh/soft/r_alias.c
rename to src/client/refresh/soft/sw_alias.c
diff --git a/src/client/refresh/soft/r_bsp.c b/src/client/refresh/soft/sw_bsp.c
similarity index 100%
rename from src/client/refresh/soft/r_bsp.c
rename to src/client/refresh/soft/sw_bsp.c
diff --git a/src/client/refresh/soft/r_draw.c b/src/client/refresh/soft/sw_draw.c
similarity index 100%
rename from src/client/refresh/soft/r_draw.c
rename to src/client/refresh/soft/sw_draw.c
diff --git a/src/client/refresh/soft/r_edge.c b/src/client/refresh/soft/sw_edge.c
similarity index 100%
rename from src/client/refresh/soft/r_edge.c
rename to src/client/refresh/soft/sw_edge.c
diff --git a/src/client/refresh/soft/r_image.c b/src/client/refresh/soft/sw_image.c
similarity index 100%
rename from src/client/refresh/soft/r_image.c
rename to src/client/refresh/soft/sw_image.c
diff --git a/src/client/refresh/soft/r_light.c b/src/client/refresh/soft/sw_light.c
similarity index 100%
rename from src/client/refresh/soft/r_light.c
rename to src/client/refresh/soft/sw_light.c
diff --git a/src/client/refresh/soft/r_main.c b/src/client/refresh/soft/sw_main.c
similarity index 100%
rename from src/client/refresh/soft/r_main.c
rename to src/client/refresh/soft/sw_main.c
diff --git a/src/client/refresh/soft/r_misc.c b/src/client/refresh/soft/sw_misc.c
similarity index 100%
rename from src/client/refresh/soft/r_misc.c
rename to src/client/refresh/soft/sw_misc.c
diff --git a/src/client/refresh/soft/r_model.c b/src/client/refresh/soft/sw_model.c
similarity index 100%
rename from src/client/refresh/soft/r_model.c
rename to src/client/refresh/soft/sw_model.c
diff --git a/src/client/refresh/soft/r_part.c b/src/client/refresh/soft/sw_part.c
similarity index 100%
rename from src/client/refresh/soft/r_part.c
rename to src/client/refresh/soft/sw_part.c
diff --git a/src/client/refresh/soft/r_poly.c b/src/client/refresh/soft/sw_poly.c
similarity index 100%
rename from src/client/refresh/soft/r_poly.c
rename to src/client/refresh/soft/sw_poly.c
diff --git a/src/client/refresh/soft/r_polyse.c b/src/client/refresh/soft/sw_polyse.c
similarity index 100%
rename from src/client/refresh/soft/r_polyse.c
rename to src/client/refresh/soft/sw_polyse.c
diff --git a/src/client/refresh/soft/r_rast.c b/src/client/refresh/soft/sw_rast.c
similarity index 100%
rename from src/client/refresh/soft/r_rast.c
rename to src/client/refresh/soft/sw_rast.c
diff --git a/src/client/refresh/soft/r_scan.c b/src/client/refresh/soft/sw_scan.c
similarity index 100%
rename from src/client/refresh/soft/r_scan.c
rename to src/client/refresh/soft/sw_scan.c
diff --git a/src/client/refresh/soft/r_sprite.c b/src/client/refresh/soft/sw_sprite.c
similarity index 100%
rename from src/client/refresh/soft/r_sprite.c
rename to src/client/refresh/soft/sw_sprite.c
diff --git a/src/client/refresh/soft/r_surf.c b/src/client/refresh/soft/sw_surf.c
similarity index 100%
rename from src/client/refresh/soft/r_surf.c
rename to src/client/refresh/soft/sw_surf.c