diff --git a/CMakeLists.txt b/CMakeLists.txt
index e190d3d..6d5df83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,10 @@ SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
 find_package( Boost 1.36.0 COMPONENTS regex)
 if(Boost_FOUND)
    include_directories(${Boost_INCLUDE_DIRS})
-   include_directories(langkit typelesscpp)
+   include_directories(langkit boxedcpp)
    
    add_executable(langkit_test langkit/main.cpp langkit/langkit_lexer.cpp langkit/langkit_parser.cpp)
    target_link_libraries(langkit_test ${Boost_LIBRARIES})
 
-   add_executable(typelesscpp_test typelesscpp/test.cpp)
+   add_executable(boxedcpp_test boxedcpp/test.cpp)
 endif()
diff --git a/typelesscpp/boxed_value.hpp b/boxedcpp/boxed_value.hpp
similarity index 100%
rename from typelesscpp/boxed_value.hpp
rename to boxedcpp/boxed_value.hpp
diff --git a/typelesscpp/boxedcpp.hpp b/boxedcpp/boxedcpp.hpp
similarity index 100%
rename from typelesscpp/boxedcpp.hpp
rename to boxedcpp/boxedcpp.hpp
diff --git a/typelesscpp/proxy_constructors.hpp b/boxedcpp/proxy_constructors.hpp
similarity index 100%
rename from typelesscpp/proxy_constructors.hpp
rename to boxedcpp/proxy_constructors.hpp
diff --git a/typelesscpp/proxy_functions.hpp b/boxedcpp/proxy_functions.hpp
similarity index 100%
rename from typelesscpp/proxy_functions.hpp
rename to boxedcpp/proxy_functions.hpp
diff --git a/typelesscpp/test.cpp b/boxedcpp/test.cpp
similarity index 100%
rename from typelesscpp/test.cpp
rename to boxedcpp/test.cpp
diff --git a/typelesscpp/type_info.hpp b/boxedcpp/type_info.hpp
similarity index 100%
rename from typelesscpp/type_info.hpp
rename to boxedcpp/type_info.hpp