diff --git a/BCL.csproj b/BCL.csproj
index 0303468da..850796b0c 100644
--- a/BCL.csproj
+++ b/BCL.csproj
@@ -105,17 +105,8 @@
     <TypeScriptCompile Include="declarations.ios.d.ts">
       <DependentUpon>declarations.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="filesystem\file_system.d.ts" />
-    <TypeScriptCompile Include="filesystem\file_system.ts">
-      <DependentUpon>file_system.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="filesystem\file_system_access.android.ts">
-      <DependentUpon>file_system_access.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="filesystem\file_system_access.d.ts" />
-    <TypeScriptCompile Include="filesystem\file_system_access.ios.ts">
-      <DependentUpon>file_system_access.d.ts</DependentUpon>
-    </TypeScriptCompile>
+    <TypeScriptCompile Include="file-system\file-system.d.ts" />
+    <TypeScriptCompile Include="file-system\file-system-access.d.ts" />
     <TypeScriptCompile Include="image\image.ts">
       <DependentUpon>image.d.ts</DependentUpon>
     </TypeScriptCompile>
@@ -138,11 +129,11 @@
     <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\file-system-tests.ts" />
+    <TypeScriptCompile Include="Tests\http-tests.ts" />
     <TypeScriptCompile Include="Tests\image-tests.ts" />
     <TypeScriptCompile Include="Tests\index.ts" />
-    <TypeScriptCompile Include="Tests\location_tests.ts" />
+    <TypeScriptCompile Include="Tests\location-tests.ts" />
     <TypeScriptCompile Include="Tests\testRunner.ts" />
     <TypeScriptCompile Include="Tests\TKUnit.ts" />
     <TypeScriptCompile Include="text\index.ts" />
@@ -156,18 +147,12 @@
     <TypeScriptCompile Include="utils\module_merge.ts" />
     <TypeScriptCompile Include="utils\utils_android.ts" />
     <TypeScriptCompile Include="utils\utils_ios.ts" />
-    <TypeScriptCompile Include="http\http_request.android.ts">
-      <DependentUpon>http_request.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="http\http_request.ios.ts">
-      <DependentUpon>http_request.d.ts</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="http\http_request.d.ts" />
+    <TypeScriptCompile Include="http\http-request.d.ts" />
   </ItemGroup>
   <ItemGroup>
     <TypeScriptCompile Include="http\index.ts" />
     <TypeScriptCompile Include="location\index.ts" />
-    <TypeScriptCompile Include="filesystem\index.ts" />
+    <TypeScriptCompile Include="file-system\index.ts" />
     <TypeScriptCompile Include="console\index.ts" />
     <TypeScriptCompile Include="camera\index.ts" />
     <TypeScriptCompile Include="application\index.ts" />
@@ -186,13 +171,28 @@
     <TypeScriptCompile Include="timer\timer.ios.ts">
       <DependentUpon>timer.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="Tests\local_settings_tests.ts" />
+    <TypeScriptCompile Include="Tests\local-settings-tests.ts" />
     <TypeScriptCompile Include="console\console-helper.android.ts">
       <DependentUpon>console-helper.d.ts</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="console\console-helper.ios.ts">
       <DependentUpon>console-helper.d.ts</DependentUpon>
     </TypeScriptCompile>
+    <TypeScriptCompile Include="file-system\file-system.ts">
+      <DependentUpon>file-system.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="file-system\file-system-access.android.ts">
+      <DependentUpon>file-system-access.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="file-system\file-system-access.ios.ts">
+      <DependentUpon>file-system-access.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="http\http-request.android.ts">
+      <DependentUpon>http-request.d.ts</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="http\http-request.ios.ts">
+      <DependentUpon>http-request.d.ts</DependentUpon>
+    </TypeScriptCompile>
     <Content Include="image\Readme.md" />
     <TypeScriptCompile Include="localsettings\index.ts" />
     <TypeScriptCompile Include="localsettings\local_settings.android.ts">
diff --git a/Tests/file_system_tests.ts b/Tests/file-system-tests.ts
similarity index 99%
rename from Tests/file_system_tests.ts
rename to Tests/file-system-tests.ts
index 99570dd1e..26bf32cd5 100644
--- a/Tests/file_system_tests.ts
+++ b/Tests/file-system-tests.ts
@@ -4,7 +4,7 @@
 // Using the file system requires the FileSystem module.
 // TODO: var fs = require("filesystem"); => this will break the intellisense of the tests
 // ``` JavaScript
-import fs = require("filesystem/file_system");
+import fs = require("file-system/file-system");
 // ```
 // The pre-required `fs` module is used throughout the following code snippets.
 // </snippet>
diff --git a/Tests/http_tests.ts b/Tests/http-tests.ts
similarity index 98%
rename from Tests/http_tests.ts
rename to Tests/http-tests.ts
index 8996cd2df..7dc7c8ef9 100644
--- a/Tests/http_tests.ts
+++ b/Tests/http-tests.ts
@@ -1,6 +1,6 @@
 import TKUnit = require("Tests/TKUnit");
 import http = require("http/http");
