diff --git a/.gitattributes b/.gitattributes
index 3d7236ce86c..9a10f75d577 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1768,7 +1768,7 @@ Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h -text
 Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h -text
 Kinetic_data_structures/include/CGAL/Kinetic/listeners.h -text
 Kinetic_data_structures/include/CGAL/Tools/utility_macros.h -text
-Kinetic_data_structures/src/CGALQt/Kinetic_print.xpm -text
+Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm -text
 Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=1,n -text
 Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3 -text
 Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3,n -text
@@ -3147,7 +3147,7 @@ Qt_widget/doc_tex/Qt_widget/standard_toolbar.pdf -text svneol=unset#application/
 Qt_widget/doc_tex/Qt_widget/standard_toolbar.png -text svneol=unset#image/png
 Qt_widget/doc_tex/Qt_widget/triangulation.gif -text svneol=unset#image/gif
 Qt_widget/doc_tex/Qt_widget/triangulation.pdf -text svneol=unset#application/pdf
-Qt_widget/src/CGALQt/CMakeLists.txt -text
+Qt_widget/src/CGALQt3/CMakeLists.txt -text
 Ridges_3/doc_tex/Ridges_3/RidgesMechPartDetail.png -text
 Ridges_3/doc_tex/Ridges_3/david_crest.jpg -text
 Ridges_3/doc_tex/Ridges_3/david_crest_small.png -text svneol=unset#image/png
diff --git a/.gitignore b/.gitignore
index 14ec05db442..e5f4836269c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -895,7 +895,7 @@ QP_solver/documentation/UpdateZ.log
 QP_solver/documentation/UpdateZ.pdf
 QP_solver/documentation/UpdateZ.synctex.gz
 Qt_widget/.env
-Qt_widget/src/CGALQt/*.moc
+Qt_widget/src/CGALQt3/*.moc
 Qt_widget/test/Qt_widget/test_qt_version
 Random_numbers/*.aux
 Random_numbers/*.bbl
diff --git a/Installation/include/CGAL/auto_link/CGALQt.h b/Installation/include/CGAL/auto_link/CGALQt3.h
similarity index 100%
rename from Installation/include/CGAL/auto_link/CGALQt.h
rename to Installation/include/CGAL/auto_link/CGALQt3.h
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_window_2.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_Qt_window_2.cpp
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_faster.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_faster.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_pause.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_pause.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_pixmaps.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_pixmaps.cpp
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_play.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_play.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_play_through.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_play_through.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_play_to.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_play_to.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_print.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_print.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_reverse.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_reverse.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_slower.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_slower.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_stop.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm
similarity index 100%
rename from Kinetic_data_structures/src/CGALQt/Kinetic_stop.xpm
rename to Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm
diff --git a/Nef_S2/src/CGALQt/Qt_widget_OpenGL.cpp b/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp
similarity index 100%
rename from Nef_S2/src/CGALQt/Qt_widget_OpenGL.cpp
rename to Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp
diff --git a/Qt_widget/src/CGALQt/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt
similarity index 100%
rename from Qt_widget/src/CGALQt/CMakeLists.txt
rename to Qt_widget/src/CGALQt3/CMakeLists.txt
diff --git a/Qt_widget/src/CGALQt/Qt_help_window.cpp b/Qt_widget/src/CGALQt3/Qt_help_window.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_help_window.cpp
rename to Qt_widget/src/CGALQt3/Qt_help_window.cpp
diff --git a/Qt_widget/src/CGALQt/Qt_widget.cpp b/Qt_widget/src/CGALQt3/Qt_widget.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_widget.cpp
rename to Qt_widget/src/CGALQt3/Qt_widget.cpp
diff --git a/Qt_widget/src/CGALQt/Qt_widget_history.cpp b/Qt_widget/src/CGALQt3/Qt_widget_history.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_widget_history.cpp
rename to Qt_widget/src/CGALQt3/Qt_widget_history.cpp
diff --git a/Qt_widget/src/CGALQt/Qt_widget_layer.cpp b/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_widget_layer.cpp
rename to Qt_widget/src/CGALQt3/Qt_widget_layer.cpp
diff --git a/Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp b/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp
rename to Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp
diff --git a/Qt_widget/src/CGALQt/Qt_widget_xpm_icons.cpp b/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/Qt_widget_xpm_icons.cpp
rename to Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp
diff --git a/Qt_widget/src/CGALQt/all_files.cpp b/Qt_widget/src/CGALQt3/all_files.cpp
similarity index 100%
rename from Qt_widget/src/CGALQt/all_files.cpp
rename to Qt_widget/src/CGALQt3/all_files.cpp