WM: rename files, manipulator -> gizmo

Edit doxy files and header guards only.

65 files changed, 193 insertions, 193 deletions

diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 2b30382f4a4..cf1db751c85 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -30,7 +30,7 @@ if(WITH_BLENDER)
 	add_subdirectory(interface)
 	add_subdirectory(io)
 	add_subdirectory(lattice)
-	add_subdirectory(manipulator_library)
+	add_subdirectory(gizmo_library)
 	add_subdirectory(mask)
 	add_subdirectory(mesh)
 	add_subdirectory(metaball)
diff --git a/source/blender/editors/manipulator_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index 86e1bb3b6d7..389820240e2 100644
--- a/source/blender/editors/manipulator_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -37,24 +37,24 @@ set(INC_SYS
 )
 
 set(SRC
-	manipulator_draw_utils.c
-	manipulator_geometry.h
-	manipulator_library_intern.h
-	manipulator_library_presets.c
-	manipulator_library_utils.c
-	geometry/geom_arrow_manipulator.c
-	geometry/geom_cube_manipulator.c
-	geometry/geom_dial_manipulator.c
-	manipulator_types/arrow2d_manipulator.c
-	manipulator_types/arrow3d_manipulator.c
-	manipulator_types/button2d_manipulator.c
-	manipulator_types/cage2d_manipulator.c
-	manipulator_types/cage3d_manipulator.c
-	manipulator_types/dial3d_manipulator.c
-	manipulator_types/grab3d_manipulator.c
-	manipulator_types/primitive3d_manipulator.c
+	gizmo_draw_utils.c
+	gizmo_geometry.h
+	gizmo_library_intern.h
+	gizmo_library_presets.c
+	gizmo_library_utils.c
+	geometry/geom_arrow_gizmo.c
+	geometry/geom_cube_gizmo.c
+	geometry/geom_dial_gizmo.c
+	gizmo_types/arrow2d_gizmo.c
+	gizmo_types/arrow3d_gizmo.c
+	gizmo_types/button2d_gizmo.c
+	gizmo_types/cage2d_gizmo.c
+	gizmo_types/cage3d_gizmo.c
+	gizmo_types/dial3d_gizmo.c
+	gizmo_types/grab3d_gizmo.c
+	gizmo_types/primitive3d_gizmo.c
 )
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_manipulator_library "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
index 34f7d73589c..e8804238590 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
@@ -21,11 +21,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_arrow_manipulator.c
+/** \file geom_arrow_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static float verts[][3] = {
 	{-0.000000, 0.012320, 0.000000},
diff --git a/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
index cee8e1e22ee..f2d03821302 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
@@ -23,11 +23,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_cube_manipulator.c
+/** \file geom_cube_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static const float verts[][3] = {
 	{1.000000, 1.000000, -1.000000},
diff --git a/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
index 811fc872a81..bc3fb6fcaff 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
@@ -21,11 +21,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_dial_manipulator.c
+/** \file geom_dial_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static const float verts[][3] = {
 	{1.034000, 0.000000, 0.000000},
diff --git a/source/blender/editors/manipulator_library/manipulator_draw_utils.c b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
index 80181c57115..8ae21f61758 100644
--- a/source/blender/editors/manipulator_library/manipulator_draw_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_draw_utils.c
+/** \file gizmo_draw_utils.c
  *  \ingroup wm
  */
 
@@ -54,7 +54,7 @@
 #include "wm.h"
 
 /* own includes */
-#include "manipulator_library_intern.h"
+#include "gizmo_library_intern.h"
 
 /**
  * Main draw call for ManipulatorGeomInfo data
diff --git a/source/blender/editors/manipulator_library/manipulator_geometry.h b/source/blender/editors/gizmo_library/gizmo_geometry.h
index 2083f9d4d31..de976bbad48 100644
--- a/source/blender/editors/manipulator_library/manipulator_geometry.h
+++ b/source/blender/editors/gizmo_library/gizmo_geometry.h
@@ -21,7 +21,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_geometry.h
+/** \file gizmo_geometry.h
  *  \ingroup wm
  *
  * \name Manipulator Geometry
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef __MANIPULATOR_GEOMETRY_H__
-#define __MANIPULATOR_GEOMETRY_H__
+#ifndef __GIZMO_GEOMETRY_H__
+#define __GIZMO_GEOMETRY_H__
 
 typedef struct ManipulatorGeomInfo {
 	int nverts;
@@ -51,4 +51,4 @@ extern ManipulatorGeomInfo wm_manipulator_geom_data_cube;
 /* dial manipulator */
 extern ManipulatorGeomInfo wm_manipulator_geom_data_dial;
 
