diff --git a/BCL.csproj b/BCL.csproj
index 850796b0c..efaeb68a8 100644
--- a/BCL.csproj
+++ b/BCL.csproj
@@ -111,13 +111,7 @@
       <DependentUpon>image.d.ts</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="image\image.d.ts" />
-    <TypeScriptCompile Include="image\image_impl.android.ts">
-      <DependentUpon>image_impl.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="image\image_impl.d.ts" />
-    <TypeScriptCompile Include="image\image_impl.ios.ts">
-      <DependentUpon>image_impl.d.ts</DependentUpon>
-    </TypeScriptCompile>
+    <TypeScriptCompile Include="image\image-impl.d.ts" />
     <TypeScriptCompile Include="image\index.ts" />
     <TypeScriptCompile Include="location\location.android.ts">
       <DependentUpon>location.d.ts</DependentUpon>
@@ -193,21 +187,25 @@
     <TypeScriptCompile Include="http\http-request.ios.ts">
       <DependentUpon>http-request.d.ts</DependentUpon>
     </TypeScriptCompile>
+    <TypeScriptCompile Include="image\image-impl.android.ts">
+      <DependentUpon>image-impl.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="image\image-impl.ios.ts">
+      <DependentUpon>image-impl.d.ts</DependentUpon>
+    </TypeScriptCompile>
     <Content Include="image\Readme.md" />
-    <TypeScriptCompile Include="localsettings\index.ts" />
-    <TypeScriptCompile Include="localsettings\local_settings.android.ts">
-      <DependentUpon>local_settings.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="localsettings\local_settings.d.ts" />
-    <TypeScriptCompile Include="localsettings\local_settings.ios.ts">
-      <DependentUpon>local_settings.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="localsettings\local_settings_common.ts">
-      <DependentUpon>local_settings.d.ts</DependentUpon>
-    </TypeScriptCompile>
+    <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>
+    <TypeScriptCompile Include="local-settings\local-settings.ios.ts">
+      <DependentUpon>local-settings.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="local-settings\local-settings-common.ts" />
     <Content Include="_references.ts" />
   </ItemGroup>
   <ItemGroup>
@@ -245,7 +243,7 @@
     <Content Include="Tests\Readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="localsettings\Readme.md" />
+    <Content Include="local-settings\Readme.md" />
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'iOS'">
     <TypeScriptModuleKind>commonjs</TypeScriptModuleKind>
diff --git a/Tests/local-settings-tests.ts b/Tests/local-settings-tests.ts
index 67678b458..ad4f029f7 100644
--- a/Tests/local-settings-tests.ts
+++ b/Tests/local-settings-tests.ts
@@ -1,6 +1,6 @@
 
 var TKUnit = require("Tests/TKUnit");
-var LocalSettings = require("localsettings");
+var LocalSettings = require("local-settings");
 
 var stringKey:string = "stringKey";
 var boolKey: string = "boolKey";
diff --git a/image/image_impl.android.ts b/image/image-impl.android.ts
similarity index 100%
rename from image/image_impl.android.ts
rename to image/image-impl.android.ts
diff --git a/image/image_impl.d.ts b/image/image-impl.d.ts
similarity index 100%
rename from image/image_impl.d.ts
rename to image/image-impl.d.ts
diff --git a/image/image_impl.ios.ts b/image/image-impl.ios.ts
similarity index 100%
rename from image/image_impl.ios.ts
rename to image/image-impl.ios.ts
diff --git a/image/image.ts b/image/image.ts
index 7d9efa391..2f9439918 100644
--- a/image/image.ts
+++ b/image/image.ts
@@ -1,5 +1,5 @@
 import app = require("application/application");
-import impl = require("image/image_impl");
+import impl = require("image/image-impl");
 import promises = require("promises/promises");
 import http = require("http/http");
 
diff --git a/localsettings/Readme.md b/local-settings/Readme.md
similarity index 100%
rename from localsettings/Readme.md
rename to local-settings/Readme.md
diff --git a/local-settings/index.ts b/local-settings/index.ts
new file mode 100644
index 000000000..f21e836cc
--- /dev/null
+++ b/local-settings/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("local-settings/local-settings");
\ No newline at end of file
diff --git a/localsettings/local_settings_common.ts b/local-settings/local-settings-common.ts
similarity index 100%
rename from localsettings/local_settings_common.ts
rename to local-settings/local-settings-common.ts
diff --git a/localsettings/local_settings.android.ts b/local-settings/local-settings.android.ts
similarity index 98%
rename from localsettings/local_settings.android.ts
rename to local-settings/local-settings.android.ts
index f2c84497f..5513c053b 100644
--- a/localsettings/local_settings.android.ts
+++ b/local-settings/local-settings.android.ts
@@ -1,5 +1,5 @@
 import appModule = require("application/application");
-import Common = require("localsettings/local_settings_common");
+import Common = require("local-settings/local-settings-common");
 
 var sharedPreferences = appModule.android.context.getSharedPreferences("prefs.db", 0);
 
diff --git a/localsettings/local_settings.d.ts b/local-settings/local-settings.d.ts
similarity index 100%
rename from localsettings/local_settings.d.ts
rename to local-settings/local-settings.d.ts
diff --git a/localsettings/local_settings.ios.ts b/local-settings/local-settings.ios.ts
similarity index 97%
rename from localsettings/local_settings.ios.ts
rename to local-settings/local-settings.ios.ts
index 3c4fefc68..499deae48 100644
--- a/localsettings/local_settings.ios.ts
+++ b/local-settings/local-settings.ios.ts
@@ -1,4 +1,4 @@
-import Common = require("localsettings/local_settings_common");
+import Common = require("local-settings/local-settings-common");
 
 var userDefaults = Foundation.NSUserDefaults.standardUserDefaults();
 
diff --git a/localsettings/index.ts b/localsettings/index.ts
deleted file mode 100644
index 5ea4780f1..000000000
--- a/localsettings/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("localsettings/local_settings");
\ No newline at end of file