diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_GUI_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h
similarity index 99%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_GUI_base.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h
index 897a159a375..d42a220d63d 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_GUI_base.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h
@@ -13,7 +13,7 @@
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
 // $URL$
-// $Id$
+// $Id$ $Date$
 // 
 //
 // Author(s)     : Daniel Russel <drussel@alumni.princeton.edu>
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h
similarity index 98%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_core.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h
index e38fd679b9a..17a3076e6ec 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_core.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_core.h
@@ -13,7 +13,7 @@
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
 // $URL$
-// $Id$
+// $Id$ $Date$
 // 
 //
 // Author(s)     : Daniel Russel <drussel@alumni.princeton.edu>
@@ -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/KDS_GUI_base.h>
+#include <CGAL/Kinetic/IO/internal/Kinetic_GUI_base.h>
 #include <qobject.h>
 
 namespace CGAL
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_timer.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_timer.h
similarity index 99%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_timer.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_timer.h
index c8316d907f9..72a0a76034c 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_timer.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_timer.h
@@ -13,7 +13,7 @@
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
 // $URL$
-// $Id$
+// $Id$ $Date$
 // 
 //
 // Author(s)     : Daniel Russel <drussel@alumni.princeton.edu>
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_widget_2_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h
similarity index 98%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_widget_2_core.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h
index a4629c4cea8..5535f8ab8fb 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_widget_2_core.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_widget_2_core.h
@@ -21,6 +21,7 @@
 #ifndef CGAL_KINETIC_IO_INTERNAL_QT_WIDGET_2_CORE_H
 #define CGAL_KINETIC_IO_INTERNAL_QT_WIDGET_2_CORE_H
 
+#include <CGAL/Kinetic/basic.h>
 #include <CGAL/IO/Qt_widget.h>
 #include <qmainwindow.h>
 
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_window_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h
similarity index 92%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_window_2.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h
index 34b20a80100..55531293875 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_Qt_window_2.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_Qt_window_2.h
@@ -13,7 +13,7 @@
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
 // $URL$
-// $Id$
+// $Id$ $Date$
 // 
 //
 // Author(s)     : Daniel Russel <drussel@alumni.princeton.edu>
@@ -25,9 +25,9 @@
 
 #include <CGAL/IO/Qt_widget_layer.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
-#include <CGAL/Kinetic/IO/internal/KDS_Qt_core.h>
-#include <CGAL/Kinetic/IO/internal/KDS_pixmaps.h>
-#include <CGAL/Kinetic/IO/internal/KDS_Qt_widget_2_core.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 <map>
 #include <qmainwindow.h>
 #include <set>
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_pixmaps.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h
similarity index 98%
rename from Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_pixmaps.h
rename to Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h
index bf3ba18b448..08008fba13b 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/KDS_pixmaps.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Kinetic_pixmaps.h
@@ -22,7 +22,7 @@
 #define CGAL_KINETIC_IO_PIXMAPS_PIXMAPS_H
 namespace CGAL
 {
-    namespace KDS
+    namespace Kinetic
     {
         namespace internal
         {