diff --git a/src/layout/caf_blocked.c b/src/layout/blocked_caf.c
similarity index 100%
rename from src/layout/caf_blocked.c
rename to src/layout/blocked_caf.c
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index 74fe5834..b4eadeb3 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -615,7 +615,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\meta\ngc_caf.c"
+					RelativePath=".\meta\caf.c"
 					>
 				</File>
 				<File
@@ -1707,7 +1707,7 @@
                     >
                 </File>
 				<File
-					RelativePath=".\layout\caf_blocked.c"
+					RelativePath=".\layout\blocked_caf.c"
 					>
 				</File>
 				<File
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index e648b0d5..203f0e1c 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -259,7 +259,7 @@
     <ClCompile Include="meta\ngc_adpdtk.c" />
     <ClCompile Include="meta\ngc_bh2pcm.c" />
     <ClCompile Include="meta\ngc_bo2.c" />
-    <ClCompile Include="meta\ngc_caf.c" />
+    <ClCompile Include="meta\caf.c" />
     <ClCompile Include="meta\ngc_dsp_konami.c" />
     <ClCompile Include="meta\ngc_dsp_mpds.c" />
     <ClCompile Include="meta\ngc_dsp_std.c" />
@@ -475,7 +475,7 @@
     <ClCompile Include="layout\blocked_vgs.c" />
     <ClCompile Include="layout\blocked_vawx.c" />
     <ClCompile Include="layout\blocked_xvag.c" />
-    <ClCompile Include="layout\caf_blocked.c" />
+    <ClCompile Include="layout\blocked_caf.c" />
     <ClCompile Include="layout\blocked_dec.c" />
     <ClCompile Include="layout\blocked_ea_schl.c" />
     <ClCompile Include="layout\blocked_ea_sns.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 902d34b9..af5439fb 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -361,7 +361,7 @@
     <ClCompile Include="meta\ngc_bo2.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ngc_caf.c">
+    <ClCompile Include="meta\caf.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\ngc_dsp_konami.c">
@@ -1000,7 +1000,7 @@
     <ClCompile Include="layout\blocked_xvag.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\caf_blocked.c">
+    <ClCompile Include="layout\blocked_caf.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked_dec.c">
diff --git a/src/meta/ngc_caf.c b/src/meta/caf.c
similarity index 100%
rename from src/meta/ngc_caf.c
rename to src/meta/caf.c