diff --git a/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py b/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py
index fe7ae51d2a..39bf120298 100644
--- a/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py
+++ b/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py
@@ -44,8 +44,8 @@ class CommandMoveView:
         """Return a dictionary with data that will be used by the button or menu item."""
         return {'Pixmap': 'actions/TechDraw_MoveView.svg',
                 'Accel': "",
-                'MenuText': QT_TRANSLATE_NOOP("MoveView", "Move View"),
-                'ToolTip': QT_TRANSLATE_NOOP("MoveView", "Move a View to a new Page")}
+                'MenuText': QT_TRANSLATE_NOOP("TechDraw_MoveView", "Move View"),
+                'ToolTip': QT_TRANSLATE_NOOP("TechDraw_MoveView", "Move a View to a new Page")}
 
     def Activated(self):
         """Run the following code when the command is activated (button press)."""
diff --git a/src/Mod/TechDraw/TechDrawTools/CommandShareView.py b/src/Mod/TechDraw/TechDrawTools/CommandShareView.py
index 6c1799d2fb..2c4cb8b2c6 100644
--- a/src/Mod/TechDraw/TechDrawTools/CommandShareView.py
+++ b/src/Mod/TechDraw/TechDrawTools/CommandShareView.py
@@ -44,8 +44,8 @@ class CommandShareView:
         """Return a dictionary with data that will be used by the button or menu item."""
         return {'Pixmap': 'actions/TechDraw_ShareView.svg',
                 'Accel': "",
-                'MenuText': QT_TRANSLATE_NOOP("ShareView", "Share View"),
-                'ToolTip': QT_TRANSLATE_NOOP("ShareView", "Share a View on a second Page")}
+                'MenuText': QT_TRANSLATE_NOOP("TechDraw_ShareView", "Share View"),
+                'ToolTip': QT_TRANSLATE_NOOP("TechDraw_ShareView", "Share a View on a second Page")}
 
     def Activated(self):
         """Run the following code when the command is activated (button press)."""
diff --git a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
index 87f1d825aa..2a7361976a 100644
--- a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
+++ b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
@@ -44,7 +44,7 @@ class TaskMoveView:
         self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui")
         self.form = Gui.PySideUic.loadUi(self._uiPath)
 
-        self.form.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Move View to a different Page"))
+        self.form.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Move View to a different Page"))
 
         self.form.pbView.clicked.connect(self.pickView)
         self.form.pbFromPage.clicked.connect(self.pickFromPage)
@@ -71,8 +71,8 @@ class TaskMoveView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select View to move from list."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select View"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select View to move from list."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select View"))
 
         views = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawView")]
         for v in views:
@@ -90,8 +90,8 @@ class TaskMoveView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select From Page."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select Page"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select From Page."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select Page"))
 
         pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")]
         for p in pages:
@@ -109,8 +109,8 @@ class TaskMoveView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select To Page."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select Page"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select To Page."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_MoveView", "Select Page"))
 
         pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")]
         for p in pages:
diff --git a/src/Mod/TechDraw/TechDrawTools/TaskShareView.py b/src/Mod/TechDraw/TechDrawTools/TaskShareView.py
index e6289654e7..e32efda0ec 100644
--- a/src/Mod/TechDraw/TechDrawTools/TaskShareView.py
+++ b/src/Mod/TechDraw/TechDrawTools/TaskShareView.py
@@ -43,8 +43,8 @@ class TaskShareView:
         self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui")
         self.form = Gui.PySideUic.loadUi(self._uiPath)
 
-        self.form.setWindowTitle(QT_TRANSLATE_NOOP("ShareView", "Share View with another Page"))
-        self.form.lViewName.setText(QT_TRANSLATE_NOOP("ShareView", "View to share"))
+        self.form.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Share View with another Page"))
+        self.form.lViewName.setText(QT_TRANSLATE_NOOP("TechDraw_ShareView", "View to share"))
 
         self.form.pbView.clicked.connect(self.pickView)
         self.form.pbFromPage.clicked.connect(self.pickFromPage)
@@ -71,8 +71,8 @@ class TaskShareView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("ShareView", "Select View to share from list."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("ShareView", "Select View"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select View to share from list."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select View"))
 
         views = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawView")]
         for v in views:
@@ -90,8 +90,8 @@ class TaskShareView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("ShareView", "Select From Page."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("ShareView", "Select Page"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select From Page."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select Page"))
 
         pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")]
         for p in pages:
@@ -109,8 +109,8 @@ class TaskShareView:
         _dlgPath = App.getHomePath()
         _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
-        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("ShareView", "Select To Page."))
-        dlg.setWindowTitle(QT_TRANSLATE_NOOP("ShareView", "Select Page"))
+        dlg.lPrompt.setText(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select To Page."))
+        dlg.setWindowTitle(QT_TRANSLATE_NOOP("TechDraw_ShareView", "Select Page"))
 
         pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")]
         for p in pages: