diff -abBru orocos-rtt-1.10.3.orig/src/NameServer.hpp orocos-rtt-1.10.3.mod/src/NameServer.hpp
--- orocos-rtt-1.10.3.orig/src/NameServer.hpp	2008-08-13 13:46:54.000000000 +0200
+++ orocos-rtt-1.10.3.mod/src/NameServer.hpp	2010-04-19 10:07:52.638415969 +0200
@@ -77,11 +77,11 @@
         /**
          * The iterator for iterating over the internal representation
          */
-        typedef typename Rep::iterator iterator;
+        typedef typename Rep::iterator rep_iterator;
         /**
          * The const_iterator for iterating over the internal representation
          */
-        typedef typename Rep::const_iterator const_iterator;
+        typedef typename Rep::const_iterator const_rep_iterator;
 
         /**
          * @brief Construct an empty NameServer.
@@ -116,7 +116,7 @@
          */
         bool isObjectRegistered( const ValueType o ) const
         {
-            for ( const_iterator i = objects.begin(); i != objects.end(); ++i )
+            for ( const_rep_iterator i = objects.begin(); i != objects.end(); ++i )
                 {
                     if ( ( *i ).second == o )
                         return true;
@@ -135,7 +135,7 @@
          */
         ValueType getObject( const NameType& s ) const
         {
-            const_iterator itc = objects.find( s );
+            const_rep_iterator itc = objects.find( s );
             if ( itc == objects.end() )
                 return ValueType();
             return( *itc ).second;
@@ -152,7 +152,7 @@
         const NameType&
         getName( const ValueType s ) const
         {
-            for ( const_iterator i = objects.begin(); i != objects.end(); ++i )
+            for ( const_rep_iterator i = objects.begin(); i != objects.end(); ++i )
                 {
                     if ( ( *i ).second == s )
                         return ( *i ).first;
@@ -189,7 +189,7 @@
          */
         void unregisterObject( const ValueType obj )
         {
-            iterator i(objects.begin());
+            rep_iterator i(objects.begin());
 
             /**
              * @todo might be improved by using equal_range
@@ -221,7 +221,7 @@
          */
         void unregisterName( const NameType& name )
         {
-            iterator i( objects.find( name ) );
+            rep_iterator i( objects.find( name ) );
 
             if ( i != objects.end() ) {
                 objects.erase( i );
@@ -243,10 +243,10 @@
 #endif
         {
         protected:
-            iterator i;
+            rep_iterator i;
 
         public:
-            value_iterator( iterator _i ) : i( _i )
+            value_iterator( rep_iterator _i ) : i( _i )
             {}
 
             ValueType operator*()
@@ -309,11 +309,11 @@
         {
 
         protected:
-            iterator i;
+            rep_iterator i;
 
         public:
 
-            name_iterator( iterator _i ) : i( _i )
+            name_iterator( rep_iterator _i ) : i( _i )
             {}
 
             NameType operator*()