diff --git a/build/vc80/turtle.vcproj b/build/vc80/turtle.vcproj
index 2cadb7f..542057e 100644
--- a/build/vc80/turtle.vcproj
+++ b/build/vc80/turtle.vcproj
@@ -188,6 +188,10 @@
 				RelativePath="..\..\src\libraries\turtle\matcher.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\libraries\turtle\mock.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\libraries\turtle\node.hpp"
 				>
@@ -212,10 +216,6 @@
 				RelativePath="..\..\src\libraries\turtle\sequence.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\libraries\turtle\tools.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\libraries\turtle\verifiable.hpp"
 				>
diff --git a/build/vc80/turtle_test.vcproj b/build/vc80/turtle_test.vcproj
index 2da83b8..7f1f9b2 100644
--- a/build/vc80/turtle_test.vcproj
+++ b/build/vc80/turtle_test.vcproj
@@ -208,6 +208,10 @@
 				RelativePath="..\..\src\tests\turtle_test\invocation_test.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\tests\turtle_test\mock_test.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\tests\turtle_test\object_test.cpp"
 				>
@@ -228,10 +232,6 @@
 				RelativePath="..\..\src\tests\turtle_test\sequence_test.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\tests\turtle_test\tools_test.cpp"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/src/libraries/turtle/tools.hpp b/src/libraries/turtle/mock.hpp
similarity index 100%
rename from src/libraries/turtle/tools.hpp
rename to src/libraries/turtle/mock.hpp
diff --git a/src/tests/turtle_test/tools_test.cpp b/src/tests/turtle_test/mock_test.cpp
similarity index 95%
rename from src/tests/turtle_test/tools_test.cpp
rename to src/tests/turtle_test/mock_test.cpp
index 6b080a5..dbb2f88 100644
--- a/src/tests/turtle_test/tools_test.cpp
+++ b/src/tests/turtle_test/mock_test.cpp
@@ -6,7 +6,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <turtle/tools.hpp>
+#include <turtle/mock.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/mpl/equal.hpp>
 
diff --git a/src/tests/turtle_test/samples_test.cpp b/src/tests/turtle_test/samples_test.cpp
index 2f519b9..593f2c2 100644
--- a/src/tests/turtle_test/samples_test.cpp
+++ b/src/tests/turtle_test/samples_test.cpp
@@ -6,10 +6,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <turtle/object.hpp>
-#include <turtle/expectation.hpp>
-#include <turtle/constraint.hpp>
-#include <turtle/tools.hpp>
+#include <turtle/mock.hpp>
 
 #include <boost/test/auto_unit_test.hpp>
 #define BOOST_LIB_NAME boost_unit_test_framework