diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index a322ff1b1cee..98e9439a687b 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans;
 //==========================================================================
 //--------------------------------------------------------------------------
 OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper)
-    :OPropertyContainer_Base(_rBHelper)
+    :OPropertySetHelper(_rBHelper)
 {
 }
 
@@ -66,7 +66,7 @@ Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException
 //--------------------------------------------------------------------------
 void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
-    OPropertyContainer_Base::setFastPropertyValue( nHandle, rValue );
+    OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
 }
 
 //--------------------------------------------------------------------------
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index a594b71e9ea2..9070a694b0d2 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -30,10 +30,6 @@ namespace comphelper
 {
 //.........................................................................
 
-//==========================================================================
-//= OPropertyContainer
-//==========================================================================
-typedef ::cppu::OPropertySetHelper OPropertyContainer_Base;
 /** a OPropertySetHelper implementation which is just a simple container for properties represented
     by class members, usually in a derived class.
     <BR>
@@ -42,7 +38,7 @@ typedef ::cppu::OPropertySetHelper OPropertyContainer_Base;
     values which already have the correct type, it's unable to convert, for instance, a long to a short.
 */
 class COMPHELPER_DLLPUBLIC OPropertyContainer
-            :public OPropertyContainer_Base
+            :public cppu::OPropertySetHelper
             ,public OPropertyContainerHelper
 {
 public:
@@ -70,7 +66,7 @@ protected:
                             throw (::com::sun::star::uno::Exception,
                                    std::exception);
 
-    using OPropertyContainer_Base::getFastPropertyValue;
+    using OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue(
                                 ::com::sun::star::uno::Any& rValue,
                                 sal_Int32 nHandle