diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt
index 38bfac0e23..fcacf432b2 100644
--- a/src/Mod/Path/CMakeLists.txt
+++ b/src/Mod/Path/CMakeLists.txt
@@ -19,7 +19,6 @@ INSTALL(
 SET(PathScripts_SRCS
     PathCommands.py
     PathScripts/PathAreaOp.py
-    PathScripts/PathAreaOpGui.py
     PathScripts/PathArray.py
     PathScripts/PathComment.py
     PathScripts/PathCompoundExtended.py
@@ -48,6 +47,7 @@ SET(PathScripts_SRCS
     PathScripts/PathMillFace.py
     PathScripts/PathMillFaceGui.py
     PathScripts/PathOp.py
+    PathScripts/PathOpGui.py
     PathScripts/PathPlane.py
     PathScripts/PathPocket.py
     PathScripts/PathPocketBaseGui.py
diff --git a/src/Mod/Path/PathScripts/PathMillFaceGui.py b/src/Mod/Path/PathScripts/PathMillFaceGui.py
index 81968baa2d..9484d89d9c 100644
--- a/src/Mod/Path/PathScripts/PathMillFaceGui.py
+++ b/src/Mod/Path/PathScripts/PathMillFaceGui.py
@@ -24,8 +24,8 @@
 
 import FreeCAD
 import FreeCADGui
-import PathScripts.PathAreaOpGui as PathAreaOpGui
 import PathScripts.PathMillFace as PathMillFace
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathPocketBaseGui as PathPocketBaseGui
 
 from PySide import QtCore
@@ -35,7 +35,7 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage):
     def pocketFeatures(self):
         return PathPocketBaseGui.FeatureFacing
 
-PathAreaOpGui.SetupOperation('MillFace',
+PathOpGui.SetupOperation('MillFace',
         PathMillFace.Create,
         TaskPanelOpPage,
         'Path-Face',
diff --git a/src/Mod/Path/PathScripts/PathAreaOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py
similarity index 99%
rename from src/Mod/Path/PathScripts/PathAreaOpGui.py
rename to src/Mod/Path/PathScripts/PathOpGui.py
index be7d5dd948..bc39cb3540 100644
--- a/src/Mod/Path/PathScripts/PathAreaOpGui.py
+++ b/src/Mod/Path/PathScripts/PathOpGui.py
@@ -542,4 +542,4 @@ def SetupOperation(name,
 
 FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint())
 
-FreeCAD.Console.PrintLog("Loading PathAreaOpGui... done\n")
+FreeCAD.Console.PrintLog("Loading PathOpGui... done\n")
diff --git a/src/Mod/Path/PathScripts/PathPocketBaseGui.py b/src/Mod/Path/PathScripts/PathPocketBaseGui.py
index a71e35df5e..c12a53b26f 100644
--- a/src/Mod/Path/PathScripts/PathPocketBaseGui.py
+++ b/src/Mod/Path/PathScripts/PathPocketBaseGui.py
@@ -24,8 +24,8 @@
 
 import FreeCAD
 import FreeCADGui
-import PathScripts.PathAreaOpGui as PathAreaOpGui
 import PathScripts.PathLog as PathLog
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathPocket as PathPocket
 import PathScripts.PathSelection as PathSelection
 
@@ -38,7 +38,7 @@ def translate(context, text, disambig=None):
 FeaturePocket = 0x01
 FeatureFacing = 0x02
 
-class TaskPanelOpPage(PathAreaOpGui.TaskPanelPage):
+class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
     def getForm(self):
         form = FreeCADGui.PySideUic.loadUi(":/panels/PageOpPocketFullEdit.ui")
diff --git a/src/Mod/Path/PathScripts/PathPocketGui.py b/src/Mod/Path/PathScripts/PathPocketGui.py
index 6067e33693..04a2a57fa0 100644
--- a/src/Mod/Path/PathScripts/PathPocketGui.py
+++ b/src/Mod/Path/PathScripts/PathPocketGui.py
@@ -23,7 +23,7 @@
 # ***************************************************************************
 
 import FreeCAD
-import PathScripts.PathAreaOpGui as PathAreaOpGui
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathPocket as PathPocket
 import PathScripts.PathPocketBaseGui as PathPocketBaseGui
 
@@ -34,7 +34,7 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage):
     def pocketFeatures(self):
         return PathPocketBaseGui.FeaturePocket
 
-PathAreaOpGui.SetupOperation('Pocket',
+PathOpGui.SetupOperation('Pocket',
         PathPocket.Create,
         TaskPanelOpPage,
         'Path-Pocket',
diff --git a/src/Mod/Path/PathScripts/PathProfileBaseGui.py b/src/Mod/Path/PathScripts/PathProfileBaseGui.py
index 127bb5b411..9f0a21bba0 100644
--- a/src/Mod/Path/PathScripts/PathProfileBaseGui.py
+++ b/src/Mod/Path/PathScripts/PathProfileBaseGui.py
@@ -24,8 +24,8 @@
 
 import FreeCAD
 import FreeCADGui
-import PathScripts.PathAreaOpGui as PathAreaOpGui
 import PathScripts.PathLog as PathLog
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathProfileFaces as PathProfileFaces
 import PathScripts.PathSelection as PathSelection
 import PathScripts.PathUtils as PathUtils
@@ -38,7 +38,7 @@ def translate(context, text, disambig=None):
 FeatureSide       = 0x01
 FeatureProcessing = 0x02
 
-class TaskPanelOpPage(PathAreaOpGui.TaskPanelPage):
+class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
     def getForm(self):
         form = FreeCADGui.PySideUic.loadUi(":/panels/PageOpProfileFullEdit.ui")
diff --git a/src/Mod/Path/PathScripts/PathProfileContourGui.py b/src/Mod/Path/PathScripts/PathProfileContourGui.py
index 560c4deed9..667240e465 100644
--- a/src/Mod/Path/PathScripts/PathProfileContourGui.py
+++ b/src/Mod/Path/PathScripts/PathProfileContourGui.py
@@ -23,7 +23,7 @@
 # ***************************************************************************
 
 import FreeCAD
-import PathScripts.PathAreaOpGui as PathAreaOpGui
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathProfileBaseGui as PathProfileBaseGui
 import PathScripts.PathProfileContour as PathProfileContour
 
@@ -35,7 +35,7 @@ class TaskPanelOpPage(PathProfileBaseGui.TaskPanelOpPage):
         # I know this looks bad, contour is just the most basic profile op there is
         return 0
 
-PathAreaOpGui.SetupOperation('Contour',
+PathOpGui.SetupOperation('Contour',
         PathProfileContour.Create,
         TaskPanelOpPage,
         'Path-Contour',
diff --git a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py b/src/Mod/Path/PathScripts/PathProfileEdgesGui.py
index 66d3f06450..f7a84ce83e 100644
--- a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py
+++ b/src/Mod/Path/PathScripts/PathProfileEdgesGui.py
@@ -23,7 +23,7 @@
 # ***************************************************************************
 
 import FreeCAD
-import PathScripts.PathAreaOpGui as PathAreaOpGui
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathProfileBaseGui as PathProfileBaseGui
 import PathScripts.PathProfileEdges as PathProfileEdges
 
@@ -34,7 +34,7 @@ class TaskPanelOpPage(PathProfileBaseGui.TaskPanelOpPage):
     def profileFeatures(self):
         return PathProfileBaseGui.FeatureSide
 
-PathAreaOpGui.SetupOperation('Profile Edges',
+PathOpGui.SetupOperation('Profile Edges',
         PathProfileEdges.Create,
         TaskPanelOpPage,
         'Path-Profile',
diff --git a/src/Mod/Path/PathScripts/PathProfileFacesGui.py b/src/Mod/Path/PathScripts/PathProfileFacesGui.py
index c64182f2ff..cfb55fdea9 100644
--- a/src/Mod/Path/PathScripts/PathProfileFacesGui.py
+++ b/src/Mod/Path/PathScripts/PathProfileFacesGui.py
@@ -23,7 +23,7 @@
 # ***************************************************************************
 
 import FreeCAD
-import PathScripts.PathAreaOpGui as PathAreaOpGui
+import PathScripts.PathOpGui as PathOpGui
 import PathScripts.PathProfileBaseGui as PathProfileBaseGui
 import PathScripts.PathProfileFaces as PathProfileFaces
 
@@ -34,7 +34,7 @@ class TaskPanelOpPage(PathProfileBaseGui.TaskPanelOpPage):
     def profileFeatures(self):
         return PathProfileBaseGui.FeatureSide | PathProfileBaseGui.FeatureProcessing
 
-PathAreaOpGui.SetupOperation('Profile Faces',
+PathOpGui.SetupOperation('Profile Faces',
         PathProfileFaces.Create,
         TaskPanelOpPage,
         'Path-Profile',