diff --git a/include/osg/PolygonOffset b/include/osg/PolygonOffset
index 5ffdfe9dc..7e2d9852a 100644
--- a/include/osg/PolygonOffset
+++ b/include/osg/PolygonOffset
@@ -69,14 +69,14 @@ class OSG_EXPORT PolygonOffset : public StateAttribute
         static void setFactorMultiplier(float multiplier);
         static float getFactorMultiplier();
 
-        static void setUnitMultiplier(float multiplier);
-        static float getUnitMultiplier();
+        static void setUnitsMultiplier(float multiplier);
+        static float getUnitsMultiplier();
         
-        static bool areUnitAndMultipliersSet();
+        static bool areUnitsAndMultipliersSet();
         
         /** Checks with the OpenGL driver to try and pick multiplier approrpriate for the hardware.
             note, requires a valid graphics context to be current. */
-        static void setFactorAndUnitMultipliersUsingBestGuessForDriver();
+        static void setFactorAndUnitsMultipliersUsingBestGuessForDriver();
 
     protected :
 
diff --git a/src/osg/PolygonOffset.cpp b/src/osg/PolygonOffset.cpp
index 84222df61..7906650d8 100644
--- a/src/osg/PolygonOffset.cpp
+++ b/src/osg/PolygonOffset.cpp
@@ -17,7 +17,7 @@
 using namespace osg;
 
 static float s_FactorMultipler = 1.0f;
-static float s_UnitMultipler = 1.0f;
+static float s_UnitsMultipler = 1.0f;
 static bool s_MultiplerSet = false;
 
 void PolygonOffset::setFactorMultiplier(float multiplier)
@@ -31,24 +31,24 @@ float PolygonOffset::getFactorMultiplier()
     return s_FactorMultipler;
 }
 
-void PolygonOffset::setUnitMultiplier(float multiplier)
+void PolygonOffset::setUnitsMultiplier(float multiplier)
 {
     s_MultiplerSet = true;
-    s_UnitMultipler = multiplier;
+    s_UnitsMultipler = multiplier;
 }
 
-float PolygonOffset::getUnitMultiplier()
+float PolygonOffset::getUnitsMultiplier()
 {
-    return s_UnitMultipler;
+    return s_UnitsMultipler;
 }
 
-bool PolygonOffset::areUnitAndMultipliersSet()
+bool PolygonOffset::areUnitsAndMultipliersSet()
 {
     return s_MultiplerSet;
 }
 
 
-void PolygonOffset::setFactorAndUnitMultipliersUsingBestGuessForDriver()
+void PolygonOffset::setFactorAndUnitsMultipliersUsingBestGuessForDriver()
 {
     s_MultiplerSet = true;
     // osg::notify(osg::NOTICE)<<"PolygonOffset::setFactorAndUnitMultipliersUsingBestGuessForDriver()"<<std::endl;
@@ -60,8 +60,8 @@ void PolygonOffset::setFactorAndUnitMultipliersUsingBestGuessForDriver()
             (strstr((const char*)renderer,"RADEON")!=0))
         {
             setFactorMultiplier(1.0f);
-            setUnitMultiplier(128.0f);
-            osg::notify(osg::INFO)<<"PolygonOffset::setFactorAndUnitMultipliersUsingBestGuessForDriver() apply ATI workaround."<<std::endl;
+            setUnitsMultiplier(128.0f);
+            osg::notify(osg::INFO)<<"PolygonOffset::setFactorAndUnitsMultipliersUsingBestGuessForDriver() apply ATI workaround."<<std::endl;
         }
     }
 }
@@ -85,8 +85,8 @@ PolygonOffset::~PolygonOffset()
 
 void PolygonOffset::apply(State&) const
 {
-    if (!s_MultiplerSet) setFactorAndUnitMultipliersUsingBestGuessForDriver();
+    if (!s_MultiplerSet) setFactorAndUnitsMultipliersUsingBestGuessForDriver();
 
     glPolygonOffset(_factor * s_FactorMultipler, 
-                    _units * s_UnitMultipler);
+                    _units * s_UnitsMultipler);
 }
diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp
index bd1fb9fd3..16ac349ed 100644
--- a/src/osgProducer/ViewerEventHandler.cpp
+++ b/src/osgProducer/ViewerEventHandler.cpp
@@ -1107,14 +1107,14 @@ bool ViewerEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActio
 
             case '*' :
             {
-                osg::PolygonOffset::setUnitMultiplier(osg::PolygonOffset::getUnitMultiplier()*1.1f);
-                osg::notify(osg::NOTICE)<<"osg::PolygonOffset::getUnitMultiplier()="<<osg::PolygonOffset::getUnitMultiplier()<<std::endl;
+                osg::PolygonOffset::setUnitsMultiplier(osg::PolygonOffset::getUnitsMultiplier()*1.1f);
+                osg::notify(osg::NOTICE)<<"osg::PolygonOffset::getUnitsMultiplier()="<<osg::PolygonOffset::getUnitsMultiplier()<<std::endl;
                 return true;
             }
             case '/' :
             {
-                osg::PolygonOffset::setUnitMultiplier(osg::PolygonOffset::getUnitMultiplier()/1.1f);
-                osg::notify(osg::NOTICE)<<"osg::PolygonOffset::getUnitMultiplier()="<<osg::PolygonOffset::getUnitMultiplier()<<std::endl;
+                osg::PolygonOffset::setUnitsMultiplier(osg::PolygonOffset::getUnitsMultiplier()/1.1f);
+                osg::notify(osg::NOTICE)<<"osg::PolygonOffset::getUnitsMultiplier()="<<osg::PolygonOffset::getUnitsMultiplier()<<std::endl;
                 return true;
             }
 #else
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index c8b8033fa..7c946a4cb 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -1448,9 +1448,9 @@ void Text::drawImplementation(osg::State& state) const
 
         if(_backdropType != NONE)
         {
-            if (!osg::PolygonOffset::areUnitAndMultipliersSet())
+            if (!osg::PolygonOffset::areUnitsAndMultipliersSet())
             {
-                osg::PolygonOffset::setFactorAndUnitMultipliersUsingBestGuessForDriver();
+                osg::PolygonOffset::setFactorAndUnitsMultipliersUsingBestGuessForDriver();
             }
 
             // Do I really need to do this for glPolygonOffset?
@@ -1494,7 +1494,7 @@ void Text::drawImplementation(osg::State& state) const
                     {
                         state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
                         glPolygonOffset(2.0f * osg::PolygonOffset::getFactorMultiplier(),
-                                        3.0f * osg::PolygonOffset::getUnitMultiplier() * (max_backdrop_index-backdrop_index) );
+                                        3.0f * osg::PolygonOffset::getUnitsMultiplier() * (max_backdrop_index-backdrop_index) );
                         glDrawArrays(GL_QUADS,0,transformedBackdropCoords.size());
                     }
                 }