diff --git a/BCL.csproj b/BCL.csproj
index efaeb68a8..1941f0713 100644
--- a/BCL.csproj
+++ b/BCL.csproj
@@ -120,9 +120,6 @@
     <TypeScriptCompile Include="location\location.ios.ts">
       <DependentUpon>location.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="location\location_types.ts">
-      <DependentUpon>location.d.ts</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="Tests\file-system-tests.ts" />
     <TypeScriptCompile Include="Tests\http-tests.ts" />
     <TypeScriptCompile Include="Tests\image-tests.ts" />
@@ -196,9 +193,6 @@
     <Content Include="image\Readme.md" />
     <TypeScriptCompile Include="local-settings\index.ts" />
     <TypeScriptCompile Include="local-settings\local-settings.d.ts" />
-    <TypeScriptCompile Include="location\location_common.ts">
-      <DependentUpon>location.d.ts</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="local-settings\local-settings.android.ts">
       <DependentUpon>local-settings.d.ts</DependentUpon>
     </TypeScriptCompile>
@@ -206,6 +200,8 @@
       <DependentUpon>local-settings.d.ts</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="local-settings\local-settings-common.ts" />
+    <TypeScriptCompile Include="location\location-common.ts" />
+    <TypeScriptCompile Include="location\location-types.ts" />
     <Content Include="_references.ts" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/location-tests.ts b/Tests/location-tests.ts
index 0b8c6cf7b..b540b00c1 100644
--- a/Tests/location-tests.ts
+++ b/Tests/location-tests.ts
@@ -1,6 +1,6 @@
 import TKUnit = require("Tests/TKUnit");
 import locationModule = require("location/location");
-import types = require("location/location_types");
+import types = require("location/location-types");
 
 var LocationManager = locationModule.LocationManager;
 var Location = locationModule.Location;
diff --git a/location/location_common.ts b/location/location-common.ts
similarity index 97%
rename from location/location_common.ts
rename to location/location-common.ts
index e7c560eb2..5d97b84e4 100644
--- a/location/location_common.ts
+++ b/location/location-common.ts
@@ -1,5 +1,5 @@
 
-import types = require("location/location_types");
+import types = require("location/location-types");
 import promises = require("promises/promises");
 import locationModule = require("location/location");
 import timer = require("timer/timer");
diff --git a/location/location_types.ts b/location/location-types.ts
similarity index 100%
rename from location/location_types.ts
rename to location/location-types.ts
diff --git a/location/location.android.ts b/location/location.android.ts
index 8ef51dcb5..24e403293 100644
--- a/location/location.android.ts
+++ b/location/location.android.ts
@@ -1,6 +1,6 @@
-import types = require("location/location_types");
+import types = require("location/location-types");
 import appModule = require("application/application");
-import common = require("location/location_common");
+import common = require("location/location-common");
 import merger = require("utils/module_merge");
 
 // merge the exports of the types module with the exports of this file
diff --git a/location/location.ios.ts b/location/location.ios.ts
index e233da525..9a21a0326 100644
--- a/location/location.ios.ts
+++ b/location/location.ios.ts
@@ -1,5 +1,5 @@
-import types = require("location/location_types");
-import common = require("location/location_common");
+import types = require("location/location-types");
+import common = require("location/location-common");
 import merger = require("utils/module_merge");
 
 // merge the exports of the types module with the exports of this file