diff --git a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
index 490ef6a..6d5b642 100644
--- a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
@@ -113,7 +113,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.lib</ImportLibrary>
-      <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/libvk_swiftshader.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/vk_swiftshader.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.pdb</ProgramDataBaseFile>
       <SubSystem>Console</SubSystem>
     </Link>
@@ -180,7 +180,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.lib</ImportLibrary>
-      <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/libvk_swiftshader.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/vk_swiftshader.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.pdb</ProgramDataBaseFile>
       <SubSystem>Console</SubSystem>
     </Link>
diff --git a/src/Android.bp b/src/Android.bp
index e72bd6c..88d2a6f 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -548,7 +548,7 @@
 
     local_include_dirs: [ "Vulkan" ],
 
-    version_script: "Vulkan/libvk_swiftshader.lds",
+    version_script: "Vulkan/vk_swiftshader.lds",
 
     target: {
         android: {
diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index 53729f3..b90e231 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -108,7 +108,7 @@
     "Vulkan.rc",
     "VulkanPlatform.h",
     "libVulkan.cpp",
-    "libvk_swiftshader.def",
+    "vk_swiftshader.def",
     "main.cpp",
     "resource.h",
   ]
@@ -122,14 +122,14 @@
     ldflags = [
       "-Wl,-install_name,@rpath/libvk_swiftshader.dylib",
       "-Wl,-exported_symbols_list," +
-          rebase_path("libvk_swiftshader.exports", root_build_dir),
+          rebase_path("vk_swiftshader.exports", root_build_dir),
     ]
   } else if (is_linux || is_fuchsia) {
     inputs = [
-      "libvk_swiftshader.lds",
+      "vk_swiftshader.lds",
     ]
     ldflags = [ "-Wl,--version-script=" +
-                rebase_path("libvk_swiftshader.lds", root_build_dir) ]
+                rebase_path("vk_swiftshader.lds", root_build_dir) ]
   }
 
   deps = [
diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index 6451683..42376b2 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -72,7 +72,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>libvk_swiftshader.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>vk_swiftshader.def</ModuleDefinitionFile>
       <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
@@ -98,7 +98,7 @@
       <DisableSpecificWarnings>4267</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>libvk_swiftshader.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>vk_swiftshader.def</ModuleDefinitionFile>
       <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
@@ -292,7 +292,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="libvk_swiftshader.def" />
+    <None Include="vk_swiftshader.def" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Vulkan.rc" />
diff --git a/src/Vulkan/vulkan.vcxproj.filters b/src/Vulkan/vulkan.vcxproj.filters
index 7e5cadc..6de2a26 100644
--- a/src/Vulkan/vulkan.vcxproj.filters
+++ b/src/Vulkan/vulkan.vcxproj.filters
@@ -524,7 +524,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="libvk_swiftshader.def" />
+    <None Include="vk_swiftshader.def" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Vulkan.rc">