-#endif  /* __MANIPULATOR_GEOMETRY_H__ */
+#endif  /* __GIZMO_GEOMETRY_H__ */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_intern.h b/source/blender/editors/gizmo_library/gizmo_library_intern.h
index 55db99236e0..17121d3752e 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_intern.h
+++ b/source/blender/editors/gizmo_library/gizmo_library_intern.h
@@ -23,12 +23,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_library_intern.h
+/** \file gizmo_library_intern.h
  *  \ingroup wm
  */
 
-#ifndef __MANIPULATOR_LIBRARY_INTERN_H__
-#define __MANIPULATOR_LIBRARY_INTERN_H__
+#ifndef __GIZMO_LIBRARY_INTERN_H__
+#define __GIZMO_LIBRARY_INTERN_H__
 
 /* distance around which manipulators respond to input (and get highlighted) */
 #define MANIPULATOR_HOTSPOT 14.0f
@@ -100,7 +100,7 @@ bool manipulator_window_project_3d(
 /* -------------------------------------------------------------------- */
 /* Manipulator drawing */
 
-#include "manipulator_geometry.h"
+#include "gizmo_geometry.h"
 
 void wm_manipulator_geometryinfo_draw(const struct ManipulatorGeomInfo *info, const bool select, const float color[4]);
 void wm_manipulator_vec_draw(
@@ -108,4 +108,4 @@ void wm_manipulator_vec_draw(
         uint pos, uint primitive_type);
 
 
-#endif  /* __MANIPULATOR_LIBRARY_INTERN_H__ */
+#endif  /* __GIZMO_LIBRARY_INTERN_H__ */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c
index 12f07611722..d58e0c9dc85 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_presets.c
+++ b/source/blender/editors/gizmo_library/gizmo_library_presets.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/manipulator_library/manipulator_library_presets.c
+/** \file blender/editors/gizmo_library/gizmo_library_presets.c
  *  \ingroup wm
  *
  * \name Manipulator Lib Presets
@@ -54,8 +54,8 @@
 #include "ED_screen.h"
 
 /* own includes */
-#include "ED_manipulator_library.h"  /* own include */
-#include "manipulator_library_intern.h"  /* own include */
+#include "ED_gizmo_library.h"  /* own include */
+#include "gizmo_library_intern.h"  /* own include */
 
 /* TODO, this is to be used by RNA. might move to ED_manipulator_library */
 
diff --git a/source/blender/editors/manipulator_library/manipulator_library_utils.c b/source/blender/editors/gizmo_library/gizmo_library_utils.c
index 957f0abdd71..794728dd03c 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_library_utils.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_library_utils.c
+/** \file gizmo_library_utils.c
  *  \ingroup wm
  *
  * \name Manipulator Library Utilities
@@ -47,7 +47,7 @@
 #include "ED_view3d.h"
 
 /* own includes */
-#include "manipulator_library_intern.h"
+#include "gizmo_library_intern.h"
 
 /* factor for precision tweaking */
 #define MANIPULATOR_PRECISION_FAC 0.05f
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
index 5acf1ab2d64..fbb30b95562 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file arrow2d_manipulator.c
+/** \file arrow2d_gizmo.c
  *  \ingroup wm
  *
  * \name 2D Arrow Manipulator
@@ -54,12 +54,12 @@
 #include "WM_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
 #include "WM_api.h"
 
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 static void arrow2d_draw_geom(wmManipulator *mpr, const float matrix[4][4], const float color[4])
 {
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
index 0430a12bc99..72b24e03c00 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file arrow3d_manipulator.c
+/** \file arrow3d_gizmo.c
  *  \ingroup wm
  *
  * \name Arrow Manipulator
@@ -63,11 +63,11 @@
 
 #include "ED_view3d.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 /* to use custom arrows exported to geom_arrow_manipulator.c */
 //#define USE_MANIPULATOR_CUSTOM_ARROWS
diff --git a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
index db33f457056..78f374064e6 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file button2d_manipulator.c
+/** \file button2d_gizmo.c
  *  \ingroup wm
  *
  * \name Button Manipulator
@@ -56,15 +56,15 @@
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 #include "UI_resources.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 typedef struct ButtonManipulator2D {
 	wmManipulator manipulator;
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
index b7b19ccd634..382733d298f 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file cage2d_manipulator.c
+/** \file cage2d_gizmo.c
  *  \ingroup wm
  *
  * \name Cage Manipulator
@@ -59,10 +59,10 @@
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 #define MANIPULATOR_RESIZER_SIZE 10.0f
 #define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
index a907816b08f..0f3e67d7585 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file cage3d_manipulator.c
+/** \file cage3d_gizmo.c
  *  \ingroup wm
  *
  * \name Cage Manipulator
@@ -58,10 +58,10 @@
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 #define MANIPULATOR_RESIZER_SIZE 10.0f
 #define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
index 74ba8bd77a9..8d0061f66c8 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file dial3d_manipulator.c
+/** \file dial3d_gizmo.c
  *  \ingroup wm
  *
  * \name Dial Manipulator
@@ -61,11 +61,11 @@
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 /* to use custom dials exported to geom_dial_manipulator.c */
 // #define USE_MANIPULATOR_CUSTOM_DIAL
diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
index 458dc2fd1c8..e55b57327b6 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file grab3d_manipulator.c
+/** \file grab3d_gizmo.c
  *  \ingroup wm
  *
  * \name Grab Manipulator
@@ -56,11 +56,11 @@
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 typedef struct GrabManipulator3D {
 	wmManipulator manipulator;
diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
index 419873ccfff..1331a4e983f 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file primitive3d_manipulator.c
+/** \file primitive3d_gizmo.c
  *  \ingroup wm
  *
  * \name Primitive Manipulator
@@ -50,10 +50,10 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 static float verts_plane[4][3] = {
 	{-1, -1, 0},
diff --git a/source/blender/editors/include/ED_manipulator_library.h b/source/blender/editors/include/ED_gizmo_library.h
index fca0f5c8806..b33fbf47630 100644
--- a/source/blender/editors/include/ED_manipulator_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file ED_manipulator_library.h
+/** \file ED_gizmo_library.h
  *  \ingroup wm
  *
  * \name Generic Manipulators.
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef __ED_MANIPULATOR_LIBRARY_H__
-#define __ED_MANIPULATOR_LIBRARY_H__
+#ifndef __ED_GIZMO_LIBRARY_H__
+#define __ED_GIZMO_LIBRARY_H__
 
 /* initialize manipulators */
 void ED_manipulatortypes_arrow_2d(void);
@@ -219,4 +219,4 @@ enum {
 	ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE = 0,
 };
 
-#endif  /* __ED_MANIPULATOR_LIBRARY_H__ */
+#endif  /* __ED_GIZMO_LIBRARY_H__ */
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 5cd768b4fe3..81ec591fc89 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -44,7 +44,7 @@ set(INC_SYS
 set(SRC
 	editface.c
 	editmesh_add.c
-	editmesh_add_manipulator.c
+	editmesh_add_gizmo.c
 	editmesh_bevel.c
 	editmesh_bisect.c
 	editmesh_extrude.c
diff --git a/source/blender/editors/mesh/editmesh_add_manipulator.c b/source/blender/editors/mesh/editmesh_add_gizmo.c
index f1704972e81..3918d8847a6 100644
--- a/source/blender/editors/mesh/editmesh_add_manipulator.c
+++ b/source/blender/editors/mesh/editmesh_add_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mesh/editmesh_add_manipulator.c
+/** \file blender/editors/mesh/editmesh_add_gizmo.c
  *  \ingroup edmesh
  *
  * Creation manipulators.
@@ -34,7 +34,7 @@
 #include "BKE_context.h"
 #include "BKE_editmesh.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_screen.h"
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index 579cd5e4e08..87a65924979 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -57,7 +57,7 @@
 #define USE_MANIPULATOR
 
 #ifdef USE_MANIPULATOR
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_undo.h"
 #endif
 
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index be68bfda09c..b007bcf04ba 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -53,7 +53,7 @@
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c
index 5c1b9ccc178..74e2833b2d9 100644
--- a/source/blender/editors/mesh/editmesh_extrude_spin.c
+++ b/source/blender/editors/mesh/editmesh_extrude_spin.c
@@ -57,7 +57,7 @@
 #define USE_MANIPULATOR
 
 #ifdef USE_MANIPULATOR
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_undo.h"
 #endif
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 2ee791e81d6..37f5ed642fe 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -67,7 +67,7 @@
 #include "ED_clip.h"
 #include "ED_mask.h"
 #include "ED_sequencer.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "io_ops.h"
 
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 77b1351435b..06a00945452 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -48,7 +48,7 @@ set(SRC
 	node_draw.c
 	node_edit.c
 	node_group.c
-	node_manipulators.c
+	node_gizmo.c
 	node_ops.c
 	node_relationships.c
 	node_select.c
diff --git a/source/blender/editors/space_node/node_manipulators.c b/source/blender/editors/space_node/node_gizmo.c
index 851e3973288..62b4a4b6583 100644
--- a/source/blender/editors/space_node/node_manipulators.c
+++ b/source/blender/editors/space_node/node_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_node/node_manipulators.c
+/** \file blender/editors/space_node/node_gizmo.c
  *  \ingroup spnode
  */
 
@@ -34,7 +34,7 @@
 #include "BKE_main.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "IMB_imbuf_types.h"
 
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index f8e38587117..b85525dd2ee 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -55,14 +55,14 @@ set(SRC
 	view3d_walk.c
 	view3d_header.c
 	view3d_iterators.c
-	view3d_manipulator_armature.c
-	view3d_manipulator_camera.c
-	view3d_manipulator_empty.c
-	view3d_manipulator_forcefield.c
-	view3d_manipulator_lamp.c
-	view3d_manipulator_navigate.c
-	view3d_manipulator_navigate_type.c
-	view3d_manipulator_ruler.c
+	view3d_gizmo_armature.c
+	view3d_gizmo_camera.c
+	view3d_gizmo_empty.c
+	view3d_gizmo_forcefield.c
+	view3d_gizmo_lamp.c
+	view3d_gizmo_navigate.c
+	view3d_gizmo_navigate_type.c
+	view3d_gizmo_ruler.c
 	view3d_ops.c
 	view3d_project.c
 	view3d_ruler.c
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c
index 17dc4d8eb4a..16c7d574873 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_armature.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_armature.c
+/** \file blender/editors/space_view3d/view3d_gizmo_armature.c
  *  \ingroup spview3d
  */
 
@@ -36,7 +36,7 @@
 
 #include "ED_armature.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
index 29f380c6334..0c97669a9af 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_camera.c
+/** \file blender/editors/space_view3d/view3d_gizmo_camera.c
  *  \ingroup spview3d
  */
 
@@ -35,7 +35,7 @@
 
 #include "ED_armature.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
index 16424c39bb8..89f55bc1d9a 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_empty.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_empty.c
+/** \file blender/editors/space_view3d/view3d_gizmo_empty.c
  *  \ingroup spview3d
  */
 
@@ -35,7 +35,7 @@
 #include "DNA_lamp_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
index e4535004c8f..db985c18c08 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_forcefield.c
+/** \file blender/editors/space_view3d/view3d_gizmo_forcefield.c
  *  \ingroup spview3d
  */
 
@@ -34,7 +34,7 @@
 #include "DNA_object_force_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_lamp.c b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c
index 39e908ec99d..8087fcbdddd 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_lamp.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_lamp.c
+/** \file blender/editors/space_view3d/view3d_gizmo_lamp.c
  *  \ingroup spview3d
  */
 
@@ -34,7 +34,7 @@
 #include "DNA_lamp_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
index 465faf70fcd..db4eeef18f7 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_navigate.c
+/** \file blender/editors/space_view3d/view3d_gizmo_navigate.c
  *  \ingroup spview3d
  */
 
@@ -32,7 +32,7 @@
 #include "DNA_object_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
index 996da2a1475..072f2ee4583 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file view3d_manipulator_navigate_type.c
+/** \file view3d_gizmo_navigate_type.c
  *  \ingroup wm
  *
  * \name Custom Orientation/Navigation Manipulator for the 3D View
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
index d102fdc6e04..c29b07e4147 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_ruler.c
+/** \file blender/editors/space_view3d/view3d_gizmo_ruler.c
  *  \ingroup spview3d
  */
 
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 3e132192875..45055eb1225 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -46,8 +46,8 @@ set(SRC
 	transform_conversions.c
 	transform_generics.c
 	transform_input.c
-	transform_manipulator_2d.c
-	transform_manipulator_3d.c
+	transform_gizmo_2d.c
+	transform_gizmo_3d.c
 	transform_ops.c
 	transform_orientations.c
 	transform_snap.c
diff --git a/source/blender/editors/transform/transform_manipulator_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c
index fd6e7ed5442..5d5d55de848 100644
--- a/source/blender/editors/transform/transform_manipulator_2d.c
+++ b/source/blender/editors/transform/transform_gizmo_2d.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/transform/transform_manipulator_2d.c
+/** \file blender/editors/transform/transform_gizmo_2d.c
  *  \ingroup edtransform
  *
  * \name 2D Transform Manipulator
@@ -52,7 +52,7 @@
 #include "ED_image.h"
 #include "ED_screen.h"
 #include "ED_uvedit.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "transform.h" /* own include */
 
diff --git a/source/blender/editors/transform/transform_manipulator_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 7dc72ddff6f..1a30bd1cdcb 100644
--- a/source/blender/editors/transform/transform_manipulator_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/transform/transform_manipulator_3d.c
+/** \file blender/editors/transform/transform_gizmo_3d.c
  *  \ingroup edtransform
  *
  * \name 3D Transform Manipulator
@@ -74,7 +74,7 @@
 #include "ED_view3d.h"
 #include "ED_gpencil.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index fa21facefc2..97ea0da6007 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SRC
 	../include/ED_lattice.h
 	../include/ED_logic.h
 	../include/ED_markers.h
-	../include/ED_manipulator_library.h
+	../include/ED_gizmo_library.h
 	../include/ED_mask.h
 	../include/ED_mball.h
 	../include/ED_mesh.h
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 2288e6c8405..eb32a5fc6cb 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -92,7 +92,7 @@ set(DEFSRC
 	rna_userdef.c
 	rna_vfont.c
 	rna_wm.c
-	rna_wm_manipulator.c
+	rna_wm_gizmo.c
 	rna_workspace.c
 	rna_world.c
 )
@@ -121,7 +121,7 @@ set(APISRC
 	rna_ui_api.c
 	rna_vfont_api.c
 	rna_wm_api.c
-	rna_wm_manipulator_api.c
+	rna_wm_gizmo_api.c
 	rna_workspace_api.c
 )
 
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 4b06d917ab7..bb24452d67a 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3443,7 +3443,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
 	{"rna_userdef.c", NULL, RNA_def_userdef},
 	{"rna_vfont.c", "rna_vfont_api.c", RNA_def_vfont},
 	{"rna_wm.c", "rna_wm_api.c", RNA_def_wm},
-	{"rna_wm_manipulator.c", "rna_wm_manipulator_api.c", RNA_def_wm_manipulator},
+	{"rna_wm_gizmo.c", "rna_wm_gizmo_api.c", RNA_def_wm_manipulator},
 	{"rna_workspace.c", "rna_workspace_api.c", RNA_def_workspace},
 	{"rna_world.c", NULL, RNA_def_world},
 	{"rna_movieclip.c", NULL, RNA_def_movieclip},
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_gizmo.c
index f1abaa73e70..c2c4c95b83f 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/makesrna/intern/rna_wm_manipulator.c
+/** \file blender/makesrna/intern/rna_wm_gizmo.c
  *  \ingroup RNA
  */
 
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator_api.c b/source/blender/makesrna/intern/rna_wm_gizmo_api.c
index 16804042608..b06ba4d3dac 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator_api.c
+++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/makesrna/intern/rna_wm_manipulator_api.c
+/** \file blender/makesrna/intern/rna_wm_gizmo_api.c
  *  \ingroup RNA
  */
 
@@ -44,7 +44,7 @@
 #include "UI_interface.h"
 #include "BKE_context.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 static void rna_manipulator_draw_preset_box(
         wmManipulator *mpr, float matrix[16], int select_id)
@@ -242,7 +242,7 @@ void RNA_api_manipulator(StructRNA *srna)
 	/* Property API */
 
 	/* Define Properties */
-	/* note, 'target_set_handler' is defined in 'bpy_rna_manipulator.c' */
+	/* note, 'target_set_handler' is defined in 'bpy_rna_gizmo.c' */
 	func = RNA_def_function(srna, "target_set_prop", "rna_manipulator_target_set_prop");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	RNA_def_function_ui_description(func, "");
@@ -270,7 +270,7 @@ void RNA_api_manipulator(StructRNA *srna)
 	RNA_def_function_return(func, parm);
 
 	/* Access Properties */
-	/* note, 'target_get', 'target_set' is defined in 'bpy_rna_manipulator.c' */
+	/* note, 'target_get', 'target_set' is defined in 'bpy_rna_gizmo.c' */
 	func = RNA_def_function(srna, "target_is_valid", "rna_manipulator_target_is_valid");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	parm = RNA_def_string(func, "property", NULL, 0, "", "Property identifier");
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index b3f4b4977bf..3255fb49667 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -66,7 +66,7 @@ set(SRC
 	bpy_intern_string.c
 	bpy_library_load.c
 	bpy_library_write.c
-	bpy_manipulator_wrap.c
+	bpy_gizmo_wrap.c
 	bpy_msgbus.c
 	bpy_operator.c
 	bpy_operator_wrap.c
@@ -78,7 +78,7 @@ set(SRC
 	bpy_rna_callback.c
 	bpy_rna_driver.c
 	bpy_rna_id_collection.c
-	bpy_rna_manipulator.c
+	bpy_rna_gizmo.c
 	bpy_traceback.c
 	bpy_utils_previews.c
 	bpy_utils_units.c
@@ -105,7 +105,7 @@ set(SRC
 	bpy_driver.h
 	bpy_intern_string.h
 	bpy_library.h
-	bpy_manipulator_wrap.h
+	bpy_gizmo_wrap.h
 	bpy_msgbus.h
 	bpy_operator.h
 	bpy_operator_wrap.h
@@ -116,7 +116,7 @@ set(SRC
 	bpy_rna_callback.h
 	bpy_rna_driver.h
 	bpy_rna_id_collection.h
-	bpy_rna_manipulator.h
+	bpy_rna_gizmo.h
 	bpy_traceback.h
 	bpy_utils_previews.h
 	bpy_utils_units.h
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 751625e378b..3083322d496 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -46,7 +46,7 @@
 #include "bpy_rna.h"
 #include "bpy_app.h"
 #include "bpy_rna_id_collection.h"
-#include "bpy_rna_manipulator.h"
+#include "bpy_rna_gizmo.h"
 #include "bpy_props.h"
 #include "bpy_library.h"
 #include "bpy_operator.h"
diff --git a/source/blender/python/intern/bpy_manipulator_wrap.c b/source/blender/python/intern/bpy_gizmo_wrap.c
index 3703ea92fa7..eda1f58a4cc 100644
--- a/source/blender/python/intern/bpy_manipulator_wrap.c
+++ b/source/blender/python/intern/bpy_gizmo_wrap.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_manipulator_wrap.c
+/** \file blender/python/intern/bpy_gizmo_wrap.c
  *  \ingroup pythonintern
  *
  * This file is so Python can define widget-group's that C can call into.
@@ -43,7 +43,7 @@
 
 #include "bpy_rna.h"
 #include "bpy_intern_string.h"
-#include "bpy_manipulator_wrap.h"  /* own include */
+#include "bpy_gizmo_wrap.h"  /* own include */
 
 /* we may want to add, but not now */
 
diff --git a/source/blender/python/intern/bpy_manipulator_wrap.h b/source/blender/python/intern/bpy_gizmo_wrap.h
index 3e415350228..71fa123d6ce 100644
--- a/source/blender/python/intern/bpy_manipulator_wrap.h
+++ b/source/blender/python/intern/bpy_gizmo_wrap.h
@@ -18,12 +18,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_manipulator_wrap.h
+/** \file blender/python/intern/bpy_gizmo_wrap.h
  *  \ingroup pythonintern
  */
 
-#ifndef __BPY_MANIPULATOR_WRAP_H__
-#define __BPY_MANIPULATOR_WRAP_H__
+#ifndef __BPY_GIZMO_WRAP_H__
+#define __BPY_GIZMO_WRAP_H__
 
 struct wmManipulatorType;
 struct wmManipulatorGroupType;
@@ -32,4 +32,4 @@ struct wmManipulatorGroupType;
 void BPY_RNA_manipulator_wrapper(struct wmManipulatorType *wt, void *userdata);
 void BPY_RNA_manipulatorgroup_wrapper(struct wmManipulatorGroupType *wgt, void *userdata);
 
-#endif  /* __BPY_MANIPULATOR_WRAP_H__ */
+#endif  /* __BPY_GIZMO_WRAP_H__ */
diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c
index b76ecafe6f0..101cc8b41a3 100644
--- a/source/blender/python/intern/bpy_msgbus.c
+++ b/source/blender/python/intern/bpy_msgbus.c
@@ -44,7 +44,7 @@
 #include "bpy_capi_utils.h"
 #include "bpy_rna.h"
 #include "bpy_intern_string.h"
-#include "bpy_manipulator_wrap.h"  /* own include */
+#include "bpy_gizmo_wrap.h"  /* own include */
 
 
 #include "bpy_msgbus.h"  /* own include */
diff --git a/source/blender/python/intern/bpy_rna_manipulator.c b/source/blender/python/intern/bpy_rna_gizmo.c
index 950f7f98be0..34a4594bdae 100644
--- a/source/blender/python/intern/bpy_rna_manipulator.c
+++ b/source/blender/python/intern/bpy_rna_gizmo.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_rna_manipulator.c
+/** \file blender/python/intern/bpy_rna_gizmo.c
  *  \ingroup pythonintern
  *
  * .
@@ -38,7 +38,7 @@
 #include "WM_types.h"
 
 #include "bpy_capi_utils.h"
-#include "bpy_rna_manipulator.h"
+#include "bpy_rna_gizmo.h"
 
 #include "../generic/py_capi_utils.h"
 #include "../generic/python_utildefines.h"
diff --git a/source/blender/python/intern/bpy_rna_manipulator.h b/source/blender/python/intern/bpy_rna_gizmo.h
index b6f3a2e651d..e848fd9800f 100644
--- a/source/blender/python/intern/bpy_rna_manipulator.h
+++ b/source/blender/python/intern/bpy_rna_gizmo.h
@@ -20,13 +20,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_rna_manipulator.h
+/** \file blender/python/intern/bpy_rna_gizmo.h
  *  \ingroup pythonintern
  */
 
-#ifndef __BPY_RNA_MANIPULATOR_H__
-#define __BPY_RNA_MANIPULATOR_H__
+#ifndef __BPY_RNA_GIZMO_H__
+#define __BPY_RNA_GIZMO_H__
 
 int BPY_rna_manipulator_module(PyObject *);
 
-#endif  /* __BPY_RNA_MANIPULATOR_H__ */
+#endif  /* __BPY_RNA_GIZMO_H__ */
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 67674dae4f3..edf76364503 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -25,8 +25,8 @@
 
 set(INC
 	.
-	manipulators
-	manipulators/intern
+	gizmo
+	gizmo/intern
 	../blenfont
 	../blenkernel
 	../blenlib
@@ -79,12 +79,12 @@ set(SRC
 	intern/wm_tooltip.c
 	intern/wm_uilist_type.c
 	intern/wm_window.c
-	manipulators/intern/wm_manipulator.c
-	manipulators/intern/wm_manipulator_group.c
-	manipulators/intern/wm_manipulator_group_type.c
-	manipulators/intern/wm_manipulator_map.c
-	manipulators/intern/wm_manipulator_target_props.c
-	manipulators/intern/wm_manipulator_type.c
+	gizmo/intern/wm_gizmo.c
+	gizmo/intern/wm_gizmo_group.c
+	gizmo/intern/wm_gizmo_group_type.c
+	gizmo/intern/wm_gizmo_map.c
+	gizmo/intern/wm_gizmo_target_props.c
+	gizmo/intern/wm_gizmo_type.c
 	message_bus/intern/wm_message_bus.c
 	message_bus/intern/wm_message_bus_rna.c
 	message_bus/intern/wm_message_bus_static.c
@@ -100,11 +100,11 @@ set(SRC
 	wm_event_types.h
 	wm_files.h
 	wm_window.h
-	manipulators/WM_manipulator_api.h
-	manipulators/WM_manipulator_types.h
-	manipulators/wm_manipulator_fn.h
-	manipulators/wm_manipulator_wmapi.h
-	manipulators/intern/wm_manipulator_intern.h
+	gizmo/WM_gizmo_api.h
+	gizmo/WM_gizmo_types.h
+	gizmo/wm_gizmo_fn.h
+	gizmo/wm_gizmo_wmapi.h
+	gizmo/intern/wm_gizmo_intern.h
 	message_bus/intern/wm_message_bus_intern.h
 	message_bus/wm_message_bus.h
 )
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 8b7633b635b..486eae0a0ed 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -121,10 +121,10 @@ struct ImBuf;
 /* exported types for WM */
 #include "wm_cursors.h"
 #include "wm_event_types.h"
-#include "manipulators/WM_manipulator_types.h"
+#include "gizmo/WM_gizmo_types.h"
 
 /* Include external manipulator API's */
-#include "manipulators/WM_manipulator_api.h"
+#include "gizmo/WM_gizmo_api.h"
 
 /* ************** wmOperatorType ************************ */
 
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index b88956ac28d..ffd18af496e 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_api.h
+/** \file blender/windowmanager/gizmos/WM_gizmo_api.h
  *  \ingroup wm
  *
  * \name Manipulator API
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_API_H__
-#define __WM_MANIPULATOR_API_H__
+#ifndef __WM_GIZMO_API_H__
+#define __WM_GIZMO_API_H__
 
 struct ARegion;
 struct GHashIterator;
@@ -54,7 +54,7 @@ struct wmManipulatorMapType_Params;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
@@ -340,4 +340,4 @@ bool WM_manipulator_context_check_drawstep(const struct bContext *C, eWM_Manipul
 
 bool WM_manipulator_group_type_poll(const struct bContext *C, const struct wmManipulatorGroupType *wgt);
 
-#endif  /* __WM_MANIPULATOR_API_H__ */
+#endif  /* __WM_GIZMO_API_H__ */
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
index ee2f833858a..0f6af6db24c 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_types.h
+/** \file blender/windowmanager/gizmo/WM_gizmo_types.h
  *  \ingroup wm
  *
  * \name Manipulator Types
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_TYPES_H__
-#define __WM_MANIPULATOR_TYPES_H__
+#ifndef __WM_GIZMO_TYPES_H__
+#define __WM_GIZMO_TYPES_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -148,7 +148,7 @@ typedef enum {
 	WM_MANIPULATOR_TWEAK_SNAP = (1 << 1),
 } eWM_ManipulatorTweak;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 typedef struct wmManipulatorOpElem {
 	struct wmOperatorType *type;
@@ -419,4 +419,4 @@ typedef enum eWM_ManipulatorMapDrawStep {
 } eWM_ManipulatorMapDrawStep;
 #define WM_MANIPULATORMAP_DRAWSTEP_MAX 2
 
-#endif  /* __WM_MANIPULATOR_TYPES_H__ */
+#endif  /* __WM_GIZMO_TYPES_H__ */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c
index d6eb110dca0..bef193f6c56 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo.c
  *  \ingroup wm
  */
 
@@ -63,8 +63,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 static void wm_manipulator_register(
         wmManipulatorGroup *mgroup, wmManipulator *mpr);
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 8bda9e91db7..83af1a71163 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group.c
  *  \ingroup wm
  *
  * \name Manipulator-Group
@@ -57,8 +57,8 @@
 #include "ED_undo.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
index b32eb84e289..f93beb0ac9f 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
  *  \ingroup wm
  */
 
@@ -40,8 +40,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name ManipulatorGroup Type Append
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index ecf4ffd2ac4..7a007a8a909 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -20,20 +20,20 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
  *  \ingroup wm
  */
 
 
-#ifndef __WM_MANIPULATOR_INTERN_H__
-#define __WM_MANIPULATOR_INTERN_H__
+#ifndef __WM_GIZMO_INTERN_H__
+#define __WM_GIZMO_INTERN_H__
 
 struct wmKeyConfig;
 struct wmManipulatorMap;
 struct ManipulatorGeomInfo;
 struct GHashIterator;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
index 2a3aa5df197..94db6b45887 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_map.c
  *  \ingroup wm
  */
 
@@ -57,8 +57,8 @@
 #include "DEG_depsgraph.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /**
  * Store all manipulator-maps here. Anyone who wants to register a manipulator for a certain
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
index 137e8f5639d..78d12e4e4ba 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
  *  \ingroup wm
  */
 
@@ -43,8 +43,8 @@
 #include "ED_view3d.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /* -------------------------------------------------------------------- */
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
index fd7f31db903..4f31afb5b56 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_type.c
  *  \ingroup wm
  */
 
@@ -48,8 +48,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name Manipulator Type Append
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
index 305d04eab68..8d28febbd5d 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
@@ -18,14 +18,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_fn.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_fn.h
  *  \ingroup wm
  *
  * Callback function definitions, needed for both Types & API headers.
  */
 
-#ifndef __WM_MANIPULATOR_FN_H__
-#define __WM_MANIPULATOR_FN_H__
+#ifndef __WM_GIZMO_FN_H__
+#define __WM_GIZMO_FN_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -85,4 +85,4 @@ typedef struct wmManipulatorPropertyFnParams {
 	void *user_data;
 } wmManipulatorPropertyFnParams;
 
-#endif  /* __WM_MANIPULATOR_FN_H__ */
+#endif  /* __WM_GIZMO_FN_H__ */
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index a470c5c28ea..80418cbfeb3 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_wmapi.h
  *  \ingroup wm
  *
  * \name Manipulators Window Manager API
@@ -35,8 +35,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_WMAPI_H__
-#define __WM_MANIPULATOR_WMAPI_H__
+#ifndef __WM_GIZMO_WMAPI_H__
+#define __WM_GIZMO_WMAPI_H__
 
 struct wmEventHandler;
 struct wmManipulatorMap;
@@ -94,4 +94,4 @@ struct ListBase *wm_manipulatormap_groups_get(wmManipulatorMap *mmap);
 
 void wm_manipulatormaptypes_free(void);
 
-#endif  /* __WM_MANIPULATOR_WMAPI_H__ */
+#endif  /* __WM_GIZMO_WMAPI_H__ */
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index d17d5f7d157..04353b55334 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -35,7 +35,7 @@ struct ARegion;
 struct wmWindow;
 struct ReportList;
 
-#include "manipulators/wm_manipulator_wmapi.h"
+#include "gizmo/wm_gizmo_wmapi.h"
 
 typedef struct wmPaintCursor {
 	struct wmPaintCursor *next, *prev;