diff --git a/src/App/Datums.h b/src/App/Datums.h
index ec10f26222..8e3d567ea1 100644
--- a/src/App/Datums.h
+++ b/src/App/Datums.h
@@ -106,7 +106,7 @@ public:
     /// returns the type name of the ViewProvider
     const char* getViewProviderName() const override
     {
-        return "Gui::ViewProviderOrigin";
+        return "Gui::ViewProviderCoordinateSystem";
     }
 
     bool getCameraAlignmentDirection(Base::Vector3d& direction, const char* subname) const override;
diff --git a/src/App/Origin.h b/src/App/Origin.h
index 86bb46172f..9de0979fe7 100644
--- a/src/App/Origin.h
+++ b/src/App/Origin.h
@@ -45,7 +45,7 @@ public:
     /// returns the type name of the ViewProvider
     const char* getViewProviderName() const override
     {
-        return "Gui::ViewProviderOrigin";
+        return "Gui::ViewProviderCoordinateSystem";
     }
 
     bool isOrigin() override
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 6492e2b839..c11004fdfa 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -115,7 +115,7 @@
 #include "ViewProviderLink.h"
 #include "ViewProviderLinkPy.h"
 #include "ViewProviderMaterialObject.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 #include "ViewProviderDatum.h"
 #include "ViewProviderOriginGroup.h"
 #include "ViewProviderPlacement.h"
@@ -2077,7 +2077,7 @@ void Application::initTypes()
     Gui::ViewProviderGeoFeatureGroupPython      ::init();
     Gui::ViewProviderOriginGroup                ::init();
     Gui::ViewProviderPart                       ::init();
