diff --git a/src/layout/blocked_vs_ffx.c b/src/layout/blocked_vs_square.c
similarity index 100%
rename from src/layout/blocked_vs_ffx.c
rename to src/layout/blocked_vs_square.c
diff --git a/src/layout/blocked_ps2_strlr.c b/src/layout/blocked_vs_str.c
similarity index 100%
rename from src/layout/blocked_ps2_strlr.c
rename to src/layout/blocked_vs_str.c
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index 5bfa006f..a86fe9db 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -1175,7 +1175,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\meta\ps2_strlr.c"
+					RelativePath=".\meta\vs_str.c"
 					>
 				</File>
 				<File
@@ -1227,7 +1227,7 @@
                     >
                 </File>
                 <File
-                    RelativePath=".\meta\vs_ffx.c"
+                    RelativePath=".\meta\vs_square.c"
                     >
                 </File>
 				<File
@@ -2007,7 +2007,7 @@
                     >
                 </File>
                 <File
-                    RelativePath=".\layout\blocked_vs_ffx.c"
+                    RelativePath=".\layout\blocked_vs_square.c"
                     >
                 </File>
                 <File
@@ -2079,7 +2079,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\blocked_ps2_strlr.c"
+					RelativePath=".\layout\blocked_vs_str.c"
 					>
 				</File>
 				<File
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index bb243c4c..79b96688 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -134,7 +134,7 @@
     <ClCompile Include="coding\mtaf_decoder.c" />
     <ClCompile Include="coding\mta2_decoder.c" />
     <ClCompile Include="layout\blocked_ps2_iab.c" />
-    <ClCompile Include="layout\blocked_ps2_strlr.c" />
+    <ClCompile Include="layout\blocked_vs_str.c" />
     <ClCompile Include="layout\layered.c" />
     <ClCompile Include="layout\blocked_tra.c" />
     <ClCompile Include="meta\akb.c" />
@@ -170,7 +170,7 @@
     <ClCompile Include="meta\mss.c" />
     <ClCompile Include="meta\ps2_mtaf.c" />
     <ClCompile Include="meta\ps2_spm.c" />
-    <ClCompile Include="meta\ps2_strlr.c" />
+    <ClCompile Include="meta\vs_str.c" />
     <ClCompile Include="meta\ps2_wmus.c" />
     <ClCompile Include="meta\ps3_ivag.c" />
     <ClCompile Include="meta\ps3_past.c" />
@@ -398,7 +398,7 @@
     <ClCompile Include="meta\ps2_vms.c" />
     <ClCompile Include="meta\ps2_voi.c" />
     <ClCompile Include="meta\vpk.c" />
-    <ClCompile Include="meta\vs_ffx.c" />
+    <ClCompile Include="meta\vs_square.c" />
     <ClCompile Include="meta\ps2_wad.c" />
     <ClCompile Include="meta\ps2_wb.c" />
     <ClCompile Include="meta\ps2_xa2.c" />
@@ -546,7 +546,7 @@
     <ClCompile Include="layout\blocked_awc.c" />
     <ClCompile Include="layout\blocked_ea_1snh.c" />
     <ClCompile Include="layout\blocked_vgs.c" />
-    <ClCompile Include="layout\blocked_vs_ffx.c" />
+    <ClCompile Include="layout\blocked_vs_square.c" />
     <ClCompile Include="layout\blocked_vawx.c" />
     <ClCompile Include="layout\blocked_xvag.c" />
     <ClCompile Include="layout\blocked_caf.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 183fd08f..6bd16f37 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -760,7 +760,7 @@
     <ClCompile Include="meta\vpk.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\vs_ffx.c">
+    <ClCompile Include="meta\vs_square.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\ps2_wad.c">
@@ -1192,7 +1192,7 @@
     <ClCompile Include="layout\blocked_vgs.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\blocked_vs_ffx.c">
+    <ClCompile Include="layout\blocked_vs_square.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked_vawx.c">
@@ -1303,7 +1303,7 @@
     <ClCompile Include="meta\ps2_spm.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ps2_strlr.c">
+    <ClCompile Include="meta\vs_str.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\wii_ras.c">
@@ -1315,7 +1315,7 @@
     <ClCompile Include="meta\ps2_iab.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\blocked_ps2_strlr.c">
+    <ClCompile Include="layout\blocked_vs_str.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked_ps2_iab.c">
diff --git a/src/meta/vs_ffx.c b/src/meta/vs_square.c
similarity index 100%
rename from src/meta/vs_ffx.c
rename to src/meta/vs_square.c
diff --git a/src/meta/ps2_strlr.c b/src/meta/vs_str.c
similarity index 100%
rename from src/meta/ps2_strlr.c
rename to src/meta/vs_str.c