diff --git a/src/Mod/Draft/draftguitools/gui_circulararray.py b/src/Mod/Draft/draftguitools/gui_circulararray.py
index cc229af358..153260b463 100644
--- a/src/Mod/Draft/draftguitools/gui_circulararray.py
+++ b/src/Mod/Draft/draftguitools/gui_circulararray.py
@@ -42,7 +42,7 @@ import draftutils.todo as todo
 bool(Draft_rc.__name__)
 
 
-class GuiCommandCircularArray(gui_base.GuiCommandBase):
+class CircularArray(gui_base.GuiCommandBase):
     """Gui command for the CircularArray tool."""
 
     def __init__(self):
@@ -139,4 +139,4 @@ class GuiCommandCircularArray(gui_base.GuiCommandBase):
             super().finish()
 
 
-Gui.addCommand('Draft_CircularArray', GuiCommandCircularArray())
+Gui.addCommand('Draft_CircularArray', CircularArray())
diff --git a/src/Mod/Draft/draftguitools/gui_orthoarray.py b/src/Mod/Draft/draftguitools/gui_orthoarray.py
index 07f8537dd7..4a0bb07640 100644
--- a/src/Mod/Draft/draftguitools/gui_orthoarray.py
+++ b/src/Mod/Draft/draftguitools/gui_orthoarray.py
@@ -42,7 +42,7 @@ import draftutils.todo as todo
 bool(Draft_rc.__name__)
 
 
-class GuiCommandOrthoArray(gui_base.GuiCommandBase):
+class OrthoArray(gui_base.GuiCommandBase):
     """Gui command for the OrthoArray tool."""
 
     def __init__(self):
@@ -126,4 +126,4 @@ class GuiCommandOrthoArray(gui_base.GuiCommandBase):
             super().finish()
 
 
-Gui.addCommand('Draft_OrthoArray', GuiCommandOrthoArray())
+Gui.addCommand('Draft_OrthoArray', OrthoArray())
diff --git a/src/Mod/Draft/draftguitools/gui_polararray.py b/src/Mod/Draft/draftguitools/gui_polararray.py
index f31ed2bf01..251f83ae96 100644
--- a/src/Mod/Draft/draftguitools/gui_polararray.py
+++ b/src/Mod/Draft/draftguitools/gui_polararray.py
@@ -42,7 +42,7 @@ import draftutils.todo as todo
 bool(Draft_rc.__name__)
 
 
-class GuiCommandPolarArray(gui_base.GuiCommandBase):
+class PolarArray(gui_base.GuiCommandBase):
     """Gui command for the PolarArray tool."""
 
     def __init__(self):
@@ -139,4 +139,4 @@ class GuiCommandPolarArray(gui_base.GuiCommandBase):
             super().finish()
 
 
-Gui.addCommand('Draft_PolarArray', GuiCommandPolarArray())
+Gui.addCommand('Draft_PolarArray', PolarArray())