-import http_request = require("http/http_request");
+import http_request = require("http/http-request");
 
 export var test_getString_isDefined = function () {
     TKUnit.assert(typeof (http.getString) !== "undefined", "Method http.getString() should be defined!");
diff --git a/Tests/image-tests.ts b/Tests/image-tests.ts
index 63de7f160..70437d6b4 100644
--- a/Tests/image-tests.ts
+++ b/Tests/image-tests.ts
@@ -1,6 +1,6 @@
 import image = require("image/image"); 
 import app = require("application/application"); 
-import fs = require("filesystem/file_system"); 
+import fs = require("file-system/file-system"); 
 import TKUnit = require("Tests/TKUnit"); 
 
 export var testFromResource = function () {
diff --git a/Tests/local_settings_tests.ts b/Tests/local-settings-tests.ts
similarity index 100%
rename from Tests/local_settings_tests.ts
rename to Tests/local-settings-tests.ts
diff --git a/Tests/location_tests.ts b/Tests/location-tests.ts
similarity index 100%
rename from Tests/location_tests.ts
rename to Tests/location-tests.ts
diff --git a/Tests/testRunner.ts b/Tests/testRunner.ts
index fd9bca56b..02e7002ac 100644
--- a/Tests/testRunner.ts
+++ b/Tests/testRunner.ts
@@ -1,8 +1,8 @@
 var TKUnit = require("Tests/TKUnit");
-var fsTests = require("Tests/file_system_tests");
-var httpTests = require("Tests/http_tests");
-var locationTests = require("Tests/location_tests");
-var localSettingsTests = require("Tests/local_settings_tests");
+var fsTests = require("Tests/file-system-tests");
+var httpTests = require("Tests/http-tests");
+var locationTests = require("Tests/location-tests");
+var localSettingsTests = require("Tests/local-settings-tests");
 var imageTests = require("Tests/image-tests");
 
 export var runAll = function () {
diff --git a/filesystem/file_system_access.android.ts b/file-system/file-system-access.android.ts
similarity index 100%
rename from filesystem/file_system_access.android.ts
rename to file-system/file-system-access.android.ts
diff --git a/filesystem/file_system_access.d.ts b/file-system/file-system-access.d.ts
similarity index 100%
rename from filesystem/file_system_access.d.ts
rename to file-system/file-system-access.d.ts
diff --git a/filesystem/file_system_access.ios.ts b/file-system/file-system-access.ios.ts
similarity index 100%
rename from filesystem/file_system_access.ios.ts
rename to file-system/file-system-access.ios.ts
diff --git a/filesystem/file_system.d.ts b/file-system/file-system.d.ts
similarity index 100%
rename from filesystem/file_system.d.ts
rename to file-system/file-system.d.ts
diff --git a/filesystem/file_system.ts b/file-system/file-system.ts
similarity index 99%
rename from filesystem/file_system.ts
rename to file-system/file-system.ts
index a30aa48f3..a5ebe9d4d 100644
--- a/filesystem/file_system.ts
+++ b/file-system/file-system.ts
@@ -1,4 +1,4 @@
-import file_access_module = require("filesystem/file_system_access");
+import file_access_module = require("file-system/file-system-access");
 import promises = require("promises/promises");
 
 // The FileSystemAccess implementation, used through all the APIs.
diff --git a/filesystem/index.ts b/file-system/index.ts
similarity index 100%
rename from filesystem/index.ts
rename to file-system/index.ts
diff --git a/http/http_request.android.ts b/http/http-request.android.ts
similarity index 98%
rename from http/http_request.android.ts
rename to http/http-request.android.ts
index 0e895a2dc..d2b6f6425 100644
--- a/http/http_request.android.ts
+++ b/http/http-request.android.ts
@@ -2,7 +2,7 @@
   * Android specific http client implementation.
   */
 import promises = require("promises/promises");
-import http = require("http/http_request");
+import http = require("http/http-request");
 
 export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
     var d = promises.defer<http.HttpResponse>();
diff --git a/http/http_request.d.ts b/http/http-request.d.ts
similarity index 100%
rename from http/http_request.d.ts
rename to http/http-request.d.ts
diff --git a/http/http_request.ios.ts b/http/http-request.ios.ts
similarity index 98%
rename from http/http_request.ios.ts
rename to http/http-request.ios.ts
index 3ecc4ed11..7a1eaffdc 100644
--- a/http/http_request.ios.ts
+++ b/http/http-request.ios.ts
@@ -2,7 +2,7 @@
   * iOS specific http client implementation.
   */
 import promises = require("promises/promises");
-import http = require("http/http_request");
+import http = require("http/http-request");
 
 export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
     var d = promises.defer<http.HttpResponse>();
diff --git a/http/http.ts b/http/http.ts
index a58ec980d..453b34a11 100644
--- a/http/http.ts
+++ b/http/http.ts
@@ -1,6 +1,6 @@
 import image_module = require("image/image");
 import promises = require("promises/promises");
-import http = require("http/http_request");
+import http = require("http/http-request");
 
 // merge request
 declare var exports;