diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index d18958c2..55c725c2 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -2,11 +2,11 @@ project(shibokengenerator)
 
 set(shiboken_SRC
 generator.cpp
-shiboken/cppgenerator.cpp
-shiboken/headergenerator.cpp
-shiboken/overloaddata.cpp
-shiboken/shibokengenerator.cpp
-shiboken/shibokennormalize.cpp
+shibokendir/cppgenerator.cpp
+shibokendir/headergenerator.cpp
+shibokendir/overloaddata.cpp
+shibokendir/shibokengenerator.cpp
+shibokendir/shibokennormalize.cpp
 main.cpp
 )
 
@@ -15,7 +15,7 @@ if (NOT DISABLE_DOCSTRINGS)
     add_definitions(-DDOCSTRINGS_ENABLED)
 endif()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shibokendir
                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
                     ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/generator/shiboken/CMakeLists.txt b/generator/shibokendir/CMakeLists.txt
similarity index 100%
rename from generator/shiboken/CMakeLists.txt
rename to generator/shibokendir/CMakeLists.txt
diff --git a/generator/shiboken/cppgenerator.cpp b/generator/shibokendir/cppgenerator.cpp
similarity index 100%
rename from generator/shiboken/cppgenerator.cpp
rename to generator/shibokendir/cppgenerator.cpp
diff --git a/generator/shiboken/cppgenerator.h b/generator/shibokendir/cppgenerator.h
similarity index 100%
rename from generator/shiboken/cppgenerator.h
rename to generator/shibokendir/cppgenerator.h
diff --git a/generator/shiboken/headergenerator.cpp b/generator/shibokendir/headergenerator.cpp
similarity index 100%
rename from generator/shiboken/headergenerator.cpp
rename to generator/shibokendir/headergenerator.cpp
diff --git a/generator/shiboken/headergenerator.h b/generator/shibokendir/headergenerator.h
similarity index 100%
rename from generator/shiboken/headergenerator.h
rename to generator/shibokendir/headergenerator.h
diff --git a/generator/shiboken/overloaddata.cpp b/generator/shibokendir/overloaddata.cpp
similarity index 100%
rename from generator/shiboken/overloaddata.cpp
rename to generator/shibokendir/overloaddata.cpp
diff --git a/generator/shiboken/overloaddata.h b/generator/shibokendir/overloaddata.h
similarity index 100%
rename from generator/shiboken/overloaddata.h
rename to generator/shibokendir/overloaddata.h
diff --git a/generator/shiboken/shibokengenerator.cpp b/generator/shibokendir/shibokengenerator.cpp
similarity index 100%
rename from generator/shiboken/shibokengenerator.cpp
rename to generator/shibokendir/shibokengenerator.cpp
diff --git a/generator/shiboken/shibokengenerator.h b/generator/shibokendir/shibokengenerator.h
similarity index 100%
rename from generator/shiboken/shibokengenerator.h
rename to generator/shibokendir/shibokengenerator.h
diff --git a/generator/shiboken/shibokennormalize.cpp b/generator/shibokendir/shibokennormalize.cpp
similarity index 100%
rename from generator/shiboken/shibokennormalize.cpp
rename to generator/shibokendir/shibokennormalize.cpp
diff --git a/generator/shiboken/shibokennormalize_p.h b/generator/shibokendir/shibokennormalize_p.h
similarity index 100%
rename from generator/shiboken/shibokennormalize_p.h
rename to generator/shibokendir/shibokennormalize_p.h