diff --git a/README.md b/README.md
index ff6ab7a..12e5b92 100644
--- a/README.md
+++ b/README.md
@@ -10,5 +10,5 @@ Usage
 2. Create a D CMake Project: project(project-name D)
 3. Run cmake as usual specifing the cmake-d path. To cache it, don't forget to specify the *:PATH* variable type.<br/>
 ```
-cmake -DCMAKE_MODULE_PATH:PATH=<cmake-d-dir> <path-to-source>
+cmake -DCMAKE_MODULE_PATH:PATH=<cmake-d-dir>/cmake-d <path-to-source>
 ```
diff --git a/cmaked/CMakeDCompiler.cmake.in b/cmake-d/CMakeDCompiler.cmake.in
similarity index 100%
rename from cmaked/CMakeDCompiler.cmake.in
rename to cmake-d/CMakeDCompiler.cmake.in
diff --git a/cmaked/CMakeDCompilerABI.d b/cmake-d/CMakeDCompilerABI.d
similarity index 100%
rename from cmaked/CMakeDCompilerABI.d
rename to cmake-d/CMakeDCompilerABI.d
diff --git a/cmaked/CMakeDCompilerId.d.in b/cmake-d/CMakeDCompilerId.d.in
similarity index 100%
rename from cmaked/CMakeDCompilerId.d.in
rename to cmake-d/CMakeDCompilerId.d.in
diff --git a/cmaked/CMakeDInformation.cmake b/cmake-d/CMakeDInformation.cmake
similarity index 100%
rename from cmaked/CMakeDInformation.cmake
rename to cmake-d/CMakeDInformation.cmake
diff --git a/cmaked/CMakeDetermineDCompiler.cmake b/cmake-d/CMakeDetermineDCompiler.cmake
similarity index 100%
rename from cmaked/CMakeDetermineDCompiler.cmake
rename to cmake-d/CMakeDetermineDCompiler.cmake
diff --git a/cmaked/CMakeLists.txt b/cmake-d/CMakeLists.txt
similarity index 97%
rename from cmaked/CMakeLists.txt
rename to cmake-d/CMakeLists.txt
index 76f07b2..d317302 100644
--- a/cmaked/CMakeLists.txt
+++ b/cmake-d/CMakeLists.txt
@@ -9,7 +9,7 @@
 # See Copyright.txt for details.
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1)
-PROJECT (cmaked NONE)
+PROJECT (cmake-d NONE)
 
 SET (MOD_SRCS
 	CMakeDCompiler.cmake.in        
diff --git a/cmaked/CMakePlatformId.di.in b/cmake-d/CMakePlatformId.di.in
similarity index 100%
rename from cmaked/CMakePlatformId.di.in
rename to cmake-d/CMakePlatformId.di.in
diff --git a/cmaked/CMakeTestDCompiler.cmake b/cmake-d/CMakeTestDCompiler.cmake
similarity index 100%
rename from cmaked/CMakeTestDCompiler.cmake
rename to cmake-d/CMakeTestDCompiler.cmake
diff --git a/cmaked/Copyright.txt b/cmake-d/Copyright.txt
similarity index 100%
rename from cmaked/Copyright.txt
rename to cmake-d/Copyright.txt
diff --git a/cmaked/FindGDCPath.cmake b/cmake-d/FindGDCPath.cmake
similarity index 100%
rename from cmaked/FindGDCPath.cmake
rename to cmake-d/FindGDCPath.cmake
diff --git a/cmaked/FindPhobos.cmake b/cmake-d/FindPhobos.cmake
similarity index 100%
rename from cmaked/FindPhobos.cmake
rename to cmake-d/FindPhobos.cmake
diff --git a/cmaked/Platform/Linux-dmd.cmake b/cmake-d/Platform/Linux-dmd.cmake
similarity index 100%
rename from cmaked/Platform/Linux-dmd.cmake
rename to cmake-d/Platform/Linux-dmd.cmake
diff --git a/cmaked/Platform/Linux-gdc.cmake b/cmake-d/Platform/Linux-gdc.cmake
similarity index 100%
rename from cmaked/Platform/Linux-gdc.cmake
rename to cmake-d/Platform/Linux-gdc.cmake
diff --git a/cmaked/Platform/Windows-dmd.cmake b/cmake-d/Platform/Windows-dmd.cmake
similarity index 100%
rename from cmaked/Platform/Windows-dmd.cmake
rename to cmake-d/Platform/Windows-dmd.cmake
diff --git a/cmaked/Platform/Windows-gdc.cmake b/cmake-d/Platform/Windows-gdc.cmake
similarity index 100%
rename from cmaked/Platform/Windows-gdc.cmake
rename to cmake-d/Platform/Windows-gdc.cmake
diff --git a/cmaked/UseDDeps.cmake b/cmake-d/UseDDeps.cmake
similarity index 100%
rename from cmaked/UseDDeps.cmake
rename to cmake-d/UseDDeps.cmake
diff --git a/cmaked/UseDDoc.cmake b/cmake-d/UseDDoc.cmake
similarity index 100%
rename from cmaked/UseDDoc.cmake
rename to cmake-d/UseDDoc.cmake
diff --git a/cmaked/UseDUnittest.cmake b/cmake-d/UseDUnittest.cmake
similarity index 100%
rename from cmaked/UseDUnittest.cmake
rename to cmake-d/UseDUnittest.cmake
diff --git a/cmaked/dependencies.cmake b/cmake-d/dependencies.cmake
similarity index 100%
rename from cmaked/dependencies.cmake
rename to cmake-d/dependencies.cmake
diff --git a/tests/run_tests_linux.sh b/tests/run_tests_linux.sh
index 8914c1c..7380f97 100755
--- a/tests/run_tests_linux.sh
+++ b/tests/run_tests_linux.sh
@@ -6,13 +6,13 @@
 # and builds the tests there.
 #
 cd ../..
-rm -rf cmaked_test_build
-mkdir -p cmaked_test_build
-cd cmaked_test_build
+rm -rf cmake-d-test-build
+mkdir -p cmake-d-test-build
+cd cmake-d-test-build
 mkdir -p release
 cd release
 # Do a release build
-cmake ../../cmaked2/tests
+cmake ../../cmake-d/tests
 make
 make test
 cd ..
@@ -20,7 +20,7 @@ cd ..
 # Do a debug build
 mkdir -p debug
 cd debug
-cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmaked2/tests
+cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmake-d/tests
 make
 make test
 cd ../..