diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp
index 07e2a3ba3b..016f1d8e35 100644
--- a/src/Mod/Points/Gui/Command.cpp
+++ b/src/Mod/Points/Gui/Command.cpp
@@ -310,7 +310,7 @@ void CmdPointsPolyCut::activated(int iMsg)
         if (it == docObj.begin()) {
             Gui::Document* doc = getActiveGuiDocument();
             Gui::MDIView* view = doc->getActiveView();
-            if (view->getTypeId().isDerivedFrom(Gui::View3DInventor::getClassTypeId())) {
+            if (view->isDerivedFrom<Gui::View3DInventor>()) {
                 Gui::View3DInventorViewer* viewer = ((Gui::View3DInventor*)view)->getViewer();
                 viewer->setEditing(true);
                 viewer->startSelection(Gui::View3DInventorViewer::Lasso);
@@ -427,7 +427,7 @@ void CmdPointsStructure::activated(int iMsg)
         output->Label.setValue(name);
 
         // Already sorted, so just make a copy
-        if (it->getTypeId().isDerivedFrom(Points::Structured::getClassTypeId())) {
+        if (it->isDerivedFrom<Points::Structured>()) {
             Points::Structured* input = static_cast<Points::Structured*>(it);
 
             Points::PointKernel* kernel = output->Points.startEditing();
diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp
index 4f6fc004e6..b90e8fe7f0 100644
--- a/src/Mod/Points/Gui/ViewProvider.cpp
+++ b/src/Mod/Points/Gui/ViewProvider.cpp
@@ -426,20 +426,20 @@ void ViewProviderScattered::attach(App::DocumentObject* pcObj)
 void ViewProviderScattered::updateData(const App::Property* prop)
 {
     ViewProviderPoints::updateData(prop);
-    if (prop->getTypeId() == Points::PropertyPointKernel::getClassTypeId()) {
+    if (prop->is<Points::PropertyPointKernel>()) {
         ViewProviderPointsBuilder builder;
         builder.createPoints(prop, pcPointsCoord, pcPoints);
 
         // The number of points might have changed, so force also a resize of the Inventor internals
         setActiveMode();
     }
-    else if (prop->getTypeId() == Points::PropertyNormalList::getClassTypeId()) {
+    else if (prop->is<Points::PropertyNormalList>()) {
         setActiveMode();
     }
-    else if (prop->getTypeId() == Points::PropertyGreyValueList::getClassTypeId()) {
+    else if (prop->is<Points::PropertyGreyValueList>()) {
         setActiveMode();
     }
-    else if (prop->getTypeId() == App::PropertyColorList::getClassTypeId()) {
+    else if (prop->is<App::PropertyColorList>()) {
         setActiveMode();
     }
 }
@@ -598,7 +598,7 @@ void ViewProviderStructured::attach(App::DocumentObject* pcObj)
 void ViewProviderStructured::updateData(const App::Property* prop)
 {
     ViewProviderPoints::updateData(prop);
-    if (prop->getTypeId() == Points::PropertyPointKernel::getClassTypeId()) {
+    if (prop->is<Points::PropertyPointKernel>()) {
         ViewProviderPointsBuilder builder;
         builder.createPoints(prop, pcPointsCoord, pcPoints);