-    Gui::ViewProviderOrigin                     ::init();
+    Gui::ViewProviderCoordinateSystem           ::init();
     Gui::ViewProviderMaterialObject             ::init();
     Gui::ViewProviderMaterialObjectPython       ::init();
     Gui::ViewProviderTextDocument               ::init();
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index a62637ee30..feb0e60b77 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -968,7 +968,7 @@ SET(Viewprovider_CPP_SRCS
     ViewProviderGeoFeatureGroup.cpp
     ViewProviderOriginGroup.cpp
     ViewProviderPart.cpp
-    ViewProviderOrigin.cpp
+    ViewProviderCoordinateSystem.cpp
     ViewProviderMaterialObject.cpp
     ViewProviderTextDocument.cpp
     ViewProviderTextureExtension.cpp
@@ -1006,7 +1006,7 @@ SET(Viewprovider_SRCS
     ViewProviderGeoFeatureGroup.h
     ViewProviderOriginGroup.h
     ViewProviderPart.h
-    ViewProviderOrigin.h
+    ViewProviderCoordinateSystem.h
     ViewProviderMaterialObject.h
     ViewProviderTextDocument.h
     ViewProviderTextureExtension.h
diff --git a/src/Gui/ViewProviderOrigin.cpp b/src/Gui/ViewProviderCoordinateSystem.cpp
similarity index 84%
rename from src/Gui/ViewProviderOrigin.cpp
rename to src/Gui/ViewProviderCoordinateSystem.cpp
index 647bd52b79..15c686a023 100644
--- a/src/Gui/ViewProviderOrigin.cpp
+++ b/src/Gui/ViewProviderCoordinateSystem.cpp
@@ -33,7 +33,7 @@
 #include "Base/Console.h"
 #include <Base/Vector3D.h>
 
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 #include "Application.h"
 #include "Command.h"
 #include "Document.h"
@@ -45,12 +45,12 @@
 using namespace Gui;
 
 
-PROPERTY_SOURCE(Gui::ViewProviderOrigin, Gui::ViewProviderGeoFeatureGroup)
+PROPERTY_SOURCE(Gui::ViewProviderCoordinateSystem, Gui::ViewProviderGeoFeatureGroup)
 
 /**
  * Creates the view provider for an object group.
  */
-ViewProviderOrigin::ViewProviderOrigin()
+ViewProviderCoordinateSystem::ViewProviderCoordinateSystem()
 {
     sPixmap = "Std_CoordinateSystem";
     Visibility.setValue(false);
@@ -63,39 +63,39 @@ ViewProviderOrigin::ViewProviderOrigin()
     pcRoot->insertChild(lm, 0);
 }
 
-ViewProviderOrigin::~ViewProviderOrigin() {
+ViewProviderCoordinateSystem::~ViewProviderCoordinateSystem() {
     pcGroupChildren->unref();
     pcGroupChildren = nullptr;
 }
 
-std::vector<App::DocumentObject*> ViewProviderOrigin::claimChildren() const
+std::vector<App::DocumentObject*> ViewProviderCoordinateSystem::claimChildren() const
 {
     return static_cast<App::Origin*>( getObject() )->OriginFeatures.getValues();
 }
 
-std::vector<App::DocumentObject*> ViewProviderOrigin::claimChildren3D() const {
+std::vector<App::DocumentObject*> ViewProviderCoordinateSystem::claimChildren3D() const {
     return claimChildren ();
 }
 
-void ViewProviderOrigin::attach(App::DocumentObject* pcObject)
+void ViewProviderCoordinateSystem::attach(App::DocumentObject* pcObject)
 {
     Gui::ViewProviderDocumentObject::attach(pcObject);
     addDisplayMaskMode(pcGroupChildren, "Base");
 }
 
-std::vector<std::string> ViewProviderOrigin::getDisplayModes() const
+std::vector<std::string> ViewProviderCoordinateSystem::getDisplayModes() const
 {
     return { "Base" };
 }
 
-void ViewProviderOrigin::setDisplayMode(const char* ModeName)
+void ViewProviderCoordinateSystem::setDisplayMode(const char* ModeName)
 {
     if (strcmp(ModeName, "Base") == 0)
         setDisplayMaskMode("Base");
     ViewProviderDocumentObject::setDisplayMode(ModeName);
 }
 
-void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
+void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane) {
     auto origin = static_cast<App::Origin*>( getObject() );
 
     bool saveState = tempVisMap.empty();
@@ -151,24 +151,24 @@ void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
 
 }
 
-void ViewProviderOrigin::resetTemporaryVisibility() {
+void ViewProviderCoordinateSystem::resetTemporaryVisibility() {
     for(std::pair<Gui::ViewProvider*, bool> pair : tempVisMap) {
         pair.first->setVisible(pair.second);
     }
     tempVisMap.clear ();
 }
 
-double ViewProviderOrigin::defaultSize()
+double ViewProviderCoordinateSystem::defaultSize()
 {
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
     return hGrp->GetFloat("DatumsSize", 25);
 }
 
-bool ViewProviderOrigin::isTemporaryVisibility() {
+bool ViewProviderCoordinateSystem::isTemporaryVisibility() {
     return !tempVisMap.empty();
 }
 
-void ViewProviderOrigin::updateData(const App::Property* prop) {
+void ViewProviderCoordinateSystem::updateData(const App::Property* prop) {
     auto* jcs = dynamic_cast<App::LocalCoordinateSystem*>(getObject());
     if(jcs) {
         if (prop == &jcs->Placement) {
@@ -178,7 +178,7 @@ void ViewProviderOrigin::updateData(const App::Property* prop) {
     ViewProviderDocumentObject::updateData(prop);
 }
 
-bool ViewProviderOrigin::onDelete(const std::vector<std::string> &) {
+bool ViewProviderCoordinateSystem::onDelete(const std::vector<std::string> &) {
     auto lcs = static_cast<App::LocalCoordinateSystem*>(getObject());
 
     auto origin = dynamic_cast<App::Origin*>(lcs);
diff --git a/src/Gui/ViewProviderOrigin.h b/src/Gui/ViewProviderCoordinateSystem.h
similarity index 93%
rename from src/Gui/ViewProviderOrigin.h
rename to src/Gui/ViewProviderCoordinateSystem.h
index 7145c2b842..02a392d4e1 100644
--- a/src/Gui/ViewProviderOrigin.h
+++ b/src/Gui/ViewProviderCoordinateSystem.h
@@ -33,15 +33,15 @@ namespace Gui {
 
 class Document;
 
-class GuiExport ViewProviderOrigin : public ViewProviderGeoFeatureGroup
+class GuiExport ViewProviderCoordinateSystem : public ViewProviderGeoFeatureGroup
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOrigin);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderCoordinateSystem);
 
 public:
     /// constructor.
-    ViewProviderOrigin();
+    ViewProviderCoordinateSystem();
     /// destructor.
-    ~ViewProviderOrigin() override;
+    ~ViewProviderCoordinateSystem() override;
 
     /// @name Override methods
     ///@{
diff --git a/src/Gui/ViewProviderDatum.cpp b/src/Gui/ViewProviderDatum.cpp
index 3112ddab45..8195d9c242 100644
--- a/src/Gui/ViewProviderDatum.cpp
+++ b/src/Gui/ViewProviderDatum.cpp
@@ -40,7 +40,7 @@
 #include "ViewProviderDatum.h"
 #include "Inventor/SoAxisCrossKit.h"
 #include "SoFCSelection.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 
 
 using namespace Gui;
@@ -49,7 +49,7 @@ PROPERTY_SOURCE(Gui::ViewProviderDatum, Gui::ViewProviderGeometryObject)
 
 ViewProviderDatum::ViewProviderDatum() {
     // Set default color for origin (light-blue)
-    ShapeAppearance.setDiffuseColor(ViewProviderOrigin::defaultColor);
+    ShapeAppearance.setDiffuseColor(ViewProviderCoordinateSystem::defaultColor);
     Transparency.setValue(0);
     BoundingBox.setStatus(App::Property::Hidden, true); // Hide Boundingbox from the user due to it doesn't make sense
 
@@ -78,7 +78,7 @@ void ViewProviderDatum::attach(App::DocumentObject* pcObject)
 {
     ViewProviderGeometryObject::attach(pcObject);
 
-    float defaultSz = ViewProviderOrigin::defaultSize();
+    float defaultSz = ViewProviderCoordinateSystem::defaultSize();
 
     // Create an external separator
     auto sep = new SoSeparator();
diff --git a/src/Gui/ViewProviderLine.cpp b/src/Gui/ViewProviderLine.cpp
index 042bff7f38..a3d99cf640 100644
--- a/src/Gui/ViewProviderLine.cpp
+++ b/src/Gui/ViewProviderLine.cpp
@@ -37,7 +37,7 @@
 #include <Gui/ViewParams.h>
 
 #include "ViewProviderLine.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 
 
 using namespace Gui;
@@ -79,7 +79,7 @@ void ViewProviderLine::attach(App::DocumentObject *obj) {
         noRole = true;
     }
 
-    static const float size = ViewProviderOrigin::defaultSize();
+    static const float size = ViewProviderCoordinateSystem::defaultSize();
 
     SbVec3f verts[2];
     if (noRole) {
diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp
index 9fbe4d4504..25478d949f 100644
--- a/src/Gui/ViewProviderOriginGroupExtension.cpp
+++ b/src/Gui/ViewProviderOriginGroupExtension.cpp
@@ -38,7 +38,7 @@
 #include "Document.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 #include "ViewProviderDatum.h"
 
 
diff --git a/src/Gui/ViewProviderPlane.cpp b/src/Gui/ViewProviderPlane.cpp
index df92e14a93..7c567e4505 100644
--- a/src/Gui/ViewProviderPlane.cpp
+++ b/src/Gui/ViewProviderPlane.cpp
@@ -41,7 +41,7 @@
 #include <Gui/ViewParams.h>
 
 #include "ViewProviderPlane.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 
 
 using namespace Gui;
@@ -92,7 +92,7 @@ void ViewProviderPlane::attach(App::DocumentObject * obj) {
         noRole = true;
     }
 
-    static const float size = ViewProviderOrigin::defaultSize() * 0.6; //NOLINT
+    static const float size = ViewProviderCoordinateSystem::defaultSize() * 0.6; //NOLINT
     static const float startSize = 0.25 * size; //NOLINT
 
 
diff --git a/src/Gui/ViewProviderPoint.cpp b/src/Gui/ViewProviderPoint.cpp
index c8646495fd..edcde69726 100644
--- a/src/Gui/ViewProviderPoint.cpp
+++ b/src/Gui/ViewProviderPoint.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include "ViewProviderPoint.h"
-#include "ViewProviderOrigin.h"
+#include "ViewProviderCoordinateSystem.h"
 
 using namespace Gui;
 
diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
index c72fb4fe53..93132894f2 100644
--- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
+++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
@@ -37,7 +37,7 @@
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Control.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/ShapeBinder.h>
 #include <Mod/PartDesign/App/DatumLine.h>
@@ -157,7 +157,7 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
     for (const auto& originPair : originVisStatus) {
         const auto& origin = originPair.first;
 
-        Gui::ViewProviderOrigin* vpo = static_cast<Gui::ViewProviderOrigin*>(
+        Gui::ViewProviderCoordinateSystem* vpo = static_cast<Gui::ViewProviderCoordinateSystem*>(
             Gui::Application::Instance->getViewProvider(origin));
         if (vpo) {
             vpo->setTemporaryVisibility(originVisStatus[origin][axisBit],
@@ -175,7 +175,7 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
 
 TaskFeaturePick::~TaskFeaturePick()
 {
-    for (Gui::ViewProviderOrigin* vpo : origins) {
+    for (Gui::ViewProviderCoordinateSystem* vpo : origins) {
         vpo->resetTemporaryVisibility();
     }
 }
@@ -573,7 +573,7 @@ void TaskFeaturePick::onDoubleClick(QListWidgetItem* item)
 
 void TaskFeaturePick::slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj)
 {
-    std::vector<Gui::ViewProviderOrigin*>::iterator it;
+    std::vector<Gui::ViewProviderCoordinateSystem*>::iterator it;
     it = std::find(origins.begin(), origins.end(), &Obj);
     if (it != origins.end()) {
         origins.erase(it);
diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h
index 23734959d1..84139fb96d 100644
--- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h
+++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h
@@ -30,7 +30,7 @@
 #include <Gui/DocumentObserver.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 
 
 namespace PartDesignGui {
@@ -87,7 +87,7 @@ protected:
 private:
     std::unique_ptr<Ui_TaskFeaturePick> ui;
     QWidget* proxy;
-    std::vector<Gui::ViewProviderOrigin*> origins;
+    std::vector<Gui::ViewProviderCoordinateSystem*> origins;
     bool doSelection;
     std::string documentName;
 
diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
index 75d8b2c1a6..e1b4b9aa2b 100644
--- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
@@ -33,7 +33,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/WaitCursor.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureHelix.h>
 
@@ -171,8 +171,8 @@ void TaskHelixParameters::showCoordinateAxes()
     if (PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject())) {
         try {
             App::Origin* origin = body->getOrigin();
-            ViewProviderOrigin* vpOrigin;
-            vpOrigin = static_cast<ViewProviderOrigin*>(
+            ViewProviderCoordinateSystem* vpOrigin;
+            vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->setTemporaryVisibility(true, false);
         }
@@ -582,8 +582,8 @@ TaskHelixParameters::~TaskHelixParameters()
         PartDesign::Body* body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr;
         if (body) {
             App::Origin* origin = body->getOrigin();
-            ViewProviderOrigin* vpOrigin {};
-            vpOrigin = static_cast<ViewProviderOrigin*>(
+            ViewProviderCoordinateSystem* vpOrigin {};
+            vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->resetTemporaryVisibility();
         }
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
index e8c5ce071f..68fbfaca3d 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
@@ -35,7 +35,7 @@
 #include <Gui/Application.h>
 #include <Gui/Selection.h>
 #include <Gui/Command.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/DatumLine.h>
 #include <Mod/PartDesign/App/DatumPlane.h>
@@ -109,7 +109,7 @@ void TaskLinearPatternParameters::setupParameterUI(QWidget* widget)
     if (body) {
         try {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->setTemporaryVisibility(true, false);
         }
@@ -394,7 +394,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters()
         PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
         if (body) {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->resetTemporaryVisibility();
         }
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
index aa162d0116..c9d7d1314a 100644
--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
@@ -34,7 +34,7 @@
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureMirrored.h>
 
@@ -90,7 +90,7 @@ void TaskMirroredParameters::setupParameterUI(QWidget* widget)
     if (body) {
         try {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->setTemporaryVisibility(false, true);
         }
@@ -225,7 +225,7 @@ TaskMirroredParameters::~TaskMirroredParameters()
         PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
         if (body) {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->resetTemporaryVisibility();
         }
diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
index c77fdfd8be..71eee1f4ff 100644
--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
@@ -41,7 +41,7 @@
 #include <Base/Console.h>
 #include <Gui/Selection.h>
 #include <Gui/Command.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/FeaturePolarPattern.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/PartDesign/App/DatumLine.h>
@@ -111,7 +111,7 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget* widget)
     if (body) {
         try {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->setTemporaryVisibility(true, false);
         }
@@ -388,7 +388,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters()
         PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
         if (body) {
             App::Origin* origin = body->getOrigin();
-            auto vpOrigin = static_cast<ViewProviderOrigin*>(
+            auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->resetTemporaryVisibility();
         }
diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
index f61dd922dd..306f84818a 100644
--- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
@@ -35,7 +35,7 @@
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeaturePrimitive.h>
 
@@ -260,8 +260,8 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
     if(PartDesign::Body * body = PartDesign::Body::findBodyOf(getObject())) {
         try {
             App::Origin *origin = body->getOrigin();
-            Gui::ViewProviderOrigin* vpOrigin {};
-            vpOrigin = static_cast<Gui::ViewProviderOrigin*>(Gui::Application::Instance->getViewProvider(origin));
+            Gui::ViewProviderCoordinateSystem* vpOrigin {};
+            vpOrigin = static_cast<Gui::ViewProviderCoordinateSystem*>(Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->setTemporaryVisibility(true, true);
         } catch (const Base::Exception &ex) {
             Base::Console().Error ("%s\n", ex.what () );
@@ -380,8 +380,8 @@ TaskBoxPrimitives::~TaskBoxPrimitives()
         auto obj = getObject();
         if (PartDesign::Body* body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr) {
             App::Origin* origin = body->getOrigin();
-            Gui::ViewProviderOrigin* vpOrigin;
-            vpOrigin = static_cast<Gui::ViewProviderOrigin*>(
+            Gui::ViewProviderCoordinateSystem* vpOrigin;
+            vpOrigin = static_cast<Gui::ViewProviderCoordinateSystem*>(
                 Gui::Application::Instance->getViewProvider(origin));
             vpOrigin->resetTemporaryVisibility();
         }
diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
index 9fb29e7f28..2ba59e549b 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
@@ -32,7 +32,7 @@
 #include <Gui/CommandT.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/FeatureRevolution.h>
 #include <Mod/PartDesign/App/FeatureGroove.h>
 #include <Mod/PartDesign/App/Body.h>
@@ -108,13 +108,13 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider*
     }
 }
 
-Gui::ViewProviderOrigin* TaskRevolutionParameters::getOriginView() const
+Gui::ViewProviderCoordinateSystem* TaskRevolutionParameters::getOriginView() const
 {
     // show the parts coordinate system axis for selection
     PartDesign::Body * body = PartDesign::Body::findBodyOf(getObject());
     if (body) {
         App::Origin *origin = body->getOrigin();
-        return dynamic_cast<ViewProviderOrigin*>(
+        return dynamic_cast<ViewProviderCoordinateSystem*>(
             Gui::Application::Instance->getViewProvider(origin));
      }
 
diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
index 87df41a7c5..d98de4eccd 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
@@ -36,7 +36,7 @@ class Property;
 
 namespace Gui {
 class ViewProvider;
-class ViewProviderOrigin;
+class ViewProviderCoordinateSystem;
 }
 
 namespace PartDesignGui {
@@ -105,7 +105,7 @@ private:
     // TODO: This is common with extrude. Maybe send to superclass.
     void translateFaceName();
     void clearFaceName();
-    Gui::ViewProviderOrigin* getOriginView() const;
+    Gui::ViewProviderCoordinateSystem* getOriginView() const;
 
 private:
     std::unique_ptr<Ui_TaskRevolutionParameters> ui;
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 392a8748b5..c6f3287cea 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -42,7 +42,7 @@
 #include <Gui/MDIView.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Gui/ViewProviderDatum.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/DatumCS.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
index f5449bfcd8..78b0c22749 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
@@ -48,7 +48,7 @@
 #include <Gui/Control.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/ViewProviderOrigin.h>
+#include <Gui/ViewProviderCoordinateSystem.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/DatumCS.h>
 #include <Mod/PartDesign/App/DatumLine.h>
@@ -66,7 +66,7 @@ using namespace PartDesignGui;
 PROPERTY_SOURCE_WITH_EXTENSIONS(PartDesignGui::ViewProviderDatum,Gui::ViewProviderGeometryObject)
 
 // static data
-const double ViewProviderDatum::defaultSize = Gui::ViewProviderOrigin::defaultSize ();
+const double ViewProviderDatum::defaultSize = Gui::ViewProviderCoordinateSystem::defaultSize ();
 
 ViewProviderDatum::ViewProviderDatum()
 {