diff --git a/clients/nitrogen/nitrogen.cpp b/clients/nitrogen/nitrogen.cpp
index 7ee6ee6ad1..a557ec3731 100644
--- a/clients/nitrogen/nitrogen.cpp
+++ b/clients/nitrogen/nitrogen.cpp
@@ -47,7 +47,7 @@ namespace Nitrogen
 {
   
   // referenced from definition in Nitrogendclient.cpp
-  NitrogenHelper *nitrogenHelper(); 
+  OxygenHelper *nitrogenHelper(); 
   
   // initialize static members
   bool NitrogenFactory::initialized_ = false;
diff --git a/clients/nitrogen/nitrogenbutton.h b/clients/nitrogen/nitrogenbutton.h
index 0de994b888..125c8d76bf 100644
--- a/clients/nitrogen/nitrogenbutton.h
+++ b/clients/nitrogen/nitrogenbutton.h
@@ -103,7 +103,7 @@ namespace Nitrogen
     NitrogenClient &client_;
     
     //! helper
-    NitrogenHelper &helper_;
+    OxygenHelper &helper_;
     
     //! button type
     ButtonType type_;
diff --git a/clients/nitrogen/nitrogenclient.h b/clients/nitrogen/nitrogenclient.h
index 9774b20725..fa82041234 100644
--- a/clients/nitrogen/nitrogenclient.h
+++ b/clients/nitrogen/nitrogenclient.h
@@ -74,7 +74,7 @@ namespace Nitrogen
         NitrogenConfiguration configuration( void ) const;
         
         //! helper class
-        NitrogenHelper& helper( void ) const
+        OxygenHelper& helper( void ) const
         { return helper_; }
         
         //! window background
@@ -157,7 +157,7 @@ namespace Nitrogen
         TileSet *glowTiles_;
 
         //! helper
-        NitrogenHelper& helper_;    
+        OxygenHelper& helper_;    
         
         //! true when initialized
         bool initialized_;