diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h
similarity index 100%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
similarity index 99%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
index 17a3076e6ec..35d37947735 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_KINETIC_IO_INTERNAL_QT_SIMULATOR_CORE_H
 #define CGAL_KINETIC_IO_INTERNAL_QT_SIMULATOR_CORE_H
 #include <CGAL/Kinetic/basic.h>
-#include <CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h>
+#include <CGAL/Kinetic/IO/internal/GUI_base.h>
 #include <qobject.h>
 
 namespace CGAL
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_timer.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
similarity index 100%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_timer.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
similarity index 100%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
similarity index 93%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
index 55531293875..5819097ed45 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
@@ -25,9 +25,9 @@
 
 #include <CGAL/IO/Qt_widget_layer.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
-#include <CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h>
-#include <CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h>
-#include <CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h>
+#include <CGAL/Kinetic/IO/internal/Qt_core.h>
+#include <CGAL/Kinetic/IO/internal/pixmaps.h>
+#include <CGAL/Kinetic/IO/internal/Qt_widget_2_core.h>
 #include <map>
 #include <qmainwindow.h>
 #include <set>
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h
similarity index 100%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h