diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 027d21878e19..1d55f53e8ded 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -39,7 +39,7 @@ protected:
 
     // The following method is called when a SvxShape object should be created.
     // Derived classes can create a derivation or an object aggregating SvxShape.
-    virtual css::uno::Reference< css::drawing::XShape >  _CreateShape( SdrObject *pObj ) const
+    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const
         throw (css::uno::RuntimeException, std::exception) override;
 
 public:
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 831a6d6e517f..808bba5b23f1 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
 
     // The following method is called if a SvxShape object is to be created.
     // Derived classes can create a derivation or an SvxShape aggregating object.
-    virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+    virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
         throw (css::uno::RuntimeException, std::exception);
 
     UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 532883037005..fa7127c4d9c2 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -33,7 +33,7 @@ namespace reportdesign
     protected:
         virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
             throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::drawing::XShape >  _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
     public:
         OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection);
         virtual ~OReportDrawPage() throw(){}
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 9dab4d8b2be9..1ce18f7c5fb9 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -55,12 +55,12 @@ SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XSha
     return SvxDrawPage::CreateSdrObject_( xDescr );
 }
 
-uno::Reference< drawing::XShape >  OReportDrawPage::_CreateShape( SdrObject *pObj ) const
+uno::Reference< drawing::XShape >  OReportDrawPage::CreateShape( SdrObject *pObj ) const
     throw (uno::RuntimeException, std::exception)
 {
     OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj);
     if ( !pBaseObj )
-        return SvxDrawPage::_CreateShape( pObj );
+        return SvxDrawPage::CreateShape( pObj );
 
     uno::Reference< report::XSection> xSection = m_xSection;
     uno::Reference< lang::XMultiServiceFactory> xFactory;
@@ -130,7 +130,7 @@ uno::Reference< drawing::XShape >  OReportDrawPage::_CreateShape( SdrObject *pOb
         }
 
         if ( !xShape.is() )
-            xShape.set( SvxDrawPage::_CreateShape( pObj ) );
+            xShape.set( SvxDrawPage::CreateShape( pObj ) );
 
         try
         {
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index ebf3b0a8142b..08f087ef145a 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -30,7 +30,7 @@ public:
     ScPageObj(SdrPage* pPage);
     virtual ~ScPageObj() throw();
 
-    virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
+    virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
         throw (css::uno::RuntimeException, std::exception) override;
 
                             // XServiceInfo
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 6ba7b31534cb..a1566c7d397c 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -33,10 +33,10 @@ ScPageObj::~ScPageObj() throw()
 {
 }
 
-uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const
+uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const
     throw (css::uno::RuntimeException, std::exception)
 {
-    uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj ));
+    uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj ));
 
     new ScShapeObj( xShape );       // aggregates object and modifies xShape
 
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index c741e586c849..b2f5b67cff77 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -108,7 +108,7 @@ public:
         throw (css::uno::RuntimeException, std::exception) override;
 
     // SvxFmDrawPage
-    virtual css::uno::Reference<css::drawing::XShape>  _CreateShape(SdrObject *pObj) const
+    virtual css::uno::Reference<css::drawing::XShape>  CreateShape(SdrObject *pObj) const
         throw (css::uno::RuntimeException, std::exception) override;
 
     // XInterface
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ea57ad8bacfd..1170d73bda57 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1408,11 +1408,11 @@ void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUSt
 {
 }
 
-Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape(SdrObject *pObj) const
+Reference< drawing::XShape >  SdGenericDrawPage::CreateShape(SdrObject *pObj) const
     throw (RuntimeException, std::exception)
 {
-    DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create shape for disposed page!" );
-    DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with pObj == 0!" );
+    DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" );
+    DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" );
 
     if (!pObj)
         return Reference< drawing::XShape >();
@@ -1452,7 +1452,7 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
         Reference< drawing::XShape >  xShape( pShape );
 
         if(!xShape.is())
-            xShape = SvxFmDrawPage::_CreateShape( pObj );
+            xShape = SvxFmDrawPage::CreateShape( pObj );
 
         if( eKind != PRESOBJ_NONE )
         {
@@ -1535,7 +1535,7 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
     }
     else
     {
-        return SvxFmDrawPage::_CreateShape( pObj );
+        return SvxFmDrawPage::CreateShape( pObj );
     }
 
 }
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index e2a12d9b3118..01aaed5f777e 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -79,7 +79,7 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw
 
 }
 
-css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
+css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::CreateShape( SdrObject *pObj ) const
     throw (css::uno::RuntimeException, std::exception)
 {
     if( FmFormInventor == pObj->GetObjInventor() )
@@ -88,7 +88,7 @@ css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::_CreateShape( SdrObj
         return xShape;
     }
     else
-        return SvxDrawPage::_CreateShape( pObj );
+        return SvxDrawPage::CreateShape( pObj );
 }
 
 // XFormsSupplier
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6ae45eb021b7..612855ee1ec6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2895,7 +2895,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape()
                 if( pDrawPage )
                 {
                     // create one
-                    xShape = pDrawPage->_CreateShape( this );
+                    xShape = pDrawPage->CreateShape( this );
                     impl_setUnoShape( xShape );
                 }
             }
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 70e98fd05c93..9e56776a7715 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -785,7 +785,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
         }
         default: // unknown inventor
         {
-            OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()");
+            OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::CreateShape()");
             break;
         }
     }
@@ -821,7 +821,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
     return pRet;
 }
 
-Reference< drawing::XShape >  SvxDrawPage::_CreateShape( SdrObject *pObj ) const
+Reference< drawing::XShape >  SvxDrawPage::CreateShape( SdrObject *pObj ) const
     throw (css::uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 21b4ba8b2d3a..fc79a53ea05e 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -64,7 +64,7 @@ public:
     // The following method is called when a SvxShape-object is to be created.
     // Derived classes may obtain at this point a derivation or an object
     // that is aggregating a SvxShape.
-    virtual css::uno::Reference< css::drawing::XShape >  _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
 };
 
 typedef cppu::WeakAggImplHelper4
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index cf724ef3e72a..6c83023b4a9c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -300,7 +300,7 @@ SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape
     return SvxFmDrawPage::CreateSdrObject_( xShape );
 }
 
-uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const
+uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const
     throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< drawing::XShape >  xRet;
@@ -336,7 +336,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
             }
             else
             {
-                OSL_FAIL( "<SwFmDrawPage::_CreateShape(..)> - could not retrieve type. Thus, no shape created." );
+                OSL_FAIL( "<SwFmDrawPage::CreateShape(..)> - could not retrieve type. Thus, no shape created." );
                 return xRet;
             }
         }
@@ -346,7 +346,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
         // own block - temporary object has to be destroyed before
         // the delegator is set #81670#
         {
-            xRet = SvxFmDrawPage::_CreateShape( pObj );
+            xRet = SvxFmDrawPage::CreateShape( pObj );
         }
         uno::Reference< XUnoTunnel > xShapeTunnel(xRet, uno::UNO_QUERY);
         //don't create an SwXShape if it already exists