diff --git a/libcdi/libcdi.dll b/libcdi/libcdi.Win32.dll
similarity index 100%
rename from libcdi/libcdi.dll
rename to libcdi/libcdi.Win32.dll
diff --git a/libcdi/libcdix64.dll b/libcdi/libcdi.x64.dll
similarity index 100%
rename from libcdi/libcdix64.dll
rename to libcdi/libcdi.x64.dll
diff --git a/libnw/libcdi.c b/libnw/libcdi.c
index 2fbd547b..6cd20cd1 100644
--- a/libnw/libcdi.c
+++ b/libnw/libcdi.c
@@ -25,9 +25,9 @@ static struct
 } m_cdi;
 
 #ifdef _WIN64
-#define LIBCDI_DLL L"libcdix64.dll"
+#define LIBCDI_DLL L"libcdi.x64.dll"
 #else
-#define LIBCDI_DLL L"libcdi.dll"
+#define LIBCDI_DLL L"libcdi.Win32.dll"
 #endif
 
 CDI_SMART* WINAPI cdi_create_smart(VOID)
diff --git a/libnw/libnw.vcxproj b/libnw/libnw.vcxproj
index cf6c876b..4d17b761 100644
--- a/libnw/libnw.vcxproj
+++ b/libnw/libnw.vcxproj
@@ -90,8 +90,7 @@
     </Lib>
     <PostBuildEvent>
       <Command>copy "$(ProjectDir)jep106.ids" "$(SolutionDir)$(Platform)\$(Configuration)\"
-copy "$(SolutionDir)libcdi\libcdi.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"
-copy "$(SolutionDir)libcdi\libcdix64.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
+copy "$(SolutionDir)libcdi\libcdi.$(Platform).dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -120,8 +119,7 @@ copy "$(SolutionDir)libcdi\libcdix64.dll" "$(SolutionDir)$(Platform)\$(Configura
     </Lib>
     <PostBuildEvent>
       <Command>copy "$(ProjectDir)jep106.ids" "$(SolutionDir)$(Platform)\$(Configuration)\"
-copy "$(SolutionDir)libcdi\libcdi.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"
-copy "$(SolutionDir)libcdi\libcdix64.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
+copy "$(SolutionDir)libcdi\libcdi.$(Platform).dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>