diff --git a/chaiscript/chaiscript.hpp b/chaiscript/chaiscript.hpp
index e07a0c95..fa039d91 100644
--- a/chaiscript/chaiscript.hpp
+++ b/chaiscript/chaiscript.hpp
@@ -28,7 +28,7 @@ const char *tokentype_to_string(int tokentype) {
     return token_types[tokentype];
 }
 
-#include "boxedcpp.hpp"
+#include "dispatchkit.hpp"
 #include "bootstrap.hpp"
 #include "bootstrap_stl.hpp"
 
diff --git a/dispatchkit/bootstrap.hpp b/dispatchkit/bootstrap.hpp
index 16b60e75..f67b7e45 100644
--- a/dispatchkit/bootstrap.hpp
+++ b/dispatchkit/bootstrap.hpp
@@ -1,7 +1,7 @@
 #ifndef __bootstrap_hpp
 #define __bootstrap_hpp__
 
-#include "boxedcpp.hpp"
+#include "dispatchkit.hpp"
 #include "bootstrap_pod.hpp"
 
 template<typename Ret, typename P1, typename P2>
diff --git a/dispatchkit/bootstrap_stl.hpp b/dispatchkit/bootstrap_stl.hpp
index 2ae51912..47f19244 100644
--- a/dispatchkit/bootstrap_stl.hpp
+++ b/dispatchkit/bootstrap_stl.hpp
@@ -1,7 +1,7 @@
 #ifndef __bootstrap_stl_hpp
 #define __bootstrap_stl_hpp__
 
-#include "boxedcpp.hpp"
+#include "dispatchkit.hpp"
 
 template<typename ContainerType>
 void bootstrap_reversible_container(Dispatch_Engine &system, const std::string &type)
diff --git a/dispatchkit/boxedcpp.hpp b/dispatchkit/dispatchkit.hpp
similarity index 98%
rename from dispatchkit/boxedcpp.hpp
rename to dispatchkit/dispatchkit.hpp
index ff3fa159..645ddf40 100644
--- a/dispatchkit/boxedcpp.hpp
+++ b/dispatchkit/dispatchkit.hpp
@@ -1,5 +1,5 @@
-#ifndef __boxedcpp_system_hpp__
-#define __boxedcpp_system_hpp__
+#ifndef __dispatchkit_hpp__
+#define __dispatchkit_hpp__
 
 #include <typeinfo>
 #include <string>
diff --git a/dispatchkit/register_function.hpp b/dispatchkit/register_function.hpp
index 1362f82c..62ae4bd7 100644
--- a/dispatchkit/register_function.hpp
+++ b/dispatchkit/register_function.hpp
@@ -4,7 +4,7 @@
 #ifndef __register_function_hpp__
 #define __register_function_hpp__
 
-#include <boxedcpp.hpp>
+#include "dispatchkit.hpp"
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
diff --git a/dispatchkit/test.cpp b/dispatchkit/test.cpp
index 4da09cd8..f8f6d49a 100644
--- a/dispatchkit/test.cpp
+++ b/dispatchkit/test.cpp
@@ -4,7 +4,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 
-#include "boxedcpp.hpp"
+#include "dispatchkit.hpp"
 #include "bootstrap.hpp"
 #include "bootstrap_stl.hpp"
 
diff --git a/dispatchkit/unittest.cpp b/dispatchkit/unittest.cpp
index 958cf612..ef92859e 100644
--- a/dispatchkit/unittest.cpp
+++ b/dispatchkit/unittest.cpp
@@ -1,4 +1,4 @@
-#include "boxedcpp.hpp"
+#include "dispatchkit.hpp"
 #include "bootstrap.hpp"
 
 #define BOOST_TEST_DYN_LINK