Removed or replaced most double underscores in ObjC

91 files changed, 662 insertions, 623 deletions

diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 794570bc4d0..4dcd484ba63 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -89,6 +89,21 @@ opFormatTypeToString(const OperationPtr& op)
     return "???";
 }
 
+string
+getEscapedParamName(const OperationPtr& p, const string& name)
+{
+    ParamDeclList params = p->parameters();
+
+    for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i)
+    {
+        if((*i)->name() == name)
+        {
+            return name + "_";
+        }
+    }
+    return name;
+}
+
 class SortParamDeclByTagFn
 {
 public:
@@ -122,7 +137,11 @@ Slice::ObjCVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, con
         }
         else
         {
-            string name = reference ? "*" + fixId((*p)->name()) : fixId((*p)->name());
+            string name = getParamName(*p, true);
+            if(reference)
+            {
+                name = "*" + name;
+            }
             writeMarshalUnmarshalCode(_M, (*p)->type(), name, marshal, true);
         }
     }
@@ -130,7 +149,7 @@ Slice::ObjCVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, con
     {
         if(!op->returnIsOptional())
         {
-            writeMarshalUnmarshalCode(_M, op->returnType(), "ret_", marshal, true);
+            writeMarshalUnmarshalCode(_M, op->returnType(), "ret", marshal, true);
         }
     }
 
@@ -140,15 +159,21 @@ Slice::ObjCVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, con
     {
         if(checkReturnType && op->returnTag() < (*p)->tag())
         {
-            writeOptParamMarshalUnmarshalCode(_M, op->returnType(), "ret_", op->returnTag(), marshal);
+            writeOptParamMarshalUnmarshalCode(_M, op->returnType(), "ret", op->returnTag(), marshal);
             checkReturnType = false;
         }
-        string name = reference ? "*" + fixId((*p)->name()) : fixId((*p)->name());
+
+        string name = getParamName(*p, true);
+        if(reference)
+        {
+            name = "*" + name;
+        }
+
         writeOptParamMarshalUnmarshalCode(_M, (*p)->type(), name, (*p)->tag(), marshal);
     }
     if(checkReturnType)
     {
-        writeOptParamMarshalUnmarshalCode(_M, op->returnType(), "ret_", op->returnTag(), marshal);
+        writeOptParamMarshalUnmarshalCode(_M, op->returnType(), "ret", op->returnTag(), marshal);
     }
 }
 
@@ -174,7 +199,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
     assert(scopedIter != ids.end());
     StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
 
-    _M << sp << nl << "static NSString *" << name << "_ids__[] = ";
+    _M << sp << nl << "static NSString * iceS_" << name << "_ids[] = ";
     _M << sb;
     {
         StringList::const_iterator q = ids.begin();
@@ -199,11 +224,11 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         assert(cl);
 
         string opName = getName(op);
-        _M << sp << nl << "+(void)" << op->name() << "___:(id<" << name << ">)target_ current:(ICECurrent *)current "
-           << "is:(id<ICEInputStream>)is_ os:(id<ICEOutputStream>)os_";
+        _M << sp << nl << "+(void) iceD_" << op->name() << ":(id<" << name << ">)target current:(ICECurrent *)current "
+           << "is:(id<ICEInputStream>)istr os:(id<ICEOutputStream>)ostr";
         _M << sb;
 
-        _M << nl << "ICEInternalCheckModeAndSelector(target_, " << sliceModeToIceMode(op->mode()) << ", @selector(";
+        _M << nl << "ICEInternalCheckModeAndSelector(target, " << sliceModeToIceMode(op->mode()) << ", @selector(";
         string selector = getSelector(op);
         if(!selector.empty())
         {
@@ -215,7 +240,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         }
         _M << "), current);";
 
-        _M << nl << "ICEEncodingVersion* encoding = [is_ startEncapsulation];";
+        _M << nl << "ICEEncodingVersion* encoding = [istr startEncapsulation];";
         ParamDeclList inParams;
         ParamDeclList outParams;
         ParamDeclList paramList = op->parameters();
@@ -234,8 +259,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         for(ParamDeclList::const_iterator inp = inParams.begin(); inp != inParams.end(); ++inp)
         {
             TypePtr type = (*inp)->type();
-            string name = (*inp)->name();
-            _M << nl << outTypeToString(type, (*inp)->optional(), true) << " " << fixId(name);
+            _M << nl << outTypeToString(type, (*inp)->optional(), true) << " " << getParamName(*inp, true);
             if(!isValueType(type))
             {
                 _M << " = nil";
@@ -245,32 +269,31 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         writeMarshalUnmarshalParams(inParams, 0, false);
         if(op->sendsClasses(false))
         {
-            _M << nl << "[is_ readPendingValues];";
+            _M << nl << "[istr readPendingValues];";
         }
-        _M << nl << "[is_ endEncapsulation];";
+        _M << nl << "[istr endEncapsulation];";
         for(ParamDeclList::const_iterator outp = outParams.begin(); outp != outParams.end(); ++outp)
         {
             TypePtr type = (*outp)->type();
-            string name = (*outp)->name();
-            _M << nl << inTypeToString(type, (*outp)->optional(), true) << " " << fixId(name);
+            _M << nl << inTypeToString(type, (*outp)->optional(), true) << " " << getParamName(*outp, true);
             if((*outp)->optional())
             {
                 _M << " = ICENone";
             }
             _M << ";";
         }
-        _M << nl << "[os_ startEncapsulation:encoding format:" << opFormatTypeToString(*r) << "];";
+        _M << nl << "[ostr startEncapsulation:encoding format:" << opFormatTypeToString(*r) << "];";
         TypePtr returnType = op->returnType();
         if(returnType)
         {
-            _M << nl << inTypeToString(returnType, op->returnIsOptional(), true) << " ret_ = ";
+            _M << nl << inTypeToString(returnType, op->returnIsOptional(), true) << " ret = ";
         }
         else
         {
             _M << nl;
         }
         string args = getServerArgs(op);
-        _M << "[target_ " << opName << args;
+        _M << "[target " << opName << args;
         if(!args.empty())
         {
             _M << " current";
@@ -279,9 +302,9 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         writeMarshalUnmarshalParams(outParams, op, true);
         if(op->returnsClasses(false))
         {
-            _M << nl << "[os_ writePendingValues];";
+            _M << nl << "[ostr writePendingValues];";
         }
-        _M << nl << "[os_ endEncapsulation];";
+        _M << nl << "[ostr endEncapsulation];";
         _M << eb;
     }
 
@@ -301,7 +324,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
 
         map<string, string>::const_iterator q;
 
-        _M << sp << nl << "static NSString *" << name << "_all__[] =";
+        _M << sp << nl << "static NSString * iceS_" << name << "_all[] =";
         _M << sb;
         q = allOpNames.begin();
         while(q != allOpNames.end())
@@ -314,12 +337,12 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         }
         _M << eb << ';';
 
-        _M << sp << nl << "-(void) dispatch__:(ICECurrent *)current is:(id<ICEInputStream>)is "
-           << "os:(id<ICEOutputStream>)os";
+        _M << sp << nl << "-(void) iceDispatch:(ICECurrent *)current is:(id<ICEInputStream>)istr "
+           << "os:(id<ICEOutputStream>)ostr";
         _M << sb;
-        _M << nl << "id target__ = [self target__];";
-        _M << nl << "switch(ICEInternalLookupString(" << name << "_all__, sizeof(" << name
-           << "_all__) / sizeof(NSString*), current.operation))";
+        _M << nl << "id target = [self iceTarget];";
+        _M << nl << "switch(ICEInternalLookupString(iceS_" << name << "_all, sizeof(iceS_" << name
+           << "_all) / sizeof(NSString*), current.operation))";
         _M << sb;
         int i = 0;
         for(q = allOpNames.begin(); q != allOpNames.end(); ++q)
@@ -328,13 +351,14 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
             _M.inc();
             if(q->second == "ICEObject")
             {
-                _M << nl << "[ICEServant " << q->first << "___:(id<" << q->second << ">)self";
+                _M << nl << "[ICEServant iceD_" << q->first << ":(id<" << q->second << ">)self";
             }
             else
             {
-                _M << nl << "[" << q->second << " " << q->first << "___:(id<" << q->second << ">)target__";
+                _M << nl << "[" << q->second << " iceD_" << q->first << ":(id<" << q->second << ">)target";
             }
-            _M << " current:current is:is os:os];";
+            _M << " current:current is:istr os:ostr];";
+
             _M << nl << "return;";
             _M.dec();
         }
@@ -353,11 +377,11 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         _M << eb;
     }
 
-    _M << sp << nl << "+(NSString * const*) staticIds__:(int*)count idIndex:(int*)idx";
+    _M << sp << nl << "+(NSString * const*) iceStaticIds:(int*)count idIndex:(int*)idx";
     _M << sb;
-    _M << nl << "*count = sizeof(" << name << "_ids__) / sizeof(NSString *);";
+    _M << nl << "*count = sizeof(iceS_" << name << "_ids) / sizeof(NSString *);";
     _M << nl << "*idx = " << scopedPos << ";";
-    _M << nl << "return " << name << "_ids__;";
+    _M << nl << "return iceS_" << name << "_ids;";
     _M << eb;
 }
 
@@ -394,7 +418,7 @@ Slice::ObjCVisitor::getSelector(const OperationPtr& op) const
 }
 
 string
-Slice::ObjCVisitor::getParams(const OperationPtr& op) const
+Slice::ObjCVisitor::getParams(const OperationPtr& op, bool internal) const
 {
     string result;
     ParamDeclList paramList = op->parameters();
@@ -414,7 +438,7 @@ Slice::ObjCVisitor::getParams(const OperationPtr& op) const
         {
             result += " " + getParamId(*q);
         }
-        result += ":(" + typeString + ")" + fixId((*q)->name());
+        result += ":(" + typeString + ")" + getParamName(*q, internal);
     }
     return result;
 }
@@ -446,7 +470,7 @@ Slice::ObjCVisitor::getBlockParams(const OperationPtr& op) const
 }
 
 string
-Slice::ObjCVisitor::getMarshalParams(const OperationPtr& op) const
+Slice::ObjCVisitor::getMarshalParams(const OperationPtr& op, bool internal) const
 {
     ParamDeclList paramList = op->parameters();
     string result;
@@ -459,14 +483,14 @@ Slice::ObjCVisitor::getMarshalParams(const OperationPtr& op) const
             {
                 result += " " + getParamId(*q);
             }
-            result += ":(" + inTypeToString(type, (*q)->optional()) + ")" + fixId((*q)->name());
+            result += ":(" + inTypeToString(type, (*q)->optional()) + ")" + getParamName(*q, internal);
         }
     }
     return result;
 }
 
 string
-Slice::ObjCVisitor::getUnmarshalParams(const OperationPtr& op) const
+Slice::ObjCVisitor::getUnmarshalParams(const OperationPtr& op, bool internal) const
 {
     string result;
     ParamDeclList paramList = op->parameters();
@@ -479,7 +503,7 @@ Slice::ObjCVisitor::getUnmarshalParams(const OperationPtr& op) const
             {
                 result += " " + getParamId(*q);
             }
-            result += ":(" + outTypeToString(type, (*q)->optional(), false, true) + ")" + fixId((*q)->name());
+            result += ":(" + outTypeToString(type, (*q)->optional(), false, true) + ")" + getParamName(*q, internal);
         }
     }
     return result;
@@ -506,7 +530,7 @@ Slice::ObjCVisitor::getServerParams(const OperationPtr& op) const
         {
             result += " " + getParamId(*q);
         }
-        result += ":(" + typeString + ")" + fixId((*q)->name());
+        result += ":(" + typeString + ")" + getParamName(*q, false);
     }
     return result;
 }
@@ -548,7 +572,7 @@ Slice::ObjCVisitor::getArgs(const OperationPtr& op) const
         {
             result += " " + getParamId(*q);
         }
-        result += ":" + fixId((*q)->name());
+        result += ":" + getParamName(*q, true);
     }
     return result;
 }
@@ -566,7 +590,7 @@ Slice::ObjCVisitor::getMarshalArgs(const OperationPtr& op) const
             {
                 result += " " + getParamId(*q);
             }
-            result += ":" + fixId((*q)->name());
+            result += ":" + getParamName(*q, true);
         }
     }
     return result;
@@ -585,7 +609,7 @@ Slice::ObjCVisitor::getUnmarshalArgs(const OperationPtr& op) const
             {
                 result += " " + getParamId(*q);
             }
-            result += ":" + fixId((*q)->name());
+            result += ":" + getParamName(*q, true);
         }
     }
     return result;
@@ -607,7 +631,7 @@ Slice::ObjCVisitor::getServerArgs(const OperationPtr& op) const
         {
             result += "&";
         }
-        result += fixId((*q)->name());
+        result += getParamName(*q, true);
     }
     return result;
 }
@@ -1018,7 +1042,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
         if(preserved && !basePreserved)
         {
-            _H << nl << "id<ICESlicedData> slicedData__;";
+            _H << nl << "id<ICESlicedData> iceSlicedData_;";
         }
 
         _H << eb;
@@ -1039,7 +1063,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
     writeInit(p, dataMembers, baseDataMembers, allDataMembers, requiresMemberInit(dataMembers), BaseTypeObject, Other);
     writeFactory(p, allDataMembers, BaseTypeObject, Other);
     writeCopyWithZone(p, allDataMembers, BaseTypeObject, Other);
-    writeMemberDealloc(dataMembers, BaseTypeObject, preserved && !basePreserved);
+    writeMemberDealloc(dataMembers, BaseTypeObject, preserved && !basePreserved ? "iceSlicedData_" : "");
 
     //
     // Setter, has, clear selectors for optionals
@@ -1068,35 +1092,35 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
         for(r = ops.begin(); r != ops.end(); ++r)
         {
             OperationPtr op = *r;
-            _H << nl << "+(void)" << op->name() << "___:(id<" << name
+            _H << nl << "+(void) iceD_" << op->name() << ":(id<" << name
                << ">)target current:(ICECurrent *)current "
-               << "is:(id<ICEInputStream>)is_ os:(id<ICEOutputStream>)os_;";
+               << "is:(id<ICEInputStream>)istr os:(id<ICEOutputStream>)ostr;";
         }
 
         //
         // Marshaling/unmarshaling
         //
 
-        _M << sp << nl << "-(void) writeImpl__:(id<ICEOutputStream>)os_";
+        _M << sp << nl << "-(void) iceWriteImpl:(id<ICEOutputStream>)ostr";
         _M << sb;
-        _M << nl << "[os_ startSlice:@\"" << p->scoped() << "\" compactId: " << p->compactId() << " lastSlice:"
+        _M << nl << "[ostr startSlice:@\"" << p->scoped() << "\" compactId:" << p->compactId() << " lastSlice:"
            << (!hasBaseClass ? "YES" : "NO") << "];";
         writeMemberMarshal(dataMembers, optionalMembers, BaseTypeObject);
-        _M << nl << "[os_ endSlice];";
+        _M << nl << "[ostr endSlice];";
         if(hasBaseClass)
         {
-            _M << nl << "[super writeImpl__:os_];";
+            _M << nl << "[super iceWriteImpl:ostr];";
         }
         _M << eb;
 
-        _M << sp << nl << "-(void) readImpl__:(id<ICEInputStream>)is_";
+        _M << sp << nl << "-(void) iceReadImpl:(id<ICEInputStream>)istr";
         _M << sb;
-        _M << nl << "[is_ startSlice];";
+        _M << nl << "[istr startSlice];";
         writeMemberUnmarshal(dataMembers, optionalMembers, BaseTypeObject);
-        _M << nl << "[is_ endSlice];";
+        _M << nl << "[istr endSlice];";
         if(hasBaseClass)
         {
-            _M << nl << "[super readImpl__:is_];";
+            _M << nl << "[super iceReadImpl:istr];";
         }
         _M << eb;
 
@@ -1104,18 +1128,18 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
         if(preserved && !basePreserved)
         {
-            _M << nl << "-(void) write__:(id<ICEOutputStream>)os";
+            _M << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr";
             _M << sb;
-            _M << nl << "[os startValue:slicedData__];";
-            _M << nl << "[self writeImpl__:os];";
-            _M << nl << "[os endValue];";
+            _M << nl << "[ostr startValue:iceSlicedData_];";
+            _M << nl << "[self iceWriteImpl:ostr];";
+            _M << nl << "[ostr endValue];";
             _M << eb;
 
-            _M << nl << "-(void) read__:(id<ICEInputStream>)is";
+            _M << nl << "-(void) iceRead:(id<ICEInputStream>)istr";
             _M << sb;
-            _M << nl << "[is startValue];";
-            _M << nl << "[self readImpl__:is];";
-            _M << nl << "slicedData__ = [is endValue:YES];";
+            _M << nl << "[istr startValue];";
+            _M << nl << "[self iceReadImpl:istr];";
+            _M << nl << "iceSlicedData_ = [istr endValue:YES];";
             _M << eb;
         }
     }
@@ -1153,7 +1177,7 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p)
         {
             _H << " current";
         }
-        _H << ":(ICECurrent *)current;";
+        _H << ":(ICECurrent *)" << getEscapedParamName(p, "current") << ";";
     }
     else
     {
@@ -1249,7 +1273,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
-            _H << nl << "id<ICESlicedData> slicedData__;";
+            _H << nl << "id<ICESlicedData> slicedData_;";
         }
 
         _H << eb;
@@ -1280,7 +1304,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     writeInit(p, dataMembers, baseDataMembers, allDataMembers, requiresMemberInit(dataMembers), BaseTypeException, ct);
     writeFactory(p, allDataMembers, BaseTypeException, ct);
     writeCopyWithZone(p, allDataMembers, BaseTypeException, ct);
-    writeMemberDealloc(dataMembers, BaseTypeException, preserved && !basePreserved);
+    writeMemberDealloc(dataMembers, BaseTypeException, preserved && !basePreserved ? "slicedData_" : "");
 
     //
     // Setter, has, clear selectors for optionals
@@ -1295,7 +1319,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     {
         if(!base || (base && !base->usesClasses(false)))
         {
-            _M << sp << nl << "-(BOOL) usesClasses__";
+            _M << sp << nl << "-(BOOL) iceUsesClasses";
             _M << sb;
             _M << nl << "return YES;";
             _M << eb;
@@ -1304,43 +1328,43 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
     if(!p->isLocal())
     {
-        _M << sp << nl << "-(void) writeImpl__:(id<ICEOutputStream>)os_";
+        _M << sp << nl << "-(void) iceWriteImpl:(id<ICEOutputStream>)ostr";
         _M << sb;
-        _M << nl << "[os_ startSlice:@\"" << p->scoped() << "\" compactId:-1 lastSlice:"
+        _M << nl << "[ostr startSlice:@\"" << p->scoped() << "\" compactId:-1 lastSlice:"
            << (!base ? "YES" : "NO") << "];";
         writeMemberMarshal(dataMembers, optionalMembers, BaseTypeException);
-        _M << nl << "[os_ endSlice];";
+        _M << nl << "[ostr endSlice];";
         if(base)
         {
-            _M << nl << "[super writeImpl__:os_];";
+            _M << nl << "[super iceWriteImpl:ostr];";
         }
         _M << eb;
 
-        _M << sp << nl << "-(void) readImpl__:(id<ICEInputStream>)is_";
+        _M << sp << nl << "-(void) iceReadImpl:(id<ICEInputStream>)istr";
         _M << sb;
-        _M << nl << "[is_ startSlice];";
+        _M << nl << "[istr startSlice];";
         writeMemberUnmarshal(dataMembers, optionalMembers, BaseTypeException);
-        _M << nl << "[is_ endSlice];";
+        _M << nl << "[istr endSlice];";
         if(base)
         {
-            _M << nl << "[super readImpl__:is_];";
+            _M << nl << "[super iceReadImpl:istr];";
         }
         _M << eb;
 
         if(preserved && !basePreserved)
         {
-            _M << nl << nl << "-(void) write__:(id<ICEOutputStream>)os";
+            _M << nl << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr";
             _M << sb;
-            _M << nl << "[os startException:slicedData__];";
-            _M << nl << "[self writeImpl__:os];";
-            _M << nl << "[os endException];";
+            _M << nl << "[ostr startException:slicedData_];";
+            _M << nl << "[self iceWriteImpl:ostr];";
+            _M << nl << "[ostr endException];";
             _M << eb;
 
-            _M << nl << nl << "-(void) read__:(id<ICEInputStream>)is";
+            _M << nl << nl << "-(void) iceRead:(id<ICEInputStream>)istr";
             _M << sb;
-            _M << nl << "[is startException];";
-            _M << nl << "[self readImpl__:is];";
-            _M << nl << "slicedData__ = [is endException:YES];";
+            _M << nl << "[istr startException];";
+            _M << nl << "[self iceReadImpl:istr];";
+            _M << nl << "slicedData_ = [istr endException:YES];";
             _M << eb;
         }
     }
@@ -1422,15 +1446,15 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         //
         // Marshaling/unmarshaling
         //
-        _H << nl << "-(void) write__:(id<ICEOutputStream>)os_;";
-        _H << nl << "-(void) read__:(id<ICEInputStream>)is_;";
+        _H << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr;";
+        _H << nl << "-(void) iceRead:(id<ICEInputStream>)istr;";
 
-        _M << sp << nl << "-(void) write__:(id<ICEOutputStream>)os_";
+        _M << sp << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr";
         _M << sb;
         writeMemberMarshal(dataMembers, DataMemberList(), BaseTypeObject);
         _M << eb;
 
-        _M << sp << nl << "-(void) read__:(id<ICEInputStream>)is_";
+        _M << sp << nl << "-(void) iceRead:(id<ICEInputStream>)istr";
         _M << sb;
         writeMemberUnmarshal(dataMembers, DataMemberList(), BaseTypeObject);
         _M << eb;
@@ -1566,7 +1590,7 @@ Slice::Gen::TypesVisitor::writeInit(const ContainedPtr& p, const DataMemberList&
     _M << nl << "self = [super init";
     if(ct == LocalException)
     {
-        _M << ":file__p line:line__p";
+        _M << ":file_ line:line_";
     }
     writeMemberCall(baseDataMembers, baseType, ct, WithEscape);
     _M << "];";
@@ -1605,7 +1629,7 @@ Slice::Gen::TypesVisitor::writeFactory(const ContainedPtr& p, const DataMemberLi
     _M << nl << "return ICE_AUTORELEASE([(" << name << " *)[self alloc] init";
     if(ct == LocalException)
     {
-        _M << ":file__p line:line__p";
+        _M << ":file_ line:line_";
     }
     writeMemberCall(dataMembers, baseType, ct, WithEscape);
     _M << "]);";
@@ -1625,7 +1649,7 @@ Slice::Gen::TypesVisitor::writeFactory(const ContainedPtr& p, const DataMemberLi
         _M << nl << "return ICE_AUTORELEASE([self " << factoryMethod;
         if(ct == LocalException)
         {
-            _M << ":file__p line:line__p";
+            _M << ":file_ line:line_";
         }
         writeMemberCall(dataMembers, baseType, ct, WithEscape);
         _M << "]);";
@@ -1643,9 +1667,9 @@ Slice::Gen::TypesVisitor::writeCopyWithZone(const ContainedPtr& p, const DataMem
     }
 
     string name = fixName(p);
-    _M << sp << nl << "-(id) copyWithZone:(NSZone *)zone_p";
+    _M << sp << nl << "-(id) copyWithZone:(NSZone *)zone";
     _M << sb;
-    _M << nl << "return [(" << name << " *)[[self class] allocWithZone:zone_p] init";
+    _M << nl << "return [(" << name << " *)[[self class] allocWithZone:zone] init";
     if(ct == LocalException)
     {
         _M << ":file line:line";
@@ -1693,8 +1717,8 @@ Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers
 {
     if(ct == LocalException)
     {
-        _H << ":(const char*)file__p line:(int)line__p";
-        _M << ":(const char*)file__p line:(int)line__p";
+        _H << ":(const char*)file line:(int)line";
+        _M << ":(const char*)file_ line:(int)line_";
     }
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
@@ -1718,7 +1742,7 @@ Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers
             _M << " " << getParamId(*q);
         }
         _H << ":(" << typeString << ")" << fixId((*q)->name());
-        _M << ":(" << typeString << ")" << fixId((*q)->name()) << "_p";
+        _M << ":(" << typeString << ")" << getParamName(*q, true);
     }
 }
 
@@ -1756,7 +1780,7 @@ Slice::Gen::TypesVisitor::writeMemberCall(const DataMemberList& dataMembers, int
         }
         else
         {
-            _M << ":" << name << "_p";
+            _M << ":" << getParamName(*q, true);
         }
     }
 }
@@ -1838,12 +1862,12 @@ Slice::Gen::TypesVisitor::writeMemberInit(const DataMemberList& dataMembers, int
             if(isValueType(type))
             {
                 _M << nl << "self->has_" << name << "__ = [ICEOptionalGetter " << getOptionalHelperGetter(type) << ":";
-                _M << name << "_p value:&self->" << fixId((*q)->name(), baseType) << "];";
+                _M << getParamName(*q, true) << " value:&self->" << fixId((*q)->name(), baseType) << "];";
             }
             else
             {
                 _M << nl << "self->has_" << name << "__ = [ICEOptionalGetter getRetained:";
-                _M << name << "_p value:&self->" << fixId((*q)->name(), baseType);
+                _M << getParamName(*q, true) << " value:&self->" << fixId((*q)->name(), baseType);
                 _M << " type:[" << typeToObjCTypeString(type) << " class]];";
             }
         }
@@ -1851,11 +1875,11 @@ Slice::Gen::TypesVisitor::writeMemberInit(const DataMemberList& dataMembers, int
         {
             if(isValueType(type))
             {
-                _M << nl << "self->" << fixId((*q)->name(), baseType) << " = " << name << "_p;";
+                _M << nl << "self->" << fixId((*q)->name(), baseType) << " = " << getParamName(*q, true) << ";";
             }
             else
             {
-                _M << nl << "self->" << fixId((*q)->name(), baseType) << " = ICE_RETAIN(" << name << "_p);";
+                _M << nl << "self->" << fixId((*q)->name(), baseType) << " = ICE_RETAIN(" << getParamName(*q, true) << ");";
             }
         }
     }
@@ -1922,24 +1946,25 @@ Slice::Gen::TypesVisitor::writeOptionalDataMemberSelectors(const DataMemberList&
         string typeString = inTypeToString(type, false);
 
         string name = fixId((*q)->name(), baseType);
+        string paramName = getParamName(*q, true);
 
         string capName = (*q)->name();
         capName[0] = toupper(static_cast<unsigned char>(capName[0]));
 
-        _H << nl << "-(void)set" << capName << ":(" << typeString << ")" << name << "_p;";
+        _H << nl << "-(void)set" << capName << ":(" << typeString << ")" << name << ";";
 
-        _M << nl << "-(void)set" << capName << ":(" << typeString << ")" << name << "_p";
+        _M << nl << "-(void)set" << capName << ":(" << typeString << ")" << paramName;
         _M << sb;
         _M << nl << "self->has_" << name << "__ = YES;";
         bool isValue = isValueType(type);
         if(isValue)
         {
-            _M << nl << "self->" << name << " = " << name << "_p;";
+            _M << nl << "self->" << name << " = " << paramName << ";";
         }
         else
         {
             _M << nl << "ICE_RELEASE(self->" << name << ");";
-            _M << nl << "self->" << name << " = ICE_RETAIN(" << name << "_p);";
+            _M << nl << "self->" << name << " = ICE_RETAIN(" << paramName << ");";
         }
         _M << eb;
 
@@ -2048,7 +2073,7 @@ Slice::Gen::TypesVisitor::writeMemberEquals(const DataMemberList& dataMembers, i
 }
 
 void
-Slice::Gen::TypesVisitor::writeMemberDealloc(const DataMemberList& dataMembers, int baseType, bool slicedData) const
+Slice::Gen::TypesVisitor::writeMemberDealloc(const DataMemberList& dataMembers, int baseType, const string& slicedData) const
 {
     if(dataMembers.empty())
     {
@@ -2081,9 +2106,9 @@ Slice::Gen::TypesVisitor::writeMemberDealloc(const DataMemberList& dataMembers,
     }
     if(once)
     {
-        if(slicedData)
+        if(!slicedData.empty())
         {
-            _M << nl << "[(NSObject*)slicedData__ release];";
+            _M << nl << "[(NSObject*)" << slicedData << " release];";
         }
         _M << nl << "[super dealloc];";
         _M << eb;
@@ -2109,7 +2134,7 @@ Slice::Gen::TypesVisitor::writeMemberMarshal(const DataMemberList& dataMembers,
     {
         string name = fixId((*q)->name(), baseType);
         string frmt = getOptionalFormat((*q)->type());
-        _M << nl << "if(self->has_" << name << "__ && [os_ writeOptional:" << (*q)->tag() << " format:" << frmt << "])";
+        _M << nl << "if(self->has_" << name << "__ && [ostr writeOptional:" << (*q)->tag() << " format:" << frmt << "])";
         _M << sb;
         writeOptMemberMarshalUnmarshalCode(_M, (*q)->type(), "self->" + name, true);
         _M << eb;
@@ -2131,7 +2156,7 @@ Slice::Gen::TypesVisitor::writeMemberUnmarshal(const DataMemberList& dataMembers
     {
         string name = fixId((*q)->name(), baseType);
         string frmt = getOptionalFormat((*q)->type());
-        _M << nl << "if([is_ readOptional:" << (*q)->tag() << " format:" << frmt << "])";
+        _M << nl << "if([istr readOptional:" << (*q)->tag() << " format:" << frmt << "])";
         _M << sb;
         _M << nl << "self->has_" << name << "__ = YES;";
         writeOptMemberMarshalUnmarshalCode(_M, (*q)->type(), "self->" + name, false);
@@ -2208,7 +2233,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     {
         _H << " context";
     }
-    _H << ":(ICEContext *)context;";
+    _H << ":(ICEContext *)" << getEscapedParamName(p, "context") << ";";
 
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams << ";";
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams;
@@ -2216,45 +2241,47 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     {
         _H << " context";
     }
-    _H << ":(ICEContext *)context;";
+    _H << ":(ICEContext *)" << getEscapedParamName(p, "context") << ";";
 
     _H << nl << "-(" << retString << ") end_" << p->name() << unmarshalParams;
     if(!unmarshalParams.empty())
     {
         _H << " result";
     }
-    _H << ":(id<ICEAsyncResult>)result;";
+    _H << ":(id<ICEAsyncResult>)" << getEscapedParamName(p, "result") << ";";
+
+    string responseExceptionDecl = ":(" + getResponseCBSig(p) + ")" + getEscapedParamName(p, "response") +
+        " exception:(void(^)(ICEException*))" + getEscapedParamName(p, "exception");
+    string responseExceptionSentDecl = responseExceptionDecl + " sent:(void(^)(BOOL))" + getEscapedParamName(p, "sent");
 
-    string responseCBSig = getResponseCBSig(p);
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams;
     if(!marshalParams.empty())
     {
         _H << " response";
     }
-    _H << ":(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_;";
+    _H << responseExceptionDecl << ";";
 
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams;
     if(!marshalParams.empty())
     {
         _H << " context";
     }
-    _H << ":(ICEContext *)context";
-    _H << " response:(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_;";
+    _H << ":(ICEContext *)" << getEscapedParamName(p, "context") << " response" << responseExceptionDecl << ";";
 
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams;
     if(!marshalParams.empty())
     {
         _H << " response";
     }
-    _H << ":(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_ sent:(void(^)(BOOL))sent_;";
+    _H << responseExceptionSentDecl << ";";
 
     _H << nl << "-(id<ICEAsyncResult>) begin_" << p->name() << marshalParams;
     if(!marshalParams.empty())
     {
         _H << " context";
     }
-    _H << ":(ICEContext *)context";
-    _H << " response:(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_ sent:(void(^)(BOOL))sent_;";
+    _H << ":(ICEContext *)" << getEscapedParamName(p, "context");
+    _H << " response" << responseExceptionSentDecl << ";";
 }
 
 Slice::Gen::HelperVisitor::HelperVisitor(Output& H, Output& M, const string& dllExport) :
@@ -2598,7 +2625,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         string opName = getName(*r);
         TypePtr returnType = (*r)->returnType();
         string retString = outTypeToString(returnType, (*r)->returnIsOptional());
-        string params = getParams(*r);
+        string params = getParams(*r, true);
         string args = getArgs(*r);
 
         ParamDeclList inParams;
@@ -2641,11 +2668,11 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         {
             _M << " context";
         }
-        _M << ":(ICEContext *)ctx_";
+        _M << ":(ICEContext *)context";
         _M << sb;
         if(returnType)
         {
-            _M << nl << "__block " << retString << " ret_";
+            _M << nl << "__block " << retString << " ret";
             if(!isValueType(returnType))
             {
                 _M << " = nil;";
@@ -2658,13 +2685,13 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 
         string marshal;
         string marshalArgs = getMarshalArgs(*r);
-        string marshalParams = getMarshalParams(*r);
+        string marshalParams = getMarshalParams(*r, true);
         if(!inParams.empty())
         {
-            _M << nl << "ICEMarshalCB marshal_ = ^(id<ICEOutputStream> os_) ";
-            _M << "{ [" << className << "Prx " << (*r)->name() << "_marshal___" << marshalArgs;
-            _M << (marshalArgs.empty() ? ":os_" : " os:os_") << "]; };";
-            marshal = "marshal_";
+            _M << nl << "ICEMarshalCB marshal = ^(id<ICEOutputStream> ostr) ";
+            _M << "{ [" << className << "Prx iceI_" << (*r)->name() << "_marshal" << marshalArgs;
+            _M << (marshalArgs.empty() ? ":ostr" : " os:ostr") << "]; };";
+            marshal = "marshal";
         }
         else
         {
@@ -2673,33 +2700,33 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 
         string unmarshal;
         string unmarshalArgs = getUnmarshalArgs(*r);
-        string unmarshalParams = getUnmarshalParams(*r);
+        string unmarshalParams = getUnmarshalParams(*r, true);
         if((*r)->returnsData())
         {
-            _M << nl << "ICEUnmarshalCB unmarshal_ = ^(id<ICEInputStream> is_, BOOL ok_) ";
+            _M << nl << "ICEUnmarshalCB unmarshal = ^(id<ICEInputStream> istr, BOOL ok) ";
             if(returnType)
             {
-                _M << "{ ret_ = ";
+                _M << "{ ret = ";
             }
             else
             {
                 _M << "{ ";
             }
-            _M << "[" << className << "Prx " << (*r)->name() << "_unmarshal___" << unmarshalArgs;
-            _M << (unmarshalArgs.empty() ? ":is_" : " is:is_") << " ok:ok_]; };";
-            unmarshal = "unmarshal_";
+            _M << "[" << className << "Prx iceI_" << (*r)->name() << "_unmarshal" << unmarshalArgs;
+            _M << (unmarshalArgs.empty() ? ":istr" : " is:istr") << " ok:ok]; };";
+            unmarshal = "unmarshal";
         }
         else
         {
             unmarshal = "nil";
         }
 
-        _M << nl << "[self invoke__:@\"" << (*r)->name() <<  "\" mode:" << sliceModeToIceMode((*r)->sendMode())
+        _M << nl << "[self iceInvoke:@\"" << (*r)->name() <<  "\" mode:" << sliceModeToIceMode((*r)->sendMode())
            << " format:" << opFormatTypeToString(*r) << " marshal:" << marshal
-           << " unmarshal:" << unmarshal << " context:ctx_];";
+           << " unmarshal:" << unmarshal << " context:context];";
         if(returnType)
         {
-            _M << nl << "return ret_;";
+            _M << nl << "return ret;";
         }
         _M << eb;
 
@@ -2716,19 +2743,19 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         // Write begin_ version with context.
         //
         _M << sp << nl << "-(id<ICEAsyncResult>) begin_" << (*r)->name() << marshalParams;
-        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext *)ctx_";
+        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext *)context";
         _M << sb;
         if(!inParams.empty())
         {
-            _M << nl << "ICEMarshalCB marshal_ = ^(id<ICEOutputStream> os_) ";
-            _M << "{ [" << className << "Prx " << (*r)->name() << "_marshal___" << marshalArgs;
-            _M << (marshalArgs.empty() ? "" : " os") << ":os_]; };";
+            _M << nl << "ICEMarshalCB marshal = ^(id<ICEOutputStream> ostr) ";
+            _M << "{ [" << className << "Prx iceI_" << (*r)->name() << "_marshal" << marshalArgs;
+            _M << (marshalArgs.empty() ? "" : " os") << ":ostr]; };";
         }
-        _M << nl << "return [self begin_invoke__:@\"" << (*r)->name() <<  "\" mode:"
+        _M << nl << "return [self iceI_begin_invoke:@\"" << (*r)->name() <<  "\" mode:"
            << sliceModeToIceMode((*r)->sendMode()) << " format:" << opFormatTypeToString(*r)
            << " marshal:" << marshal
            << " returnsData:" << ((*r)->returnsData() ? "YES" : "NO")
-           << " context:ctx_];";
+           << " context:context];";
         _M << eb;
 
         //
@@ -2739,11 +2766,11 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         {
             _M << " result";
         }
-        _M << ":(id<ICEAsyncResult>)result_";
+        _M << ":(id<ICEAsyncResult>)result";
         _M << sb;
         if(returnType)
         {
-            _M << nl << "__block " << retString << " ret_";
+            _M << nl << "__block " << retString << " ret";
             if(!isValueType(returnType))
             {
                 _M << " = nil;";
@@ -2755,22 +2782,22 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         }
         if((*r)->returnsData())
         {
-            _M << nl << "ICEUnmarshalCB unmarshal_ = ^(id<ICEInputStream> is_, BOOL ok_) ";
+            _M << nl << "ICEUnmarshalCB unmarshal = ^(id<ICEInputStream> istr, BOOL ok) ";
             if(returnType)
             {
-                _M << "{ ret_ = ";
+                _M << "{ ret = ";
             }
             else
             {
                 _M << "{ ";
             }
-            _M << "[" << className << "Prx " << (*r)->name() << "_unmarshal___" << unmarshalArgs;
-            _M << (unmarshalArgs.empty() ? ":is_" : " is:is_") << " ok:ok_]; };";
+            _M << "[" << className << "Prx iceI_" << (*r)->name() << "_unmarshal" << unmarshalArgs;
+            _M << (unmarshalArgs.empty() ? ":istr" : " is:istr") << " ok:ok]; };";
         }
-        _M << nl << "[self end_invoke__:@\"" << (*r)->name() << "\" unmarshal:" << unmarshal << " result:result_];";
+        _M << nl << "[self iceI_end_invoke:@\"" << (*r)->name() << "\" unmarshal:" << unmarshal << " result:result];";
         if(returnType)
         {
-            _M << nl << "return ret_;";
+            _M << nl << "return ret;";
         }
         _M << eb;
 
@@ -2780,43 +2807,43 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         string responseCBSig = getResponseCBSig(*r);
 
         _M << sp << nl << "-(id<ICEAsyncResult>) begin_" << (*r)->name() << marshalParams;
-        _M << (marshalParams.empty() ? "" : " response") << ":(" << responseCBSig << ")response_";
-        _M << " exception:(void(^)(ICEException*))exception_";
+        _M << (marshalParams.empty() ? "" : " response") << ":(" << responseCBSig << ")response";
+        _M << " exception:(void(^)(ICEException*))exception";
         _M << sb;
         _M << nl << "return [self begin_" << (*r)->name() << marshalArgs;
-        _M << (marshalArgs.empty() ? "" : " context") << ":nil response:response_ exception:exception_ sent:nil];";
+        _M << (marshalArgs.empty() ? "" : " context") << ":nil response:response exception:exception sent:nil];";
         _M << eb;
 
         _M << sp << nl << "-(id<ICEAsyncResult>) begin_" << (*r)->name() << marshalParams;
-        _M << (marshalParams.empty() ? "" : " response") << ":(" << responseCBSig << ")response_";
-        _M << " exception:(void(^)(ICEException*))exception_ sent:(void(^)(BOOL))sent_";
+        _M << (marshalParams.empty() ? "" : " response") << ":(" << responseCBSig << ")response";
+        _M << " exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent";
         _M << sb;
         _M << nl << "return [self begin_" << (*r)->name() << marshalArgs;
-        _M << (marshalArgs.empty() ? "" : " context") << ":nil response:response_ exception:exception_ sent:sent_];";
+        _M << (marshalArgs.empty() ? "" : " context") << ":nil response:response exception:exception sent:sent];";
         _M << eb;
 
         _M << sp << nl << "-(id<ICEAsyncResult>) begin_" << (*r)->name() << marshalParams;
-        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext*)ctx_";
-        _M << " response:(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_ ";
+        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext*)context";
+        _M << " response:(" << responseCBSig << ")response exception:(void(^)(ICEException*))exception ";
         _M << sb;
         _M << nl << "return [self begin_" << (*r)->name() << marshalArgs;
-        _M << (marshalArgs.empty() ? "" : " context") << ":ctx_ response:response_ exception:exception_ sent:nil];";
+        _M << (marshalArgs.empty() ? "" : " context") << ":context response:response exception:exception sent:nil];";
         _M << eb;
 
         _M << sp << nl << "-(id<ICEAsyncResult>) begin_" << (*r)->name() << marshalParams;
-        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext*)ctx_";
-        _M << " response:(" << responseCBSig << ")response_ exception:(void(^)(ICEException*))exception_ ";
-        _M << " sent:(void(^)(BOOL))sent_";
+        _M << (marshalParams.empty() ? "" : " context") << ":(ICEContext*)context";
+        _M << " response:(" << responseCBSig << ")response exception:(void(^)(ICEException*))exception ";
+        _M << " sent:(void(^)(BOOL))sent";
         _M << sb;
         if(!inParams.empty())
         {
-            _M << nl << "ICEMarshalCB marshal_ = ^(id<ICEOutputStream> os_) ";
-            _M << "{ [" << className << "Prx " << (*r)->name() << "_marshal___" << marshalArgs;
-            _M << (marshalArgs.empty() ? "" : " os") << ":os_]; };";
+            _M << nl << "ICEMarshalCB marshal = ^(id<ICEOutputStream> ostr) ";
+            _M << "{ [" << className << "Prx iceI_" << (*r)->name() << "_marshal" << marshalArgs;
+            _M << (marshalArgs.empty() ? "" : " os") << ":ostr]; };";
         }
         if((*r)->returnsData())
         {
-            _M << nl << "void(^completed_)(id<ICEInputStream>, BOOL) = ^(id<ICEInputStream> is_, BOOL ok_)";
+            _M << nl << "void(^completed)(id<ICEInputStream>, BOOL) = ^(id<ICEInputStream> istr, BOOL ok)";
             _M << sb;
             string responseCallArgs;
             string unmarshalCallArgs;
@@ -2824,12 +2851,12 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
             {
                 if(returnType)
                 {
-                    responseCallArgs += "ret_";
+                    responseCallArgs += "ret";
                 }
 
                 for(ParamDeclList::const_iterator op = outParams.begin(); op != outParams.end(); ++op)
                 {
-                    string name = fixId((*op)->name());
+                    string name = getParamName(*op, true);
                     _M << nl << outTypeToString((*op)->type(), (*op)->optional(), true) << " " << name;
                     if(!isValueType((*op)->type()))
                     {
@@ -2839,7 +2866,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 
                     if(!unmarshalCallArgs.empty())
                     {
-                        unmarshalCallArgs += " " + name;
+                        unmarshalCallArgs += " " + getParamId(*op);
                     }
                     unmarshalCallArgs += ":&" + name;
 
@@ -2851,7 +2878,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
                 }
                 if(returnType)
                 {
-                    _M << nl << outTypeToString(returnType, (*r)->returnIsOptional(), true) << " ret_";
+                    _M << nl << outTypeToString(returnType, (*r)->returnIsOptional(), true) << " ret";
                     if(!isValueType(returnType))
                     {
                         _M << " = nil";
@@ -2864,43 +2891,43 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
             _M << nl;
             if(returnType)
             {
-                _M << "ret_ = ";
+                _M << "ret = ";
             }
-            _M << "[" << className << "Prx " << (*r)->name() << "_unmarshal___" << unmarshalCallArgs;
-            _M << (unmarshalCallArgs.empty() ? ":is_" : " is:is_") << " ok:ok_];";
+            _M << "[" << className << "Prx iceI_" << (*r)->name() << "_unmarshal" << unmarshalCallArgs;
+            _M << (unmarshalCallArgs.empty() ? ":istr" : " is:istr") << " ok:ok];";
             _M << eb;
             _M << nl << "@catch(ICEException* ex)";
             _M << sb;
-            _M << nl << "if(exception_)";
+            _M << nl << "if(exception)";
             _M << sb;
-            _M << nl << "exception_(ex);";
+            _M << nl << "exception(ex);";
             _M << eb;
             _M << nl << "return;";
             _M << eb;
-            _M << nl << "if(response_)";
+            _M << nl << "if(response)";
             _M << sb;
-            _M << nl << "response_(" << responseCallArgs << ");";
+            _M << nl << "response(" << responseCallArgs << ");";
             _M << eb;
             _M << eb << ";";
             if(returnType || !outParams.empty())
             {
-                _M << nl << "return [self begin_invoke__:@\"" << (*r)->name() <<  "\" mode:"
+                _M << nl << "return [self iceI_begin_invoke:@\"" << (*r)->name() <<  "\" mode:"
                    << sliceModeToIceMode((*r)->sendMode()) << " format:" << opFormatTypeToString(*r)
                    << " marshal:" << marshal
-                   << " completed:completed_ response:(response_ != nil) exception:exception_ sent:sent_ context:ctx_];";
+                   << " completed:completed response:(response != nil) exception:exception sent:sent context:context];";
             }
             else
             {
-                _M << nl << "return [self begin_invoke__:@\"" << (*r)->name() <<  "\" mode:"
+                _M << nl << "return [self iceI_begin_invoke:@\"" << (*r)->name() <<  "\" mode:"
                    << sliceModeToIceMode((*r)->sendMode()) << " format:" << opFormatTypeToString(*r)
-                   << " marshal:" << marshal << " completed:completed_ response:YES exception:exception_ sent:sent_ context:ctx_];";
+                   << " marshal:" << marshal << " completed:completed response:YES exception:exception sent:sent context:context];";
             }
         }
         else
         {
-            _M << nl << "return [self begin_invoke__:@\"" << (*r)->name() <<  "\" mode:"
+            _M << nl << "return [self iceI_begin_invoke:@\"" << (*r)->name() <<  "\" mode:"
                << sliceModeToIceMode((*r)->sendMode()) << " format:" << opFormatTypeToString(*r)
-               << " marshal:" << marshal << " response:response_ exception:exception_ sent:sent_ context:ctx_];";
+               << " marshal:" << marshal << " response:response exception:exception sent:sent context:context];";
         }
         _M << eb;
     }
@@ -2925,10 +2952,8 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
 {
     TypePtr returnType = p->returnType();
     string retString = outTypeToString(returnType, p->returnIsOptional());
-    string params = getParams(p);
-    string args = getParams(p);
-    string marshalParams = getMarshalParams(p);
-    string unmarshalParams = getUnmarshalParams(p);
+    string marshalParams = getMarshalParams(p, true);
+    string unmarshalParams = getUnmarshalParams(p, true);
 
     ParamDeclList inParams;
     ParamDeclList outParams;
@@ -2953,47 +2978,47 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     string className = fixName(cl);
     if(!inParams.empty())
     {
-        _H << nl << "+(void) " << p->name() << "_marshal___" << marshalParams;
+        _H << nl << "+(void) iceI_" << p->name() << "_marshal" << marshalParams;
         if(!marshalParams.empty())
         {
             _H << " os";
         }
-        _H << ":(id<ICEOutputStream>)os_;";
+        _H << ":(id<ICEOutputStream>)ostr;";
 
-        _M << sp << nl << "+(void) " << p->name() << "_marshal___" << marshalParams;
+        _M << sp << nl << "+(void) iceI_" << p->name() << "_marshal" << marshalParams;
         if(!marshalParams.empty())
         {
             _M << " os";
         }
-        _M << ":(id<ICEOutputStream>)os_";
+        _M << ":(id<ICEOutputStream>)ostr";
         _M << sb;
         writeMarshalUnmarshalParams(inParams, 0, true);
         if(p->sendsClasses(false))
         {
-            _M << nl << "[os_ writePendingValues];";
+            _M << nl << "[ostr writePendingValues];";
         }
         _M << eb;
     }
 
     if(p->returnsData())
     {
-        _H << nl << "+(" << retString << ")" << p->name() << "_unmarshal___" << unmarshalParams;
+        _H << nl << "+(" << retString << ") iceI_" << p->name() << "_unmarshal" << unmarshalParams;
         if(!unmarshalParams.empty())
         {
             _H << " is";
         }
-        _H << ":(id<ICEInputStream>)is_ ok:(BOOL)ok_;";
+        _H << ":(id<ICEInputStream>)istr ok:(BOOL)ok;";
 
-        _M << nl << "+(" << retString << ")" << p->name() << "_unmarshal___" << unmarshalParams;
+        _M << nl << "+(" << retString << ") iceI_" << p->name() << "_unmarshal" << unmarshalParams;
         if(!unmarshalParams.empty())
         {
             _M << " is";
         }
-        _M << ":(id<ICEInputStream>)is_ ok:(BOOL)ok_";
+        _M << ":(id<ICEInputStream>)istr ok:(BOOL)ok";
         _M << sb;
         if(returnType)
         {
-            _M << nl << outTypeToString(returnType, p->returnIsOptional(), true) << " ret_";
+            _M << nl << outTypeToString(returnType, p->returnIsOptional(), true) << " ret";
             if(!isValueType(returnType))
             {
                 _M << " = nil;";
@@ -3009,16 +3034,16 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
             {
                 if(!isValueType((*op)->type()))
                 {
-                    _M << nl << "*" << fixId((*op)->name()) << " = nil;";
+                    _M << nl << "*" << getParamName(*op, true) << " = nil;";
                 }
             }
         }
-        _M << nl << "if(!ok_)";
+        _M << nl << "if(!ok)";
         _M << sb;
         _M << nl << "@try";
         _M << sb;
-        _M << nl << "[is_ startEncapsulation];";
-        _M << nl << "[is_ throwException];";
+        _M << nl << "[istr startEncapsulation];";
+        _M << nl << "[istr throwException];";
         _M << eb;
         //
         // Arrange exceptions into most-derived to least-derived order. If we don't
@@ -3033,17 +3058,17 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
 
         for(ExceptionList::const_iterator e = throws.begin(); e != throws.end(); ++e)
         {
-            _M << nl << "@catch(" << fixName(*e) << " *ex_)";
+            _M << nl << "@catch(" << fixName(*e) << " *ex)";
             _M << sb;
-            _M << nl << "[is_ endEncapsulation];";
+            _M << nl << "[istr endEncapsulation];";
             _M << nl << "@throw;";
             _M << eb;
         }
-        _M << nl << "@catch(ICEUserException *ex_)";
+        _M << nl << "@catch(ICEUserException *ex)";
         _M << sb;
-        _M << nl << "[is_ endEncapsulation];";
+        _M << nl << "[istr endEncapsulation];";
         _M << nl << "@throw [ICEUnknownUserException unknownUserException:__FILE__ line:__LINE__ "
-           << "unknown:[ex_ ice_id]];";
+           << "unknown:[ex ice_id]];";
         _M << eb;
         _M << eb;
 
@@ -3051,19 +3076,19 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
         {
             _M << nl << "else";
             _M << sb;
-            _M << nl << "[is_ startEncapsulation];";
+            _M << nl << "[istr startEncapsulation];";
             writeMarshalUnmarshalParams(outParams, p, false, true);
             if(p->returnsClasses(false))
             {
-                _M << nl << "[is_ readPendingValues];";
+                _M << nl << "[istr readPendingValues];";
             }
-            _M << nl << "[is_ endEncapsulation];";
+            _M << nl << "[istr endEncapsulation];";
             _M << eb;
         }
 
         if(returnType)
         {
-            _M << nl << "return ret_;";
+            _M << nl << "return ret;";
         }
         _M << eb;
     }
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index 75d86c78285..0c9ef639e7d 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -29,10 +29,10 @@ protected:
     virtual void writeMarshalUnmarshalParams(const ParamDeclList&, const OperationPtr&, bool, bool = false);
     virtual std::string getName(const OperationPtr&) const;
     virtual std::string getSelector(const OperationPtr&) const;
-    virtual std::string getParams(const OperationPtr&) const;
+    virtual std::string getParams(const OperationPtr&, bool = false) const;
     virtual std::string getBlockParams(const OperationPtr&) const;
-    virtual std::string getMarshalParams(const OperationPtr&) const;
-    virtual std::string getUnmarshalParams(const OperationPtr&) const;
+    virtual std::string getMarshalParams(const OperationPtr&, bool = false) const;
+    virtual std::string getUnmarshalParams(const OperationPtr&, bool = false) const;
     virtual std::string getServerParams(const OperationPtr&) const;
     virtual std::string getResponseCBSig(const OperationPtr&) const;
     virtual std::string getArgs(const OperationPtr&) const;
@@ -147,7 +147,7 @@ private:
         void writeOptionalDataMemberSelectors(const DataMemberList&, int) const;
         void writeMemberHashCode(const DataMemberList&, int) const;
         void writeMemberEquals(const DataMemberList&, int) const;
-        void writeMemberDealloc(const DataMemberList&, int, bool slicedData = false) const;
+        void writeMemberDealloc(const DataMemberList&, int, const std::string& = "") const;
         void writeMemberMarshal(const DataMemberList&, const DataMemberList&, int) const;
         void writeMemberUnmarshal(const DataMemberList&, const DataMemberList&, int) const;
     };
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 852af9ba2af..99f7f925098 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -208,6 +208,19 @@ Slice::ObjCGenerator::getParamId(const ContainedPtr& param)
 }
 
 string
+Slice::ObjCGenerator::getParamName(const ContainedPtr& param, bool internal)
+{
+    if(internal)
+    {
+        return "iceP_" + param->name();
+    }
+    else
+    {
+        return fixId(param->name());
+    }
+}
+
+string
 Slice::ObjCGenerator::getFactoryMethod(const ContainedPtr& p, bool deprecated)
 {
     ClassDefPtr def = ClassDefPtr::dynamicCast(p);
@@ -692,7 +705,7 @@ void
 Slice::ObjCGenerator::writeMarshalUnmarshalCode(Output &out, const TypePtr& type, const string& param,
                                                 bool marshal, bool autoreleased) const
 {
-    string stream = marshal ? "os_" : "is_";
+    string stream = marshal ? "ostr" : "istr";
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
 
     if(builtin)
@@ -883,7 +896,7 @@ void
 Slice::ObjCGenerator::writeOptMemberMarshalUnmarshalCode(Output &out, const TypePtr& type, const string& param,
                                                          bool marshal) const
 {
-    string stream = marshal ? "os_" : "is_";
+    string stream = marshal ? "ostr" : "istr";
     string optionalHelper;
     string helper;
 
@@ -1009,11 +1022,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
         out << nl;
         if(marshal)
         {
-            out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
+            out << "[" << helper << " writeOptional:" << param << " stream:ostr tag:" << tag << "];";
         }
         else
         {
-            out << "[" << helper << " readOptional:&" << param << " stream:is_ tag:" << tag << "];";
+            out << "[" << helper << " readOptional:&" << param << " stream:istr tag:" << tag << "];";
         }
         return;
     }
@@ -1021,11 +1034,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
     out << nl;
     if(marshal)
     {
-        out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
+        out << "[" << helper << " writeOptional:" << param << " stream:ostr tag:" << tag << "];";
     }
     else
     {
-        out << param << " = [" << helper << " readOptional:is_ tag:" << tag << "];";
+        out << param << " = [" << helper << " readOptional:istr tag:" << tag << "];";
     }
 }
 
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index 7c8236ede63..abf46773226 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -51,6 +51,7 @@ protected:
     static std::string fixName(const ContainedPtr&, int = 0, bool = false);
     static std::string fixScoped(const ContainedPtr&, int = 0, bool = false);
     static std::string getParamId(const ContainedPtr&);
+    static std::string getParamName(const ContainedPtr&, bool = false);
     static std::string getFactoryMethod(const ContainedPtr&, bool);
     static std::string typeToString(const TypePtr&);
     static std::string inTypeToString(const TypePtr&, bool, bool = false, bool = false);
diff --git a/objective-c/include/objc/Ice/Exception.h b/objective-c/include/objc/Ice/Exception.h
index cd74c35af70..4e344c90719 100644
--- a/objective-c/include/objc/Ice/Exception.h
+++ b/objective-c/include/objc/Ice/Exception.h
@@ -40,9 +40,9 @@ ICE_API @interface ICELocalException : ICEException
 @end
 
 ICE_API @interface ICEUserException : ICEException
--(BOOL)usesClasses__;
--(void)write__:(id<ICEOutputStream>)stream;
--(void) writeImpl__:(id<ICEOutputStream>)os;
--(void)read__:(id<ICEInputStream>)stream;
--(void) readImpl__:(id<ICEInputStream>)is;
+-(BOOL)iceUsesClasses;
+-(void)iceWrite:(id<ICEOutputStream>)stream;
+-(void) iceWriteImpl:(id<ICEOutputStream>)os;
+-(void)iceRead:(id<ICEInputStream>)stream;
+-(void) iceReadImpl:(id<ICEInputStream>)is;
 @end
diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h
index 597e5ce079a..5095c4b772b 100644
--- a/objective-c/include/objc/Ice/Initialize.h
+++ b/objective-c/include/objc/Ice/Initialize.h
@@ -38,13 +38,13 @@ ICE_API @interface ICEInitializationData : NSObject
     id<ICELogger> logger;
     void(^dispatcher)(id<ICEDispatcherCall>, id<ICEConnection>);
     void(^batchRequestInterceptor)(id<ICEBatchRequest>, int, int);
-    NSDictionary* prefixTable__;
+    NSDictionary* prefixTable_;
 }
 @property(retain, nonatomic) id<ICEProperties> properties;
 @property(retain, nonatomic) id<ICELogger> logger;
 @property(copy, nonatomic) void(^dispatcher)(id<ICEDispatcherCall>, id<ICEConnection>);
 @property(copy, nonatomic) void(^batchRequestInterceptor)(id<ICEBatchRequest>, int, int);
-@property(retain, nonatomic) NSDictionary* prefixTable__;
+@property(retain, nonatomic) NSDictionary* prefixTable_;
 
 -(id) init:(id<ICEProperties>)properties logger:(id<ICELogger>)logger
      dispatcher:(void(^)(id<ICEDispatcherCall>, id<ICEConnection>))d;
diff --git a/objective-c/include/objc/Ice/Object.h b/objective-c/include/objc/Ice/Object.h
index 5e6c5298c78..a464c2ba8f7 100644
--- a/objective-c/include/objc/Ice/Object.h
+++ b/objective-c/include/objc/Ice/Object.h
@@ -49,26 +49,26 @@ ICE_API @interface ICEObject : NSObject<ICEObject, NSCopying>
 -(NSArray*) ice_ids;
 -(void) ice_dispatch:(id<ICERequest>)request;
 +(NSString*) ice_staticId;
-+(NSString*const*) staticIds__:(int*)count idIndex:(int*)idx;
--(void) write__:(id<ICEOutputStream>)os;
--(void) read__:(id<ICEInputStream>)is;
++(NSString*const*) iceStaticIds:(int*)count idIndex:(int*)idx;
+-(void) iceWrite:(id<ICEOutputStream>)os;
+-(void) iceRead:(id<ICEInputStream>)is;
 @end
 
 ICE_API @interface ICEServant : ICEObject
 {
-    void* object__;
-    id delegate__;
+    void* iceObject_;
+    id iceDelegate_;
 }
 -(id) initWithDelegate:(id)delegate;
 +(id) objectWithDelegate:(id)delegate;
-+(void) ice_isA___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
-+(void) ice_ping___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
-+(void) ice_id___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
-+(void) ice_ids___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
--(void) dispatch__:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
--(void) writeImpl__:(id<ICEOutputStream>)os;
--(void) readImpl__:(id<ICEInputStream>)is;
--(id) target__;
++(void) iceD_ice_isA:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
++(void) iceD_ice_ping:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
++(void) iceD_ice_id:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
++(void) iceD_ice_ids:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
+-(void) iceDispatch:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os;
+-(void) iceWriteImpl:(id<ICEOutputStream>)os;
+-(void) iceReadImpl:(id<ICEInputStream>)is;
+-(id) iceTarget;
 @end
 
 ICE_API @protocol ICEBlobject<ICEObject>
diff --git a/objective-c/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h
index bf47c4165c7..31593be8f30 100644
--- a/objective-c/include/objc/Ice/Proxy.h
+++ b/objective-c/include/objc/Ice/Proxy.h
@@ -162,8 +162,8 @@ ICE_API @protocol ICEObjectPrx <NSObject, NSCopying>
 
 ICE_API @interface ICEObjectPrx : NSObject<ICEObjectPrx>
 {
-    void* objectPrx__;
-    id<ICECommunicator> communicator__;
+    void* objectPrx_;
+    id<ICECommunicator> communicator_;
 }
 +(id) uncheckedCast:(id<ICEObjectPrx>)proxy;
 +(id) uncheckedCast:(id<ICEObjectPrx>)proxy facet:(NSString*)facet;
@@ -173,19 +173,19 @@ ICE_API @interface ICEObjectPrx : NSObject<ICEObjectPrx>
 +(id) checkedCast:(id<ICEObjectPrx>)proxy facet:(NSString*)facet context:(ICEContext*)context;
 +(NSString*) ice_staticId;
 
-+(Protocol*) protocol__;
--(id<ICEOutputStream>) createOutputStream__;
--(void) invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
-       unmarshal:(ICEUnmarshalCB)unmarshal context:(ICEContext*)context;
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
-                      returnsData:(BOOL)returnsData context:(ICEContext*)context;
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
-                        response:(void(^)())response
-                        exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent
++(Protocol*) iceProtocol;
+-(id<ICEOutputStream>) iceCreateOutputStream;
+-(void) iceInvoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
+        unmarshal:(ICEUnmarshalCB)unmarshal context:(ICEContext*)context;
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
+                            returnsData:(BOOL)returnsData context:(ICEContext*)context;
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
+                               response:(void(^)())response
+                              exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent
                           context:(ICEContext*)context;
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
-                        completed:(void(^)(id<ICEInputStream>, BOOL))completed
-                         response:(BOOL)response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent
-                          context:(ICEContext*)context;
--(void)end_invoke__:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)result;
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal
+                              completed:(void(^)(id<ICEInputStream>, BOOL))completed
+                               response:(BOOL)response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent
+                                context:(ICEContext*)context;
+-(void)iceI_end_invoke:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)result;
 @end
diff --git a/objective-c/src/Ice/BatchRequestInterceptor.mm b/objective-c/src/Ice/BatchRequestInterceptor.mm
index 00b1546e14d..5472f9e2415 100644
--- a/objective-c/src/Ice/BatchRequestInterceptor.mm
+++ b/objective-c/src/Ice/BatchRequestInterceptor.mm
@@ -100,6 +100,6 @@ batchRequestInterceptorWithBatchRequestInterceptor:(void(^)(id<ICEBatchRequest>,
 }
 -(id<ICEObjectPrx>) getProxy
 {
-    return [ICEObjectPrx objectPrxWithObjectPrx__:cxxRequest_->getProxy()];
+    return [ICEObjectPrx iceObjectPrxWithObjectPrx:cxxRequest_->getProxy()];
 }
 @end
diff --git a/objective-c/src/Ice/CommunicatorI.mm b/objective-c/src/Ice/CommunicatorI.mm
index 39d1e3a929e..5bd82866953 100644
--- a/objective-c/src/Ice/CommunicatorI.mm
+++ b/objective-c/src/Ice/CommunicatorI.mm
@@ -62,9 +62,9 @@
 @implementation ICECommunicator
 -(void)setup:(ICEInitializationData*)initData
 {
-    if(initData.prefixTable__)
+    if(initData.prefixTable_)
     {
-        prefixTable_ = [initData.prefixTable__ retain];
+        prefixTable_ = [initData.prefixTable_ retain];
     }
     else
     {
@@ -179,7 +179,7 @@
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:COMMUNICATOR->stringToProxy(fromNSString(str))];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->stringToProxy(fromNSString(str))];
     }
     catch(const std::exception& ex)
     {
@@ -194,7 +194,7 @@
     NSException* nsex = nil;
     try
     {
-        return [toNSMutableString(COMMUNICATOR->proxyToString([(ICEObjectPrx*)obj objectPrx__])) autorelease];
+        return [toNSMutableString(COMMUNICATOR->proxyToString([(ICEObjectPrx*)obj iceObjectPrx])) autorelease];
     }
     catch(const std::exception& ex)
     {
@@ -209,7 +209,7 @@
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:COMMUNICATOR->propertyToProxy(fromNSString(property))];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->propertyToProxy(fromNSString(property))];
     }
     catch(const std::exception& ex)
     {
@@ -224,7 +224,7 @@
     NSException* nsex = nil;
     try
     {
-        return [toNSDictionary(COMMUNICATOR->proxyToProperty([(ICEObjectPrx*)prx objectPrx__],
+        return [toNSDictionary(COMMUNICATOR->proxyToProperty([(ICEObjectPrx*)prx iceObjectPrx],
                                                              fromNSString(property))) autorelease];
     }
     catch(const std::exception& ex)
@@ -296,7 +296,7 @@
     NSException* nsex = nil;
     try
     {
-        Ice::RouterPrx router = Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)rtr objectPrx__]));
+        Ice::RouterPrx router = Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)rtr iceObjectPrx]));
         ICEObjectAdapter* adapter = [ICEObjectAdapter localObjectWithCxxObject:
                                                           COMMUNICATOR->createObjectAdapterWithRouter(
                                                               fromNSString(name), router).get()];
@@ -382,7 +382,7 @@
     NSException* nsex = nil;
     try
     {
-        return (id<ICERouterPrx>)[ICERouterPrx objectPrxWithObjectPrx__:COMMUNICATOR->getDefaultRouter()];
+        return (id<ICERouterPrx>)[ICERouterPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->getDefaultRouter()];
     }
     catch(const std::exception& ex)
     {
@@ -397,7 +397,7 @@
     NSException* nsex = nil;
     try
     {
-        COMMUNICATOR->setDefaultRouter(Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)rtr objectPrx__])));
+        COMMUNICATOR->setDefaultRouter(Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)rtr iceObjectPrx])));
     }
     catch(const std::exception& ex)
     {
@@ -414,7 +414,7 @@
     NSException* nsex = nil;
     try
     {
-        return (id<ICELocatorPrx>)[ICELocatorPrx objectPrxWithObjectPrx__:COMMUNICATOR->getDefaultLocator()];
+        return (id<ICELocatorPrx>)[ICELocatorPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->getDefaultLocator()];
     }
     catch(const std::exception& ex)
     {
@@ -430,7 +430,7 @@
     try
     {
         COMMUNICATOR->setDefaultLocator(Ice::LocatorPrx::uncheckedCast(
-                                            Ice::ObjectPrx([(ICEObjectPrx*)loc objectPrx__])));
+                                            Ice::ObjectPrx([(ICEObjectPrx*)loc iceObjectPrx])));
     }
     catch(const std::exception& ex)
     {
@@ -496,7 +496,7 @@
     try
     {
         Ice::ObjectAdapterPtr adminAdapter = [(ICEObjectAdapter*)adapter adapter];
-        return [ICEObjectPrx objectPrxWithObjectPrx__:COMMUNICATOR->createAdmin(adminAdapter, [adminId identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->createAdmin(adminAdapter, [adminId identity])];
     }
     catch(const std::exception& ex)
     {
@@ -509,7 +509,7 @@
     NSException* nsex;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:COMMUNICATOR->getAdmin()];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:COMMUNICATOR->getAdmin()];
     }
     catch(const std::exception& ex)
     {
@@ -522,7 +522,7 @@
     NSException* nsex;
     try
     {
-        COMMUNICATOR->addAdminFacet([servant object__], fromNSString(facet));
+        COMMUNICATOR->addAdminFacet([servant iceObject], fromNSString(facet));
         @synchronized(adminFacets_)
         {
             [adminFacets_ setObject:servant forKey:facet];
diff --git a/objective-c/src/Ice/ConnectionI.mm b/objective-c/src/Ice/ConnectionI.mm
index 09ee73c982f..3b0d642b934 100644
--- a/objective-c/src/Ice/ConnectionI.mm
+++ b/objective-c/src/Ice/ConnectionI.mm
@@ -287,7 +287,7 @@ private:
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:CONNECTION->createProxy([identity identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:CONNECTION->createProxy([identity identity])];
     }
     catch(const std::exception& ex)
     {
diff --git a/objective-c/src/Ice/DispatchInterceptor.m b/objective-c/src/Ice/DispatchInterceptor.m
index 0d3eb2ca5b8..0dcbcb665fb 100644
--- a/objective-c/src/Ice/DispatchInterceptor.m
+++ b/objective-c/src/Ice/DispatchInterceptor.m
@@ -15,7 +15,7 @@
 #import <Foundation/NSInvocation.h>
 
 @implementation ICEDispatchInterceptor
--(void) dispatch__:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
+-(void) iceDispatch:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
     ICERequest* request = [ICERequest request:current is:is os:os];
     id<ICEDispatchInterceptor> dispatchInterceptor = (id<ICEDispatchInterceptor>)self;
diff --git a/objective-c/src/Ice/Exception.mm b/objective-c/src/Ice/Exception.mm
index 9e5e33010ad..6579d60fcb8 100644
--- a/objective-c/src/Ice/Exception.mm
+++ b/objective-c/src/Ice/Exception.mm
@@ -171,33 +171,33 @@ localExceptionToString(const Ice::LocalException& ex)
 @end
 
 @implementation ICEUserException
--(BOOL)usesClasses__
+-(BOOL)iceUsesClasses
 {
     return NO;
 }
 
--(void)write__:(id<ICEOutputStream>)os
+-(void)iceWrite:(id<ICEOutputStream>)os
 {
     [os startException:nil];
-    [self writeImpl__:os];
+    [self iceWriteImpl:os];
     [os endException];
 }
 
--(void) writeImpl__:(id<ICEOutputStream>)os
+-(void) iceWriteImpl:(id<ICEOutputStream>)os
 {
-    NSAssert(NO, @"writeImpl__ requires override");
+    NSAssert(NO, @"iceWriteImpl requires override");
 }
 
--(void)read__:(id<ICEInputStream>)is
+-(void)iceRead:(id<ICEInputStream>)is
 {
     [is startException];
-    [self readImpl__:is];
+    [self iceReadImpl:is];
     [is endException:NO];
 }
 
--(void) readImpl__:(id<ICEInputStream>)is
+-(void) iceReadImpl:(id<ICEInputStream>)is
 {
-    NSAssert(NO, @"readImpl__ requires override");
+    NSAssert(NO, @"iceReadImpl requires override");
 }
 
 -(id) copyWithZone:(NSZone *)zone
diff --git a/objective-c/src/Ice/ImplicitContextI.h b/objective-c/src/Ice/ImplicitContextI.h
index 74369ccc694..b048e74120f 100644
--- a/objective-c/src/Ice/ImplicitContextI.h
+++ b/objective-c/src/Ice/ImplicitContextI.h
@@ -15,7 +15,7 @@
 {
 @private
 
-    Ice::ImplicitContext* implicitContext__;
+    Ice::ImplicitContext* implicitContext_;
 }
 -(id) init:(Ice::ImplicitContext*)implicitContext;
 +(id) implicitContextWithImplicitContext:(Ice::ImplicitContext*)implicitContext;
diff --git a/objective-c/src/Ice/ImplicitContextI.mm b/objective-c/src/Ice/ImplicitContextI.mm
index 92b12edcf96..1f5bfa7daa5 100644
--- a/objective-c/src/Ice/ImplicitContextI.mm
+++ b/objective-c/src/Ice/ImplicitContextI.mm
@@ -17,8 +17,8 @@
     self = [super init];
     if(self)
     {
-        self->implicitContext__ = implicitContext;
-        self->implicitContext__->__incRef();
+        self->implicitContext_ = implicitContext;
+        self->implicitContext_->__incRef();
     }
     return self;
 }
@@ -37,32 +37,32 @@
 
 -(void) dealloc
 {
-    self->implicitContext__->__decRef();
+    self->implicitContext_->__decRef();
     [super dealloc];
 }
 
 -(ICEContext*) getContext
 {
-    return [toNSDictionary(implicitContext__->getContext()) autorelease];
+    return [toNSDictionary(implicitContext_->getContext()) autorelease];
 }
 
 -(void) setContext:(ICEContext*)context
 {
     Ice::Context ctx;
     fromNSDictionary(context, ctx);
-    implicitContext__->setContext(ctx);
+    implicitContext_->setContext(ctx);
 }
 
 -(BOOL) containsKey:(NSString*)key
 {
-    return implicitContext__->containsKey(fromNSString(key));
+    return implicitContext_->containsKey(fromNSString(key));
 }
 
 -(NSMutableString*) get:(NSString*)key
 {
-    if(implicitContext__->containsKey(fromNSString(key)))
+    if(implicitContext_->containsKey(fromNSString(key)))
     {
-        return [toNSMutableString(implicitContext__->get(fromNSString(key))) autorelease];
+        return [toNSMutableString(implicitContext_->get(fromNSString(key))) autorelease];
     }
     else
     {
@@ -72,12 +72,12 @@
 
 -(NSMutableString*) put:(NSString*)key value:(NSString*)value
 {
-    return [toNSMutableString(implicitContext__->put(fromNSString(key), fromNSString(value))) autorelease];
+    return [toNSMutableString(implicitContext_->put(fromNSString(key), fromNSString(value))) autorelease];
 }
 
 -(NSMutableString*) remove:(NSString*)key
 {
-    return [toNSMutableString(implicitContext__->remove(fromNSString(key))) autorelease];
+    return [toNSMutableString(implicitContext_->remove(fromNSString(key))) autorelease];
 }
 
 @end
diff --git a/objective-c/src/Ice/Initialize.mm b/objective-c/src/Ice/Initialize.mm
index 40f8ce180e7..0f797b2b68a 100644
--- a/objective-c/src/Ice/Initialize.mm
+++ b/objective-c/src/Ice/Initialize.mm
@@ -187,7 +187,7 @@ private:
 @synthesize logger;
 @synthesize dispatcher;
 @synthesize batchRequestInterceptor;
-@synthesize prefixTable__;
+@synthesize prefixTable_;
 
 -(id) init:(id<ICEProperties>)props logger:(id<ICELogger>)log dispatcher:(void(^)(id<ICEDispatcherCall>,
                                                                                   id<ICEConnection>))d;
@@ -222,7 +222,7 @@ private:
     copy->properties = [properties retain];
     copy->logger = [logger retain];
     copy->dispatcher = [dispatcher copy];
-    copy->prefixTable__ = [prefixTable__ retain];
+    copy->prefixTable_ = [prefixTable_ retain];
     return copy;
 }
 
@@ -231,7 +231,7 @@ private:
     NSUInteger h = 0;
     h = (h << 5 ^ [properties hash]);
     h = (h << 5 ^ [logger hash]);
-    h = (h << 5 ^ [prefixTable__ hash]);
+    h = (h << 5 ^ [prefixTable_ hash]);
     return h;
 }
 
@@ -288,16 +288,16 @@ private:
             return NO;
         }
     }
-    if(!prefixTable__)
+    if(!prefixTable_)
     {
-        if(obj->prefixTable__)
+        if(obj->prefixTable_)
         {
             return NO;
         }
     }
     else
     {
-        if(![prefixTable__ isEqual:obj->prefixTable__])
+        if(![prefixTable_ isEqual:obj->prefixTable_])
         {
             return NO;
         }
@@ -310,7 +310,7 @@ private:
     [properties release];
     [logger release];
     [dispatcher release];
-    [prefixTable__ release];
+    [prefixTable_ release];
     [super dealloc];
 }
 @end
diff --git a/objective-c/src/Ice/Object.mm b/objective-c/src/Ice/Object.mm
index 3344fd709b2..ebea699dd0d 100644
--- a/objective-c/src/Ice/Object.mm
+++ b/objective-c/src/Ice/Object.mm
@@ -131,7 +131,7 @@ ObjectI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
         ICECurrent* c = [[ICECurrent alloc] initWithCurrent:current];
         @try
         {
-            [_object dispatch__:c is:is os:os];
+            [_object iceDispatch:c is:is os:os];
         }
         @catch(ICEUserException* ex)
         {
@@ -161,7 +161,7 @@ ObjectI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
     [os release];
 }
 
-BlobjectI::BlobjectI(ICEBlobject* blobject) : _blobject(blobject), _target([blobject target__])
+BlobjectI::BlobjectI(ICEBlobject* blobject) : _blobject(blobject), _target([blobject iceTarget])
 {
 }
 
@@ -284,15 +284,15 @@ ICEInternalCheckModeAndSelector(id target, ICEOperationMode expected, SEL sel, I
 }
 
 @implementation ICEObject (ICEInternal)
--(Ice::Object*) object__
+-(Ice::Object*) iceObject
 {
-    NSAssert(NO, @"object__ requires override");
+    NSAssert(NO, @"iceObject requires override");
     return 0;
 }
 @end
 
 @implementation ICEObject
-static NSString* ICEObject_ids__[1] =
+static NSString* ICEObject_ids[1] =
 {
     @"::Ice::Object"
 };
@@ -359,22 +359,22 @@ static NSString* ICEObject_ids__[1] =
 +(NSString*) ice_staticId
 {
     int count, index;
-    NSString*const* staticIds = [self staticIds__:&count idIndex:&index];
+    NSString*const* staticIds = [self iceStaticIds:&count idIndex:&index];
     return staticIds[index];
 }
-+(NSString*const*) staticIds__:(int*)count idIndex:(int*)idx
++(NSString*const*) iceStaticIds:(int*)count idIndex:(int*)idx
 {
-    *count = sizeof(ICEObject_ids__) / sizeof(NSString*);
+    *count = sizeof(ICEObject_ids) / sizeof(NSString*);
     *idx = 0;
-    return ICEObject_ids__;
+    return ICEObject_ids;
 }
--(void) write__:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)os
 {
-    NSAssert(NO, @"write__ requires override");
+    NSAssert(NO, @"iceWrite requires override");
 }
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
-    NSAssert(NO, @"read__ requires override");
+    NSAssert(NO, @"iceRead requires override");
 }
 -(id) copyWithZone:(NSZone*)zone
 {
@@ -383,7 +383,7 @@ static NSString* ICEObject_ids__[1] =
 @end
 
 @implementation ICEServant
-static NSString* ICEObject_all__[4] =
+static NSString* ICEObject_all[4] =
 {
     @"ice_id",
     @"ice_ids",
@@ -398,8 +398,8 @@ static NSString* ICEObject_all__[4] =
     {
         return nil;
     }
-    object__ = 0;
-    delegate__ = 0;
+    iceObject_ = 0;
+    iceDelegate_ = 0;
     return self;
 }
 
@@ -410,19 +410,19 @@ static NSString* ICEObject_all__[4] =
     {
         return nil;
     }
-    object__ = 0;
-    delegate__ = [delegate retain];
+    iceObject_ = 0;
+    iceDelegate_ = [delegate retain];
     return self;
 }
 
 -(void) dealloc
 {
-    if(object__)
+    if(iceObject_)
     {
-        delete static_cast<IceObjC::ServantWrapper*>(object__);
-        object__ = 0;
+        delete static_cast<IceObjC::ServantWrapper*>(iceObject_);
+        iceObject_ = 0;
     }
-    [delegate__ release];
+    [iceDelegate_ release];
     [super dealloc];
 }
 
@@ -434,7 +434,7 @@ static NSString* ICEObject_all__[4] =
 -(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)current
 {
     int count, index;
-    NSString*const* staticIds = [[self class] staticIds__:&count idIndex:&index];
+    NSString*const* staticIds = [[self class] iceStaticIds:&count idIndex:&index];
     return ICEInternalLookupString(staticIds, count, typeId) >= 0;
 }
 
@@ -451,7 +451,7 @@ static NSString* ICEObject_all__[4] =
 -(NSArray*) ice_ids:(ICECurrent*)current
 {
     int count, index;
-    NSString*const* staticIds = [[self class] staticIds__:&count idIndex:&index];
+    NSString*const* staticIds = [[self class] iceStaticIds:&count idIndex:&index];
     return [NSArray arrayWithObjects:staticIds count:count];
 }
 
@@ -460,18 +460,18 @@ static NSString* ICEObject_all__[4] =
     [(ICERequest*)request callDispatch:self];
 }
 
-+(void) ice_isA___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
++(void) iceD_ice_isA:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
     ICEEncodingVersion* encoding = [is startEncapsulation];
-    NSString* id__ = [is readString];
+    NSString* ident = [is readString];
     [is endEncapsulation];
     [os startEncapsulation:encoding format:ICEDefaultFormat];
-    BOOL ret__ = [servant ice_isA:id__ current:current];
-    [os writeBool:ret__];
+    BOOL ret = [servant ice_isA:ident current:current];
+    [os writeBool:ret];
     [os endEncapsulation];
 }
 
-+(void) ice_ping___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
++(void) iceD_ice_ping:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
     ICEEncodingVersion* encoding = [is startEncapsulation];
     [is endEncapsulation];
@@ -480,85 +480,85 @@ static NSString* ICEObject_all__[4] =
     [os endEncapsulation];
 }
 
-+(void) ice_id___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
++(void) iceD_ice_id:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
     ICEEncodingVersion* encoding = [is startEncapsulation];
     [is endEncapsulation];
     [os startEncapsulation:encoding format:ICEDefaultFormat];
-    NSString* ret__ = [servant ice_id:current];
-    [os writeString:ret__];
+    NSString* ret = [servant ice_id:current];
+    [os writeString:ret];
     [os endEncapsulation];
 }
 
-+(void) ice_ids___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
++(void) iceD_ice_ids:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
     ICEEncodingVersion* encoding = [is startEncapsulation];
     [is endEncapsulation];
     [os startEncapsulation:encoding format:ICEDefaultFormat];
-    NSArray* ret__ = [servant ice_ids:current];
-    [os writeStringSeq:ret__];
+    NSArray* ret = [servant ice_ids:current];
+    [os writeStringSeq:ret];
     [os endEncapsulation];
 }
 
--(void) dispatch__:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
+-(void) iceDispatch:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os
 {
-    switch(ICEInternalLookupString(ICEObject_all__, sizeof(ICEObject_all__) / sizeof(NSString*), current.operation))
+    switch(ICEInternalLookupString(ICEObject_all, sizeof(ICEObject_all) / sizeof(NSString*), current.operation))
     {
     case 0:
-        [ICEServant ice_id___:self current:current is:is os:os];
+        [ICEServant iceD_ice_id:self current:current is:is os:os];
         return;
     case 1:
-        [ICEServant ice_ids___:self current:current is:is os:os];
+        [ICEServant iceD_ice_ids:self current:current is:is os:os];
         return;
     case 2:
-        [ICEServant ice_isA___:self current:current is:is os:os];
+        [ICEServant iceD_ice_isA:self current:current is:is os:os];
         return;
     case 3:
-        [ICEServant ice_ping___:self current:current is:is os:os];
+        [ICEServant iceD_ice_ping:self current:current is:is os:os];
         return;
     default:
         @throw [ICEOperationNotExistException requestFailedException:__FILE__
-                                              line:__LINE__
-                                              id:current.id_
-                                              facet:current.facet
-                                              operation:current.operation];
+                                                                line:__LINE__
+                                                                  id:current.id_
+                                                               facet:current.facet
+                                                           operation:current.operation];
     }
 }
 
--(void) write__:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)os
 {
     [os startValue:nil];
-    [self writeImpl__:os];
+    [self iceWriteImpl:os];
     [os endValue];
 }
 
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
-    [self readImpl__:is];
+    [self iceReadImpl:is];
     [is endValue:NO];
 }
 
--(void) writeImpl__:(id<ICEOutputStream>)os
+-(void) iceWriteImpl:(id<ICEOutputStream>)os
 {
-    NSAssert(NO, @"writeImpl__ requires override");
+    NSAssert(NO, @"iceWriteImpl requires override");
 }
 
--(void) readImpl__:(id<ICEInputStream>)is
+-(void) iceReadImpl:(id<ICEInputStream>)is
 {
-    NSAssert(NO, @"readImpl__ requires override");
+    NSAssert(NO, @"iceReadImpl requires override");
 }
 
--(id)target__
+-(id)iceTarget
 {
-    return (delegate__ == 0) ? self : delegate__;
+    return (iceDelegate_ == 0) ? self : iceDelegate_;
 }
 
--(Ice::Object*) object__
+-(Ice::Object*) iceObject
 {
     @synchronized([self class])
     {
-        if(object__ == 0)
+        if(iceObject_ == 0)
         {
             //
             // NOTE: IceObjC::ObjectI implements it own reference counting and there's no need
@@ -568,19 +568,19 @@ static NSString* ICEObject_all__[4] =
             // reference to the object (without this, servants added to the object adapter
             // couldn't be retained or released easily).
             //
-            object__ = static_cast<IceObjC::ServantWrapper*>(new ObjectI(self));
+            iceObject_ = static_cast<IceObjC::ServantWrapper*>(new ObjectI(self));
         }
     }
-    return static_cast<IceObjC::ServantWrapper*>(object__);
+    return static_cast<IceObjC::ServantWrapper*>(iceObject_);
 }
 @end
 
 @implementation ICEBlobject
--(Ice::Object*) object__
+-(Ice::Object*) iceObject
 {
     @synchronized([self class])
     {
-        if(object__ == 0)
+        if(iceObject_ == 0)
         {
             //
             // NOTE: IceObjC::ObjectI implements it own reference counting and there's no need
@@ -590,10 +590,10 @@ static NSString* ICEObject_all__[4] =
             // reference to the object (without this, servants added to the object adapter
             // couldn't be retained or released easily).
             //
-            object__ = static_cast<IceObjC::ServantWrapper*>(new BlobjectI(self));
+            iceObject_ = static_cast<IceObjC::ServantWrapper*>(new BlobjectI(self));
         }
     }
-    return static_cast<IceObjC::ServantWrapper*>(object__);
+    return static_cast<IceObjC::ServantWrapper*>(iceObject_);
 }
 @end
 
@@ -606,16 +606,16 @@ static NSString* ICEObject_all__[4] =
         return nil;
     }
 
-    object__ = arg;
-    object__->__incRef();
-    assert(cachedObjects.find(object__) == cachedObjects.end());
-    cachedObjects.insert(std::make_pair(object__, self));
+    object_ = arg;
+    object_->__incRef();
+    assert(cachedObjects.find(object_) == cachedObjects.end());
+    cachedObjects.insert(std::make_pair(object_, self));
     return self;
 }
 -(void) dealloc
 {
-    cachedObjects.erase(object__);
-    object__->__decRef();
+    cachedObjects.erase(object_);
+    object_->__decRef();
     [super dealloc];
 }
 +(id) servantWrapperWithCxxObject:(Ice::Object*)arg
@@ -653,7 +653,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        return object__->ice_isA(fromNSString(typeId), Ice::Current());
+        return object_->ice_isA(fromNSString(typeId), Ice::Current());
     }
     catch(const std::exception& ex)
     {
@@ -666,7 +666,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        return object__->ice_ping(Ice::Current());
+        return object_->ice_ping(Ice::Current());
     }
     catch(const std::exception& ex)
     {
@@ -679,7 +679,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        return toNSString(object__->ice_id(Ice::Current()));
+        return toNSString(object_->ice_id(Ice::Current()));
     }
     catch(const std::exception& ex)
     {
@@ -692,7 +692,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        return toNSArray(object__->ice_ids(Ice::Current()));
+        return toNSArray(object_->ice_ids(Ice::Current()));
     }
     catch(const std::exception& ex)
     {
@@ -704,12 +704,12 @@ static NSString* ICEObject_all__[4] =
 {
     @throw [ICEFeatureNotSupportedException featureNotSupportedException:__FILE__ line:__LINE__];
 }
--(void) write__:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)os
 {
     NSException* nsex = nil;
     try
     {
-        object__->_iceWrite([(ICEOutputStream*)os os]);
+        object_->_iceWrite([(ICEOutputStream*)os os]);
     }
     catch(const std::exception& ex)
     {
@@ -717,12 +717,12 @@ static NSString* ICEObject_all__[4] =
     }
     @throw nsex;
 }
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     NSException* nsex = nil;
     try
     {
-        object__->_iceRead([(ICEInputStream*)is is]);
+        object_->_iceRead([(ICEInputStream*)is is]);
     }
     catch(const std::exception& ex)
     {
@@ -730,8 +730,8 @@ static NSString* ICEObject_all__[4] =
     }
     @throw nsex;
 }
--(Ice::Object*) object__
+-(Ice::Object*) iceObject
 {
-    return object__;
+    return object_;
 }
 @end
diff --git a/objective-c/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm
index af28d9d24f1..c88ca834326 100644
--- a/objective-c/src/Ice/ObjectAdapterI.mm
+++ b/objective-c/src/Ice/ObjectAdapterI.mm
@@ -105,7 +105,7 @@ public:
     _write(Ice::OutputStream* s) const
     {
         ICEOutputStream* os = [[ICEOutputStream alloc] initWithCxxStream:s];
-        [_ex write__:os];
+        [_ex iceWrite:os];
         [os release];
     }
 
@@ -118,7 +118,7 @@ public:
     bool
     _usesClasses() const
     {
-        return [_ex usesClasses__];
+        return [_ex iceUsesClasses];
     }
 
     std::string
@@ -179,7 +179,7 @@ public:
                 {
                     cookie = new Cookie(co);
                 }
-                return [servant object__];
+                return [servant iceObject];
             }
             @catch(id e)
             {
@@ -434,7 +434,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->add([servant object__], [ident identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->add([servant iceObject], [ident identity])];
     }
     catch(const std::exception& ex)
     {
@@ -449,7 +449,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->addFacet([servant object__], [ident identity],
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->addFacet([servant iceObject], [ident identity],
                                                                               fromNSString(facet))];
     }
     catch(const std::exception& ex)
@@ -465,7 +465,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->addWithUUID([servant object__])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->addWithUUID([servant iceObject])];
     }
     catch(const std::exception& ex)
     {
@@ -480,7 +480,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->addFacetWithUUID([servant object__],
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->addFacetWithUUID([servant iceObject],
                                                                                       fromNSString(facet))];
     }
     catch(const std::exception& ex)
@@ -496,7 +496,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        Ice::ServantLocatorPtr servantLocator = new DefaultServantLocator([servant object__]);
+        Ice::ServantLocatorPtr servantLocator = new DefaultServantLocator([servant iceObject]);
         OBJECTADAPTER->addServantLocator(servantLocator, fromNSString(category));
     }
     catch(const std::exception& ex)
@@ -628,7 +628,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return toObjC(OBJECTADAPTER->findByProxy([(ICEObjectPrx*)proxy objectPrx__]));
+        return toObjC(OBJECTADAPTER->findByProxy([(ICEObjectPrx*)proxy iceObjectPrx]));
     }
     catch(const std::exception& ex)
     {
@@ -714,7 +714,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->createProxy([ident identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->createProxy([ident identity])];
     }
     catch(const std::exception& ex)
     {
@@ -729,7 +729,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->createDirectProxy([ident identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->createDirectProxy([ident identity])];
     }
     catch(const std::exception& ex)
     {
@@ -744,7 +744,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return [ICEObjectPrx objectPrxWithObjectPrx__:OBJECTADAPTER->createIndirectProxy([ident identity])];
+        return [ICEObjectPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->createIndirectProxy([ident identity])];
     }
     catch(const std::exception& ex)
     {
@@ -759,7 +759,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        OBJECTADAPTER->setLocator(Ice::LocatorPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)loc objectPrx__])));
+        OBJECTADAPTER->setLocator(Ice::LocatorPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)loc iceObjectPrx])));
     }
     catch(const std::exception& ex)
     {
@@ -776,7 +776,7 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr;
     NSException* nsex = nil;
     try
     {
-        return (id<ICELocatorPrx>)[ICELocatorPrx objectPrxWithObjectPrx__:OBJECTADAPTER->getLocator()];
+        return (id<ICELocatorPrx>)[ICELocatorPrx iceObjectPrxWithObjectPrx:OBJECTADAPTER->getLocator()];
     }
     catch(const std::exception& ex)
     {
diff --git a/objective-c/src/Ice/ObjectI.h b/objective-c/src/Ice/ObjectI.h
index d21ad12e6c9..13fbd9ab717 100644
--- a/objective-c/src/Ice/ObjectI.h
+++ b/objective-c/src/Ice/ObjectI.h
@@ -33,12 +33,12 @@ typedef IceUtil::Handle<ServantWrapper> ServantWrapperPtr;
 };
 
 @interface ICEObject (ICEInternal)
--(Ice::Object*) object__;
+-(Ice::Object*) iceObject;
 @end
 
 @interface ICEServantWrapper : ICEObject
 {
-    Ice::Object* object__;
+    Ice::Object* object_;
 }
 +(id) servantWrapperWithCxxObject:(Ice::Object*)arg;
 @end
diff --git a/objective-c/src/Ice/PropertiesI.mm b/objective-c/src/Ice/PropertiesI.mm
index 9d2b119abcf..56d5a515e45 100644
--- a/objective-c/src/Ice/PropertiesI.mm
+++ b/objective-c/src/Ice/PropertiesI.mm
@@ -282,14 +282,14 @@ typedef IceUtil::Handle<UpdateCallbackI> UpdateCallbackIPtr;
 @implementation ICEPropertiesAdminUpdateCallback
 @end
 
-#define NATIVEPROPERTIESADMIN dynamic_cast<Ice::NativePropertiesAdmin*>(object__)
+#define NATIVEPROPERTIESADMIN dynamic_cast<Ice::NativePropertiesAdmin*>(object_)
 
 @implementation ICENativePropertiesAdmin
 -(void) addUpdateCallback:(id<ICEPropertiesAdminUpdateCallback>)cb
 {
     IceUtil::Mutex::Lock sync(mutex_);
     callbacks_.push_back(new UpdateCallbackI(cb));
-    assert(Ice::NativePropertiesAdminPtr::dynamicCast(object__));
+    assert(Ice::NativePropertiesAdminPtr::dynamicCast(object_));
     NATIVEPROPERTIESADMIN->addUpdateCallback(callbacks_.back());
 }
 
diff --git a/objective-c/src/Ice/Proxy.mm b/objective-c/src/Ice/Proxy.mm
index 9e78224b7eb..5e718477e5a 100644
--- a/objective-c/src/Ice/Proxy.mm
+++ b/objective-c/src/Ice/Proxy.mm
@@ -35,8 +35,8 @@
 
 #include <Block.h>
 
-#define OBJECTPRX ((IceProxy::Ice::Object*)objectPrx__)
-#define ASYNCRESULT ((Ice::AsyncResult*)asyncResult__)
+#define OBJECTPRX ((IceProxy::Ice::Object*)objectPrx_)
+#define ASYNCRESULT ((Ice::AsyncResult*)asyncResult_)
 
 namespace
 {
@@ -185,7 +185,7 @@ BOOL _returnsData;
 };
 
 @implementation ICEAsyncResult
--(ICEAsyncResult*) initWithAsyncResult__:(const Ice::AsyncResultPtr&)arg
+-(ICEAsyncResult*) initWithAsyncResult:(const Ice::AsyncResultPtr&)arg
                                operation:(NSString*)op
                                    proxy:(id<ICEObjectPrx>)p;
 {
@@ -195,14 +195,14 @@ BOOL _returnsData;
         return nil;
     }
 
-    asyncResult__ = arg.get();
+    asyncResult_ = arg.get();
     ASYNCRESULT->__incRef();
     operation_ = [op retain];
     proxy_ = [p retain];
     return self;
 }
 
--(Ice::AsyncResult*) asyncResult__
+-(Ice::AsyncResult*) asyncResult
 {
     return ASYNCRESULT;
 }
@@ -210,17 +210,17 @@ BOOL _returnsData;
 -(void) dealloc
 {
     ASYNCRESULT->__decRef();
-    asyncResult__ = 0;
+    asyncResult_ = 0;
     [operation_ release];
     [proxy_ release];
     [super dealloc];
 }
 
-+(ICEAsyncResult*) asyncResultWithAsyncResult__:(const Ice::AsyncResultPtr&)arg
++(ICEAsyncResult*) asyncResultWithAsyncResult:(const Ice::AsyncResultPtr&)arg
 {
-    return [self asyncResultWithAsyncResult__:arg operation:nil proxy:nil];
+    return [self asyncResultWithAsyncResult:arg operation:nil proxy:nil];
 }
-+(ICEAsyncResult*) asyncResultWithAsyncResult__:(const Ice::AsyncResultPtr&)arg
++(ICEAsyncResult*) asyncResultWithAsyncResult:(const Ice::AsyncResultPtr&)arg
                                       operation:(NSString*)op
                                           proxy:(id<ICEObjectPrx>)p
 {
@@ -230,7 +230,7 @@ BOOL _returnsData;
     }
     else
     {
-        return [[[self alloc] initWithAsyncResult__:arg operation:op proxy:p] autorelease];
+        return [[[self alloc] initWithAsyncResult:arg operation:op proxy:p] autorelease];
     }
 }
 -(NSString*) operation
@@ -313,33 +313,33 @@ BOOL _returnsData;
 
 @implementation ICEObjectPrx
 
--(ICEObjectPrx*) initWithObjectPrx__:(const Ice::ObjectPrx&)arg
+-(ICEObjectPrx*) iceInitWithObjectPrx:(const Ice::ObjectPrx&)arg
 {
     self = [super init];
     if(!self)
     {
         return nil;
     }
-    communicator__ = [ICECommunicator localObjectWithCxxObjectNoAutoRelease:arg->ice_getCommunicator().get()];
-    objectPrx__ = arg.get();
+    communicator_ = [ICECommunicator localObjectWithCxxObjectNoAutoRelease:arg->ice_getCommunicator().get()];
+    objectPrx_ = arg.get();
     OBJECTPRX->__incRef();
     return self;
 }
 
--(IceProxy::Ice::Object*) objectPrx__
+-(IceProxy::Ice::Object*) iceObjectPrx
 {
-    return (IceProxy::Ice::Object*)objectPrx__;
+    return (IceProxy::Ice::Object*)objectPrx_;
 }
 
 -(void) dealloc
 {
     OBJECTPRX->__decRef();
-    objectPrx__ = 0;
-    [communicator__ release];
+    objectPrx_ = 0;
+    [communicator_ release];
     [super dealloc];
 }
 
-+(ICEObjectPrx*) objectPrxWithObjectPrx__:(const Ice::ObjectPrx&)arg
++(ICEObjectPrx*) iceObjectPrxWithObjectPrx:(const Ice::ObjectPrx&)arg
 {
     if(!arg)
     {
@@ -347,7 +347,7 @@ BOOL _returnsData;
     }
     else
     {
-        return [[[self alloc] initWithObjectPrx__:arg] autorelease];
+        return [[[self alloc] iceInitWithObjectPrx:arg] autorelease];
     }
 }
 
@@ -361,7 +361,7 @@ BOOL _returnsData;
         }
         else
         {
-            return [[[self alloc] initWithObjectPrx__:[(ICEObjectPrx*)proxy objectPrx__]] autorelease];
+            return [[[self alloc] iceInitWithObjectPrx:[(ICEObjectPrx*)proxy iceObjectPrx]] autorelease];
         }
     }
     return nil;
@@ -378,10 +378,10 @@ BOOL _returnsData;
         {
             return [[proxy retain] autorelease];
         }
-        else if([(ICEObjectPrx*)proxy conformsToProtocol:[self protocol__]] ||
+        else if([(ICEObjectPrx*)proxy conformsToProtocol:[self iceProtocol]] ||
                 [proxy ice_isA:[self ice_staticId]])
         {
-            return [[[self alloc] initWithObjectPrx__:[(ICEObjectPrx*)proxy objectPrx__]] autorelease];
+            return [[[self alloc] iceInitWithObjectPrx:[(ICEObjectPrx*)proxy iceObjectPrx]] autorelease];
         }
     }
     return nil;
@@ -405,10 +405,10 @@ BOOL _returnsData;
         {
             return [[proxy retain] autorelease];
         }
-        else if([(ICEObjectPrx*)proxy conformsToProtocol:[self protocol__]] ||
+        else if([(ICEObjectPrx*)proxy conformsToProtocol:[self iceProtocol]] ||
                 [proxy ice_isA:[self ice_staticId] context:context])
         {
-            return [[[self alloc] initWithObjectPrx__:[(ICEObjectPrx*)proxy objectPrx__]] autorelease];
+            return [[[self alloc] iceInitWithObjectPrx:[(ICEObjectPrx*)proxy iceObjectPrx]] autorelease];
         }
     }
     return nil;
@@ -429,12 +429,12 @@ BOOL _returnsData;
     return @"::Ice::Object";
 }
 
-+(Protocol*) protocol__
++(Protocol*) iceProtocol
 {
     return objc_getProtocol(class_getName([self class]));
 }
 
--(id<ICEOutputStream>) createOutputStream__
+-(id<ICEOutputStream>) iceCreateOutputStream
 {
     NSException* nsex = nil;
     try
@@ -448,7 +448,7 @@ BOOL _returnsData;
     @throw nsex;
     return nil; // Keep the compiler happy.
 }
--(void) checkAsyncTwowayOnly__:(NSString*)operation
+-(void) iceCheckAsyncTwowayOnly:(NSString*)operation
 {
     //
     // No mutex lock necessary, there is nothing mutable in this
@@ -463,7 +463,7 @@ BOOL _returnsData;
     }
 }
 
--(void) invoke__:(NSString*)operation
+-(void) iceInvoke:(NSString*)operation
             mode:(ICEOperationMode)mode
           format:(ICEFormatType)format
          marshal:(ICEMarshalCB)marshal
@@ -478,7 +478,7 @@ BOOL _returnsData;
     ICEOutputStream<ICEOutputStream>* os = nil;
     if(marshal)
     {
-        os = [self createOutputStream__];
+        os = [self iceCreateOutputStream];
         try
         {
             [os os]->startEncapsulation(IceInternal::getCompatibleEncoding(OBJECTPRX->ice_getEncodingVersion()),
@@ -579,7 +579,7 @@ BOOL _returnsData;
     NSAssert(os == nil, @"output stream not cleared");
 }
 
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation
                                 mode:(ICEOperationMode)mode
                               format:(ICEFormatType)format
                              marshal:(void(^)(id<ICEOutputStream>))marshal
@@ -588,13 +588,13 @@ BOOL _returnsData;
 {
     if(returnsData)
     {
-        [self checkAsyncTwowayOnly__:operation];
+        [self iceCheckAsyncTwowayOnly:operation];
     }
 
     ICEOutputStream<ICEOutputStream>* os = nil;
     if(marshal)
     {
-        os = [self createOutputStream__];
+        os = [self iceCreateOutputStream];
         try
         {
             [os os]->startEncapsulation(IceInternal::getCompatibleEncoding(OBJECTPRX->ice_getEncodingVersion()),
@@ -640,7 +640,7 @@ BOOL _returnsData;
         {
             r = OBJECTPRX->begin_ice_invoke(fromNSString(operation), (Ice::OperationMode)mode, inParams);
         }
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:operation proxy:self];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:operation proxy:self];
     }
     catch(const std::exception& ex)
     {
@@ -658,7 +658,7 @@ BOOL _returnsData;
     return nil; // Keep the compiler happy.
 }
 
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation
                                 mode:(ICEOperationMode)mode
                               format:(ICEFormatType)format
                              marshal:(void(^)(id<ICEOutputStream>))marshal
@@ -671,7 +671,7 @@ BOOL _returnsData;
 {
     if(returnsData)
     {
-        [self checkAsyncTwowayOnly__:operation];
+        [self iceCheckAsyncTwowayOnly:operation];
         if(!response)
         {
             @throw [NSException exceptionWithName:NSInvalidArgumentException
@@ -690,7 +690,7 @@ BOOL _returnsData;
     ICEOutputStream<ICEOutputStream>* os = nil;
     if(marshal)
     {
-        os = [self createOutputStream__];
+        os = [self iceCreateOutputStream];
         try
         {
             [os os]->startEncapsulation(IceInternal::getCompatibleEncoding(OBJECTPRX->ice_getEncodingVersion()),
@@ -742,7 +742,7 @@ BOOL _returnsData;
         {
             r = OBJECTPRX->begin_ice_invoke(fromNSString(operation), (Ice::OperationMode)mode, inParams, cb);
         }
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:operation proxy:self];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:operation proxy:self];
     }
     catch(const std::exception& ex)
     {
@@ -759,7 +759,7 @@ BOOL _returnsData;
     }
     return nil; // Keep the compiler happy.
 }
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)op
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)op
                                 mode:(ICEOperationMode)mode
                               format:(ICEFormatType)format
                              marshal:(void(^)(id<ICEOutputStream>))marshal
@@ -774,7 +774,7 @@ BOOL _returnsData;
             response();
         }
     };
-    return [self begin_invoke__:op
+    return [self iceI_begin_invoke:op
                  mode:mode
                  format:format
                  marshal:marshal
@@ -786,7 +786,7 @@ BOOL _returnsData;
                  context:ctx];
 }
 
--(id<ICEAsyncResult>) begin_invoke__:(NSString*)op
+-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)op
                                 mode:(ICEOperationMode)mode
                               format:(ICEFormatType)format
                              marshal:(void(^)(id<ICEOutputStream>))marshal
@@ -796,7 +796,7 @@ BOOL _returnsData;
                                 sent:(void(^)(BOOL))sent
                              context:(ICEContext*)ctx
 {
-    return [self begin_invoke__:op
+    return [self iceI_begin_invoke:op
                  mode:mode
                  format:format
                  marshal:marshal
@@ -807,7 +807,7 @@ BOOL _returnsData;
                  sent:sent context:ctx];
 }
 
--(void)end_invoke__:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)r
+-(void)iceI_end_invoke:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)r
 {
     ICEAsyncResult* result = (ICEAsyncResult*)r;
     if(operation != [result operation])
@@ -828,7 +828,7 @@ BOOL _returnsData;
     try
     {
         std::pair<const Ice::Byte*, const Ice::Byte*> outParams;
-        BOOL ok = OBJECTPRX->_iceI_end_ice_invoke(outParams, [result asyncResult__]);
+        BOOL ok = OBJECTPRX->_iceI_end_ice_invoke(outParams, [result asyncResult]);
 
         ICEInputStream* is;
         is = [[ICEInputStream alloc] initWithCxxCommunicator:OBJECTPRX->ice_getCommunicator().get() data:outParams];
@@ -899,13 +899,13 @@ BOOL _returnsData;
     {
         return NO;
     }
-    return *OBJECTPRX == *[o_ objectPrx__];
+    return *OBJECTPRX == *[o_ iceObjectPrx];
 }
 
 -(NSComparisonResult) compareIdentity:(id<ICEObjectPrx>)aProxy
 {
     IceProxy::Ice::Object* lhs = OBJECTPRX;
-    IceProxy::Ice::Object* rhs = [(ICEObjectPrx*)aProxy objectPrx__];
+    IceProxy::Ice::Object* rhs = [(ICEObjectPrx*)aProxy iceObjectPrx];
     if(Ice::proxyIdentityEqual(lhs, rhs))
     {
         return NSOrderedSame;
@@ -923,7 +923,7 @@ BOOL _returnsData;
 -(NSComparisonResult) compareIdentityAndFacet:(id<ICEObjectPrx>)aProxy
 {
     IceProxy::Ice::Object* lhs = OBJECTPRX;
-    IceProxy::Ice::Object* rhs = [(ICEObjectPrx*)aProxy objectPrx__];
+    IceProxy::Ice::Object* rhs = [(ICEObjectPrx*)aProxy iceObjectPrx];
     if(Ice::proxyIdentityAndFacetEqual(lhs, rhs))
     {
         return NSOrderedSame;
@@ -940,7 +940,7 @@ BOOL _returnsData;
 
 -(id<ICECommunicator>) ice_getCommunicator
 {
-    return [[communicator__ retain] autorelease];
+    return [[communicator_ retain] autorelease];
 }
 
 -(NSMutableString*) ice_toString
@@ -950,15 +950,15 @@ BOOL _returnsData;
 
 -(BOOL) ice_isA:(NSString*)typeId
 {
-    __block BOOL ret__;
-    cppCall(^ { ret__ = OBJECTPRX->ice_isA(fromNSString(typeId)); });
-    return ret__;
+    __block BOOL ret;
+    cppCall(^ { ret = OBJECTPRX->ice_isA(fromNSString(typeId)); });
+    return ret;
 }
 -(BOOL) ice_isA:(NSString*)typeId context:(ICEContext*)context
 {
-    __block BOOL ret__;
-    cppCall(^(const Ice::Context& ctx) { ret__ = OBJECTPRX->ice_isA(fromNSString(typeId), ctx); }, context);
-    return ret__;
+    __block BOOL ret;
+    cppCall(^(const Ice::Context& ctx) { ret = OBJECTPRX->ice_isA(fromNSString(typeId), ctx); }, context);
+    return ret;
 }
 -(id<ICEAsyncResult>) begin_ice_isA:(NSString*)typeId
 {
@@ -998,10 +998,10 @@ BOOL _returnsData;
                             result = OBJECTPRX->begin_ice_isA(fromNSString(typeId), cb);
                         },
                         ^(const Ice::AsyncResultPtr& result) {
-                            BOOL ret__ = OBJECTPRX->end_ice_isA(result);
+                            BOOL ret = OBJECTPRX->end_ice_isA(result);
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
@@ -1019,19 +1019,19 @@ BOOL _returnsData;
                         },
                         context,
                         ^(const Ice::AsyncResultPtr& result) {
-                            BOOL ret__ = OBJECTPRX->end_ice_isA(result);
+                            BOOL ret = OBJECTPRX->end_ice_isA(result);
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
 }
 -(BOOL) end_ice_isA:(id<ICEAsyncResult>)result
 {
-    __block BOOL ret__;
-    endCppCall(^(const Ice::AsyncResultPtr& r) { ret__ = OBJECTPRX->end_ice_isA(r); }, result);
-    return ret__;
+    __block BOOL ret;
+    endCppCall(^(const Ice::AsyncResultPtr& r) { ret = OBJECTPRX->end_ice_isA(r); }, result);
+    return ret;
 }
 
 -(void) ice_ping
@@ -1109,15 +1109,15 @@ BOOL _returnsData;
 
 -(NSMutableArray*) ice_ids
 {
-    __block NSMutableArray* ret__;
-    cppCall(^ { ret__ = [toNSArray(OBJECTPRX->ice_ids()) autorelease]; });
-    return ret__;
+    __block NSMutableArray* ret;
+    cppCall(^ { ret = [toNSArray(OBJECTPRX->ice_ids()) autorelease]; });
+    return ret;
 }
 -(NSMutableArray*) ice_ids:(ICEContext*)context
 {
-    __block NSMutableArray* ret__;
-    cppCall(^(const Ice::Context& ctx) { ret__ = [toNSArray(OBJECTPRX->ice_ids(ctx)) autorelease]; }, context);
-    return ret__;
+    __block NSMutableArray* ret;
+    cppCall(^(const Ice::Context& ctx) { ret = [toNSArray(OBJECTPRX->ice_ids(ctx)) autorelease]; }, context);
+    return ret;
 }
 -(id<ICEAsyncResult>) begin_ice_ids
 {
@@ -1150,10 +1150,10 @@ BOOL _returnsData;
                             result = OBJECTPRX->begin_ice_ids(cb);
                         },
                         ^(const Ice::AsyncResultPtr& result) {
-                            NSMutableArray* ret__ = [toNSArray(OBJECTPRX->end_ice_ids(result)) autorelease];
+                            NSMutableArray* ret = [toNSArray(OBJECTPRX->end_ice_ids(result)) autorelease];
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
@@ -1169,32 +1169,32 @@ BOOL _returnsData;
                         },
                         context,
                         ^(const Ice::AsyncResultPtr& result) {
-                            NSMutableArray* ret__ = [toNSArray(OBJECTPRX->end_ice_ids(result)) autorelease];
+                            NSMutableArray* ret = [toNSArray(OBJECTPRX->end_ice_ids(result)) autorelease];
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
 }
 -(NSMutableArray*) end_ice_ids:(id<ICEAsyncResult>)result
 {
-    __block NSMutableArray* ret__;
-    endCppCall(^(const Ice::AsyncResultPtr& r) { ret__ = [toNSArray(OBJECTPRX->end_ice_ids(r)) autorelease]; }, result);
-    return ret__;
+    __block NSMutableArray* ret;
+    endCppCall(^(const Ice::AsyncResultPtr& r) { ret = [toNSArray(OBJECTPRX->end_ice_ids(r)) autorelease]; }, result);
+    return ret;
 }
 
 -(NSMutableString*) ice_id
 {
-    __block NSMutableString* ret__;
-    cppCall(^ { ret__ = [toNSMutableString(OBJECTPRX->ice_id()) autorelease]; });
-    return ret__;
+    __block NSMutableString* ret;
+    cppCall(^ { ret = [toNSMutableString(OBJECTPRX->ice_id()) autorelease]; });
+    return ret;
 }
 -(NSMutableString*) ice_id:(ICEContext*)context
 {
-    __block NSMutableString* ret__;
-    cppCall(^(const Ice::Context& ctx) { ret__ = [toNSMutableString(OBJECTPRX->ice_id(ctx)) autorelease]; }, context);
-    return ret__;
+    __block NSMutableString* ret;
+    cppCall(^(const Ice::Context& ctx) { ret = [toNSMutableString(OBJECTPRX->ice_id(ctx)) autorelease]; }, context);
+    return ret;
 }
 -(id<ICEAsyncResult>) begin_ice_id
 {
@@ -1227,10 +1227,10 @@ BOOL _returnsData;
                             result = OBJECTPRX->begin_ice_id(cb);
                         },
                         ^(const Ice::AsyncResultPtr& result) {
-                            NSString* ret__ = [toNSString(OBJECTPRX->end_ice_id(result)) autorelease];
+                            NSString* ret = [toNSString(OBJECTPRX->end_ice_id(result)) autorelease];
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
@@ -1246,20 +1246,20 @@ BOOL _returnsData;
                         },
                         context,
                         ^(const Ice::AsyncResultPtr& result) {
-                            NSString* ret__ = [toNSString(OBJECTPRX->end_ice_id(result)) autorelease];
+                            NSString* ret = [toNSString(OBJECTPRX->end_ice_id(result)) autorelease];
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, sent, self);
 }
 -(NSMutableString*) end_ice_id:(id<ICEAsyncResult>)result
 {
-    __block NSMutableString* ret__;
-    endCppCall(^(const Ice::AsyncResultPtr& r) { ret__ = [toNSMutableString(OBJECTPRX->end_ice_id(r)) autorelease]; },
+    __block NSMutableString* ret;
+    endCppCall(^(const Ice::AsyncResultPtr& r) { ret = [toNSMutableString(OBJECTPRX->end_ice_id(r)) autorelease]; },
                result);
-    return ret__;
+    return ret;
 }
 
 -(BOOL) ice_invoke:(NSString*)operation
@@ -1342,12 +1342,12 @@ BOOL _returnsData;
                         },
                         ^(const Ice::AsyncResultPtr& result) {
                             std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                            BOOL ret__ = OBJECTPRX->_iceI_end_ice_invoke(outP, result);
+                            BOOL ret = OBJECTPRX->_iceI_end_ice_invoke(outP, result);
                             if(response)
                             {
                                 NSMutableData* outEncaps =
                                     [NSMutableData dataWithBytes:outP.first length:(outP.second - outP.first)];
-                                response(ret__, outEncaps);
+                                response(ret, outEncaps);
                             }
                         },
                         exception, sent, self);
@@ -1373,12 +1373,12 @@ BOOL _returnsData;
                         context,
                         ^(const Ice::AsyncResultPtr& result) {
                             std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                            BOOL ret__ = OBJECTPRX->_iceI_end_ice_invoke(outP, result);
+                            BOOL ret = OBJECTPRX->_iceI_end_ice_invoke(outP, result);
                             if(response)
                             {
                                 NSMutableData* outEncaps =
                                     [NSMutableData dataWithBytes:outP.first length:(outP.second - outP.first)];
-                                response(ret__, outEncaps);
+                                response(ret, outEncaps);
                             }
                         },
                         exception, sent, self);
@@ -1386,14 +1386,14 @@ BOOL _returnsData;
 -(BOOL) end_ice_invoke:(NSMutableData**)outEncaps result:(id<ICEAsyncResult>)result
 
 {
-    __block BOOL ret__;
+    __block BOOL ret;
     endCppCall(^(const Ice::AsyncResultPtr& r)
                {
                    std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                   ret__ = OBJECTPRX->_iceI_end_ice_invoke(outP, r);
+                   ret = OBJECTPRX->_iceI_end_ice_invoke(outP, r);
                    *outEncaps = [NSMutableData dataWithBytes:outP.first length:(outP.second - outP.first)];
                }, result);
-    return ret__;
+    return ret;
 }
 
 -(ICEIdentity*) ice_getIdentity
@@ -1402,7 +1402,7 @@ BOOL _returnsData;
 }
 -(id) ice_identity:(ICEIdentity*)identity
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_identity([identity identity])];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_identity([identity identity])];
 }
 -(ICEMutableContext*) ice_getContext
 {
@@ -1411,7 +1411,7 @@ BOOL _returnsData;
 -(id) ice_context:(ICEContext*)context
 {
     Ice::Context ctx;
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_context(fromNSDictionary(context, ctx))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_context(fromNSDictionary(context, ctx))];
 }
 -(NSMutableString*) ice_getFacet
 {
@@ -1419,7 +1419,7 @@ BOOL _returnsData;
 }
 -(id) ice_facet:(NSString*)facet
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_facet(fromNSString(facet))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_facet(fromNSString(facet))];
 }
 -(NSMutableString*) ice_getAdapterId
 {
@@ -1435,12 +1435,12 @@ BOOL _returnsData;
 {
     Ice::EndpointSeq cxxEndpoints;
     fromNSArray(endpoints, cxxEndpoints);
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_endpoints(cxxEndpoints)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_endpoints(cxxEndpoints)];
 }
 
 -(id) ice_adapterId:(NSString*)adapterId
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_adapterId(fromNSString(adapterId))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_adapterId(fromNSString(adapterId))];
 }
 
 -(ICEInt) ice_getLocatorCacheTimeout
@@ -1452,7 +1452,7 @@ BOOL _returnsData;
     NSException* nsex;
     try
     {
-        return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_locatorCacheTimeout(timeout)];
+        return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_locatorCacheTimeout(timeout)];
     }
     catch(const std::exception& ex)
     {
@@ -1466,7 +1466,7 @@ BOOL _returnsData;
 }
 -(id) ice_connectionCached:(BOOL)cached
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_connectionCached(cached)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_connectionCached(cached)];
 }
 -(ICEEndpointSelectionType) ice_getEndpointSelection
 {
@@ -1474,7 +1474,7 @@ BOOL _returnsData;
 }
 -(id) ice_endpointSelection:(ICEEndpointSelectionType)type
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_endpointSelection((Ice::EndpointSelectionType)type)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_endpointSelection((Ice::EndpointSelectionType)type)];
 }
 -(BOOL) ice_isSecure
 {
@@ -1482,7 +1482,7 @@ BOOL _returnsData;
 }
 -(id) ice_secure:(BOOL)secure
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_secure(secure)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_secure(secure)];
 }
 
 -(ICEEncodingVersion*) ice_getEncodingVersion
@@ -1492,7 +1492,7 @@ BOOL _returnsData;
 
 -(id) ice_encodingVersion:(ICEEncodingVersion*)encoding;
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_encodingVersion([encoding encodingVersion])];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_encodingVersion([encoding encodingVersion])];
 }
 
 -(BOOL) ice_isPreferSecure
@@ -1501,25 +1501,25 @@ BOOL _returnsData;
 }
 -(id) ice_preferSecure:(BOOL)preferSecure
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_preferSecure(preferSecure)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_preferSecure(preferSecure)];
 }
 -(id<ICERouterPrx>) ice_getRouter
 {
-    return (id<ICERouterPrx>)[ICERouterPrx objectPrxWithObjectPrx__:OBJECTPRX->ice_getRouter()];
+    return (id<ICERouterPrx>)[ICERouterPrx iceObjectPrxWithObjectPrx:OBJECTPRX->ice_getRouter()];
 }
 -(id) ice_router:(id<ICERouterPrx>)router
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_router(
-            Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)router objectPrx__])))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_router(
+            Ice::RouterPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)router iceObjectPrx])))];
 }
 -(id<ICELocatorPrx>) ice_getLocator
 {
-    return (id<ICELocatorPrx>)[ICELocatorPrx objectPrxWithObjectPrx__:OBJECTPRX->ice_getLocator()];
+    return (id<ICELocatorPrx>)[ICELocatorPrx iceObjectPrxWithObjectPrx:OBJECTPRX->ice_getLocator()];
 }
 -(id) ice_locator:(id<ICELocatorPrx>)locator
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_locator(
-            Ice::LocatorPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)locator objectPrx__])))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_locator(
+            Ice::LocatorPrx::uncheckedCast(Ice::ObjectPrx([(ICEObjectPrx*)locator iceObjectPrx])))];
 }
 -(BOOL) ice_isCollocationOptimized
 {
@@ -1527,7 +1527,7 @@ BOOL _returnsData;
 }
 -(id) ice_collocationOptimized:(BOOL)collocOptimized
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_collocationOptimized(collocOptimized)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_collocationOptimized(collocOptimized)];
 }
 -(ICEInt) ice_getInvocationTimeout
 {
@@ -1538,7 +1538,7 @@ BOOL _returnsData;
     NSException* nsex;
     try
     {
-        return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_invocationTimeout(timeout)];
+        return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_invocationTimeout(timeout)];
     }
     catch(const std::exception& ex)
     {
@@ -1548,7 +1548,7 @@ BOOL _returnsData;
 }
 -(id) ice_twoway
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_twoway()];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_twoway()];
 }
 -(BOOL) ice_isTwoway
 {
@@ -1556,7 +1556,7 @@ BOOL _returnsData;
 }
 -(id) ice_oneway
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_oneway()];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_oneway()];
 }
 -(BOOL) ice_isOneway
 {
@@ -1564,7 +1564,7 @@ BOOL _returnsData;
 }
 -(id) ice_batchOneway
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_batchOneway()];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_batchOneway()];
 }
 -(BOOL) ice_isBatchOneway
 {
@@ -1572,7 +1572,7 @@ BOOL _returnsData;
 }
 -(id) ice_datagram
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_datagram()];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_datagram()];
 }
 -(BOOL) ice_isDatagram
 {
@@ -1580,7 +1580,7 @@ BOOL _returnsData;
 }
 -(id) ice_batchDatagram
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_batchDatagram()];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_batchDatagram()];
 }
 -(BOOL) ice_isBatchDatagram
 {
@@ -1588,14 +1588,14 @@ BOOL _returnsData;
 }
 -(id) ice_compress:(BOOL)compress
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_compress(compress)];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_compress(compress)];
 }
 -(id) ice_timeout:(int)timeout
 {
     NSException* nsex;
     try
     {
-        return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_timeout(timeout)];
+        return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_timeout(timeout)];
     }
     catch(const std::exception& ex)
     {
@@ -1605,7 +1605,7 @@ BOOL _returnsData;
 }
 -(id) ice_connectionId:(NSString*)connectionId
 {
-    return [[self class] objectPrxWithObjectPrx__:OBJECTPRX->ice_connectionId(fromNSString(connectionId))];
+    return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_connectionId(fromNSString(connectionId))];
 }
 -(id<ICEConnection>) ice_getConnection
 {
@@ -1637,23 +1637,23 @@ BOOL _returnsData;
                             result = OBJECTPRX->begin_ice_getConnection(cb);
                         },
                         ^(const Ice::AsyncResultPtr& result) {
-                            id<ICEConnection> ret__ =
+                            id<ICEConnection> ret =
                                 [ICEConnection localObjectWithCxxObject:OBJECTPRX->end_ice_getConnection(result).get()];
                             if(response)
                             {
-                                response(ret__);
+                                response(ret);
                             }
                         },
                         exception, nil, self);
 }
 -(id<ICEConnection>) end_ice_getConnection:(id<ICEAsyncResult>)result
 {
-    __block id<ICEConnection> ret__;
+    __block id<ICEConnection> ret;
     endCppCall(^(const Ice::AsyncResultPtr& r)
                {
-                   ret__ = [ICEConnection localObjectWithCxxObject:OBJECTPRX->end_ice_getConnection(r).get()];
+                   ret = [ICEConnection localObjectWithCxxObject:OBJECTPRX->end_ice_getConnection(r).get()];
                }, result);
-    return ret__;
+    return ret;
 }
 
 -(id<ICEConnection>) ice_getCachedConnection
diff --git a/objective-c/src/Ice/ProxyI.h b/objective-c/src/Ice/ProxyI.h
index 1cec205305d..7a61bb124ba 100644
--- a/objective-c/src/Ice/ProxyI.h
+++ b/objective-c/src/Ice/ProxyI.h
@@ -14,19 +14,19 @@
 @interface ICEAsyncResult : NSObject<ICEAsyncResult>
 {
 @private
-    void* asyncResult__;
+    void* asyncResult_;
     NSString* operation_;
     id<ICEObjectPrx> proxy_;
 }
--(ICEAsyncResult*)initWithAsyncResult__:(const Ice::AsyncResultPtr&)arg operation:(NSString*)op proxy:(id<ICEObjectPrx>)p;
--(Ice::AsyncResult*) asyncResult__;
-+(ICEAsyncResult*)asyncResultWithAsyncResult__:(const Ice::AsyncResultPtr&)arg;
-+(ICEAsyncResult*)asyncResultWithAsyncResult__:(const Ice::AsyncResultPtr&)arg operation:(NSString*)op proxy:(id<ICEObjectPrx>)p;
+-(ICEAsyncResult*)initWithAsyncResult:(const Ice::AsyncResultPtr&)arg operation:(NSString*)op proxy:(id<ICEObjectPrx>)p;
+-(Ice::AsyncResult*) asyncResult;
++(ICEAsyncResult*)asyncResultWithAsyncResult:(const Ice::AsyncResultPtr&)arg;
++(ICEAsyncResult*)asyncResultWithAsyncResult:(const Ice::AsyncResultPtr&)arg operation:(NSString*)op proxy:(id<ICEObjectPrx>)p;
 -(NSString*)operation;
 @end
 
 @interface ICEObjectPrx ()
--(ICEObjectPrx*)initWithObjectPrx__:(const Ice::ObjectPrx&)arg;
--(IceProxy::Ice::Object*) objectPrx__;
-+(ICEObjectPrx*)objectPrxWithObjectPrx__:(const Ice::ObjectPrx&)arg;
+-(ICEObjectPrx*)iceInitWithObjectPrx:(const Ice::ObjectPrx&)arg;
+-(IceProxy::Ice::Object*) iceObjectPrx;
++(ICEObjectPrx*)iceObjectPrxWithObjectPrx:(const Ice::ObjectPrx&)arg;
 @end
diff --git a/objective-c/src/Ice/Request.m b/objective-c/src/Ice/Request.m
index 71c6cdd32df..37d559be0fa 100644
--- a/objective-c/src/Ice/Request.m
+++ b/objective-c/src/Ice/Request.m
@@ -46,7 +46,7 @@
         [is rewind];
         [os reset:NO];
     }
-    [servant dispatch__:current is:is os:os];
+    [servant iceDispatch:current is:is os:os];
 }
 
 -(void) dealloc
diff --git a/objective-c/src/Ice/SlicedData.mm b/objective-c/src/Ice/SlicedData.mm
index f4c746141a2..da6e9ed1b25 100644
--- a/objective-c/src/Ice/SlicedData.mm
+++ b/objective-c/src/Ice/SlicedData.mm
@@ -21,20 +21,20 @@
     {
         return nil;
     }
-    self->slicedData__ = slicedData;
-    self->slicedData__->__incRef();
+    self->slicedData_ = slicedData;
+    self->slicedData_->__incRef();
     return self;
 }
 
 -(void) dealloc
 {
-    self->slicedData__->__decRef();
+    self->slicedData_->__decRef();
     [super dealloc];
 }
 
 -(Ice::SlicedData*) slicedData
 {
-    return slicedData__;
+    return slicedData_;
 }
 
 @end
@@ -70,13 +70,13 @@
     return [[slicedData_ retain] autorelease];
 }
 
--(void) write__:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)os
 {
     [os startValue:slicedData_];
     [os endValue];
 }
 
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
     slicedData_ = [is endValue:YES];
diff --git a/objective-c/src/Ice/SlicedDataI.h b/objective-c/src/Ice/SlicedDataI.h
index 5742a829c9f..14872443bad 100644
--- a/objective-c/src/Ice/SlicedDataI.h
+++ b/objective-c/src/Ice/SlicedDataI.h
@@ -14,7 +14,7 @@
 @interface ICESlicedData : NSObject<ICESlicedData>
 {
 @private
-    Ice::SlicedData* slicedData__;
+    Ice::SlicedData* slicedData_;
 }
 -(id) initWithSlicedData:(Ice::SlicedData*)slicedData;
 -(Ice::SlicedData*) slicedData;
diff --git a/objective-c/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm
index 85b518ec903..a311f40c882 100644
--- a/objective-c/src/Ice/Stream.mm
+++ b/objective-c/src/Ice/Stream.mm
@@ -50,7 +50,7 @@ public:
     {
         @try
         {
-            [_obj write__:static_cast<ICEOutputStream*>(stream->getClosure())];
+            [_obj iceWrite:static_cast<ICEOutputStream*>(stream->getClosure())];
         }
         @catch(id ex)
         {
@@ -63,7 +63,7 @@ public:
     {
         @try
         {
-            [_obj read__:static_cast<ICEInputStream*>(stream->getClosure())];
+            [_obj iceRead:static_cast<ICEInputStream*>(stream->getClosure())];
         }
         @catch(id ex)
         {
@@ -270,7 +270,7 @@ public:
     virtual bool
     _usesClasses() const
     {
-        return [_ex usesClasses__];
+        return [_ex iceUsesClasses];
     }
 
     virtual std::string
@@ -294,13 +294,13 @@ public:
     virtual void
     _write(Ice::OutputStream* s) const
     {
-        [_ex write__:static_cast<ICEOutputStream*>(s->getClosure())];
+        [_ex iceWrite:static_cast<ICEOutputStream*>(s->getClosure())];
     }
 
     virtual void
     _read(Ice::InputStream* s)
     {
-        [_ex read__:static_cast<ICEInputStream*>(s->getClosure())];
+        [_ex iceRead:static_cast<ICEInputStream*>(s->getClosure())];
     }
 
     ICEUserException*
@@ -917,7 +917,7 @@ private:
     {
         Ice::ObjectPrx p;
         is_->read(p);
-        return p ? [[type alloc] initWithObjectPrx__:p] : nil;
+        return p ? [[type alloc] iceInitWithObjectPrx:p] : nil;
     }
     catch(const std::exception& ex)
     {
@@ -1922,7 +1922,7 @@ private:
     NSException* nsex = nil;
     try
     {
-        os_->write(Ice::ObjectPrx([(ICEObjectPrx*)v objectPrx__]));
+        os_->write(Ice::ObjectPrx([(ICEObjectPrx*)v iceObjectPrx]));
     }
     catch(const std::exception& ex)
     {
@@ -2779,7 +2779,7 @@ private:
 
     @try
     {
-        [p read__:stream];
+        [p iceRead:stream];
     }
     @catch(NSException *ex)
     {
@@ -2799,7 +2799,7 @@ private:
         obj = [[self getType] new];
         @try
         {
-            [obj write__:stream];
+            [obj iceWrite:stream];
         }
         @finally
         {
@@ -2808,7 +2808,7 @@ private:
     }
     else
     {
-        [obj write__:stream];
+        [obj iceWrite:stream];
     }
 }
 +(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
diff --git a/objective-c/src/Ice/Util.mm b/objective-c/src/Ice/Util.mm
index 74cc4b8eb65..506919905e9 100644
--- a/objective-c/src/Ice/Util.mm
+++ b/objective-c/src/Ice/Util.mm
@@ -157,7 +157,7 @@ ICEAsyncResult* beginCppCall(void (^fn)(Ice::AsyncResultPtr&), ICEObjectPrx* prx
     {
         Ice::AsyncResultPtr r;
         fn(r);
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:nil proxy:prx];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:nil proxy:prx];
     }
     catch(const std::exception& ex)
     {
@@ -179,7 +179,7 @@ ICEAsyncResult* beginCppCall(void (^fn)(Ice::AsyncResultPtr&, const Ice::Callbac
         Ice::AsyncResultPtr r;
         Ice::CallbackPtr callback = Ice::newCallback(cb, &AsyncCallback::completed, &AsyncCallback::sent);
         fn(r, callback);
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:nil proxy:prx];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:nil proxy:prx];
     }
     catch(const std::exception& ex)
     {
@@ -199,7 +199,7 @@ ICEAsyncResult* beginCppCall(void (^fn)(Ice::AsyncResultPtr&, const Ice::Context
         fromNSDictionary(context, ctx);
         Ice::AsyncResultPtr r;
         fn(r, ctx);
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:nil proxy:prx];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:nil proxy:prx];
     }
     catch(const std::exception& ex)
     {
@@ -224,7 +224,7 @@ ICEAsyncResult* beginCppCall(void (^fn)(Ice::AsyncResultPtr&, const Ice::Context
         Ice::AsyncResultPtr r;
         Ice::CallbackPtr callback = Ice::newCallback(cb, &AsyncCallback::completed, &AsyncCallback::sent);
         fn(r, ctx, callback);
-        return [ICEAsyncResult asyncResultWithAsyncResult__:r operation:nil proxy:prx];
+        return [ICEAsyncResult asyncResultWithAsyncResult:r operation:nil proxy:prx];
     }
     catch(const std::exception& ex)
     {
@@ -238,7 +238,7 @@ void endCppCall(void (^fn)(const Ice::AsyncResultPtr&), ICEAsyncResult* r)
     NSException* nsex = nil;
     try
     {
-        fn([r asyncResult__]);
+        fn([r asyncResult]);
         return;
     }
     catch(const std::exception& ex)
diff --git a/objective-c/test/Ice/acm/Client.m b/objective-c/test/Ice/acm/Client.m
index a174e0b4e66..d32d382f745 100644
--- a/objective-c/test/Ice/acm/Client.m
+++ b/objective-c/test/Ice/acm/Client.m
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestACM", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m
index aef70f88ee1..431b0192dd5 100644
--- a/objective-c/test/Ice/acm/Server.m
+++ b/objective-c/test/Ice/acm/Server.m
@@ -57,7 +57,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.ACM.Timeout" value:@"1"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestACM", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/adapterDeactivation/Client.m b/objective-c/test/Ice/adapterDeactivation/Client.m
index 5b14e7fafd6..fd2070928d5 100644
--- a/objective-c/test/Ice/adapterDeactivation/Client.m
+++ b/objective-c/test/Ice/adapterDeactivation/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAdapterDeactivation", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/adapterDeactivation/Collocated.m b/objective-c/test/Ice/adapterDeactivation/Collocated.m
index cad82e310a7..ae7d5326386 100644
--- a/objective-c/test/Ice/adapterDeactivation/Collocated.m
+++ b/objective-c/test/Ice/adapterDeactivation/Collocated.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAdapterDeactivation", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/adapterDeactivation/Server.m b/objective-c/test/Ice/adapterDeactivation/Server.m
index 9220a3e4a5e..e14c7dadb26 100644
--- a/objective-c/test/Ice/adapterDeactivation/Server.m
+++ b/objective-c/test/Ice/adapterDeactivation/Server.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAdapterDeactivation", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/admin/Client.m b/objective-c/test/Ice/admin/Client.m
index 5bd9aa6251a..cd946adab87 100644
--- a/objective-c/test/Ice/admin/Client.m
+++ b/objective-c/test/Ice/admin/Client.m
@@ -42,7 +42,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAdmin", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/admin/Server.m b/objective-c/test/Ice/admin/Server.m
index 486394d0601..3ccca7efa23 100644
--- a/objective-c/test/Ice/admin/Server.m
+++ b/objective-c/test/Ice/admin/Server.m
@@ -53,7 +53,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAdmin", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/ami/Client.m b/objective-c/test/Ice/ami/Client.m
index debfec0d3de..34df5737e6c 100644
--- a/objective-c/test/Ice/ami/Client.m
+++ b/objective-c/test/Ice/ami/Client.m
@@ -59,7 +59,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.MessageSizeMax" value:@"100"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestAMI", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m
index e7db69d072d..4643fdca121 100644
--- a/objective-c/test/Ice/ami/Collocated.m
+++ b/objective-c/test/Ice/ami/Collocated.m
@@ -61,7 +61,7 @@ main(int argc, char* argv[])
             initData.properties = defaultServerProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Warn.AMICallback" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                   @"TestAMI", @"::Test",
                                   nil];
 #endif
diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m
index be9df7ecd0e..9089e1f49c5 100644
--- a/objective-c/test/Ice/ami/Server.m
+++ b/objective-c/test/Ice/ami/Server.m
@@ -67,7 +67,7 @@ main(int argc, char* argv[])
             //
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-        initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+        initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                   @"TestAMI", @"::Test",
                                   nil];
 #endif
diff --git a/objective-c/test/Ice/binding/Client.m b/objective-c/test/Ice/binding/Client.m
index 22ded401d3b..570c9b401b2 100644
--- a/objective-c/test/Ice/binding/Client.m
+++ b/objective-c/test/Ice/binding/Client.m
@@ -42,7 +42,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestBinding", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/binding/Server.m b/objective-c/test/Ice/binding/Server.m
index c7f0bcd1c42..9761c83b224 100644
--- a/objective-c/test/Ice/binding/Server.m
+++ b/objective-c/test/Ice/binding/Server.m
@@ -52,7 +52,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestBinding", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/defaultServant/Client.m b/objective-c/test/Ice/defaultServant/Client.m
index 0c79bc1d348..3d9374dc8ac 100644
--- a/objective-c/test/Ice/defaultServant/Client.m
+++ b/objective-c/test/Ice/defaultServant/Client.m
@@ -168,7 +168,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestDefaultServant", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/dispatcher/Client.m b/objective-c/test/Ice/dispatcher/Client.m
index cd7722e3f93..3d724420a1f 100644
--- a/objective-c/test/Ice/dispatcher/Client.m
+++ b/objective-c/test/Ice/dispatcher/Client.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestDispatcher", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/dispatcher/Collocated.m b/objective-c/test/Ice/dispatcher/Collocated.m
index 2836b039160..cd370fd09eb 100644
--- a/objective-c/test/Ice/dispatcher/Collocated.m
+++ b/objective-c/test/Ice/dispatcher/Collocated.m
@@ -66,7 +66,7 @@ main(int argc, char* argv[])
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestDispatcher", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/dispatcher/Server.m b/objective-c/test/Ice/dispatcher/Server.m
index f02504b0612..4d8e53fa6ac 100644
--- a/objective-c/test/Ice/dispatcher/Server.m
+++ b/objective-c/test/Ice/dispatcher/Server.m
@@ -66,7 +66,7 @@ main(int argc, char* argv[])
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestDispatcher", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/enums/Client.m b/objective-c/test/Ice/enums/Client.m
index e0232a0302b..4710737cabb 100644
--- a/objective-c/test/Ice/enums/Client.m
+++ b/objective-c/test/Ice/enums/Client.m
@@ -46,7 +46,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestEnum", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/enums/Server.m b/objective-c/test/Ice/enums/Server.m
index 7b88065e3da..899a887c8f6 100644
--- a/objective-c/test/Ice/enums/Server.m
+++ b/objective-c/test/Ice/enums/Server.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestEnum", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/exceptions/Client.m b/objective-c/test/Ice/exceptions/Client.m
index 7fbc7f6bac7..401f82855e9 100644
--- a/objective-c/test/Ice/exceptions/Client.m
+++ b/objective-c/test/Ice/exceptions/Client.m
@@ -45,7 +45,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.MessageSizeMax" value:@"10"]; // 10KB max
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestExceptions", @"::Test",
                                       @"TestExceptionsMod", @"::Test::Mod",
                                     nil];
diff --git a/objective-c/test/Ice/exceptions/Collocated.m b/objective-c/test/Ice/exceptions/Collocated.m
index 624d8a4e91d..0514e0f375c 100644
--- a/objective-c/test/Ice/exceptions/Collocated.m
+++ b/objective-c/test/Ice/exceptions/Collocated.m
@@ -53,7 +53,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestExceptions", @"::Test",
                                       @"TestExceptionsMod", @"::Test::Mod",
                                     nil];
diff --git a/objective-c/test/Ice/exceptions/Server.m b/objective-c/test/Ice/exceptions/Server.m
index 9f0963a7b4f..efe71e31b80 100644
--- a/objective-c/test/Ice/exceptions/Server.m
+++ b/objective-c/test/Ice/exceptions/Server.m
@@ -65,7 +65,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestExceptions", @"::Test",
                                       @"TestExceptionsMod", @"::Test::Mod",
                                     nil];
diff --git a/objective-c/test/Ice/facets/Client.m b/objective-c/test/Ice/facets/Client.m
index 650f5c914b6..9cf3093e4ef 100644
--- a/objective-c/test/Ice/facets/Client.m
+++ b/objective-c/test/Ice/facets/Client.m
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestFacets", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/facets/Collocated.m b/objective-c/test/Ice/facets/Collocated.m
index 6dc77865cff..b85863c3184 100644
--- a/objective-c/test/Ice/facets/Collocated.m
+++ b/objective-c/test/Ice/facets/Collocated.m
@@ -53,7 +53,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestFacets", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/facets/Server.m b/objective-c/test/Ice/facets/Server.m
index 3c9f52bd776..8b0229cf451 100644
--- a/objective-c/test/Ice/facets/Server.m
+++ b/objective-c/test/Ice/facets/Server.m
@@ -56,7 +56,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestFacets", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/hold/Client.m b/objective-c/test/Ice/hold/Client.m
index ef4f2d23932..2d0755cbff7 100644
--- a/objective-c/test/Ice/hold/Client.m
+++ b/objective-c/test/Ice/hold/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestHold", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m
index f4f62982764..eb4887914b1 100644
--- a/objective-c/test/Ice/hold/Server.m
+++ b/objective-c/test/Ice/hold/Server.m
@@ -66,7 +66,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestHold", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/info/Client.m b/objective-c/test/Ice/info/Client.m
index 3b82e01aed4..ae8289c1375 100644
--- a/objective-c/test/Ice/info/Client.m
+++ b/objective-c/test/Ice/info/Client.m
@@ -46,7 +46,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInfo", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/info/Server.m b/objective-c/test/Ice/info/Server.m
index 46c88de1321..9956e1e1471 100644
--- a/objective-c/test/Ice/info/Server.m
+++ b/objective-c/test/Ice/info/Server.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestProxy", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/inheritance/Client.m b/objective-c/test/Ice/inheritance/Client.m
index b152a8c87bd..d2443f395ea 100644
--- a/objective-c/test/Ice/inheritance/Client.m
+++ b/objective-c/test/Ice/inheritance/Client.m
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInheritance", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/inheritance/Collocated.m b/objective-c/test/Ice/inheritance/Collocated.m
index 1124cc70f0c..da6e902543e 100644
--- a/objective-c/test/Ice/inheritance/Collocated.m
+++ b/objective-c/test/Ice/inheritance/Collocated.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInheritance", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/inheritance/Server.m b/objective-c/test/Ice/inheritance/Server.m
index 32177bf2c3d..744e6c49ae7 100644
--- a/objective-c/test/Ice/inheritance/Server.m
+++ b/objective-c/test/Ice/inheritance/Server.m
@@ -50,7 +50,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInheritance", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/interceptor/Client.m b/objective-c/test/Ice/interceptor/Client.m
index af14b69d378..fe3a4becb34 100644
--- a/objective-c/test/Ice/interceptor/Client.m
+++ b/objective-c/test/Ice/interceptor/Client.m
@@ -128,7 +128,7 @@ main(int argc, char* argv[])
             initData.properties = defaultClientProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInterceptor", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/invoke/Client.m b/objective-c/test/Ice/invoke/Client.m
index ea849b154fc..7e52bd7efac 100644
--- a/objective-c/test/Ice/invoke/Client.m
+++ b/objective-c/test/Ice/invoke/Client.m
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInvoke", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/invoke/Server.m b/objective-c/test/Ice/invoke/Server.m
index c85d3ab5923..734d8b8fc44 100644
--- a/objective-c/test/Ice/invoke/Server.m
+++ b/objective-c/test/Ice/invoke/Server.m
@@ -48,7 +48,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestInvoke", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/location/Client.m b/objective-c/test/Ice/location/Client.m
index 5b7714848be..1490af896fc 100644
--- a/objective-c/test/Ice/location/Client.m
+++ b/objective-c/test/Ice/location/Client.m
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
             initData.properties = defaultClientProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Default.Locator" value:@"locator:default -p 12010"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestLocation", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/location/Server.m b/objective-c/test/Ice/location/Server.m
index b1e9ddd1540..978a738a1e1 100644
--- a/objective-c/test/Ice/location/Server.m
+++ b/objective-c/test/Ice/location/Server.m
@@ -76,7 +76,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestLocation", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/metrics/Client.m b/objective-c/test/Ice/metrics/Client.m
index 7d9d59f9ce7..7a5371c5424 100644
--- a/objective-c/test/Ice/metrics/Client.m
+++ b/objective-c/test/Ice/metrics/Client.m
@@ -54,7 +54,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"IceMX.Metrics.All.GroupBy" value:@"none"];
             [initData.properties setProperty:@"Ice.Default.Host" value:@"127.0.0.1"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestMetrics", @"::Test",
                                       @"ICEMX", @"::IceMX",
                                       nil];
diff --git a/objective-c/test/Ice/metrics/Server.m b/objective-c/test/Ice/metrics/Server.m
index 9c7d255973c..4315d0940a1 100644
--- a/objective-c/test/Ice/metrics/Server.m
+++ b/objective-c/test/Ice/metrics/Server.m
@@ -68,7 +68,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"IceMX.Metrics.All.GroupBy" value:@"none"];
             [initData.properties setProperty:@"Ice.Default.Host" value:@"127.0.0.1"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestMetrics", @"::Test",
                                       @"ICEMX", @"::IceMX",
                                       nil];
diff --git a/objective-c/test/Ice/objects/Client.m b/objective-c/test/Ice/objects/Client.m
index 0d2f5f3f51b..6497160f7d4 100644
--- a/objective-c/test/Ice/objects/Client.m
+++ b/objective-c/test/Ice/objects/Client.m
@@ -119,7 +119,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestObjects", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/objects/Collocated.m b/objective-c/test/Ice/objects/Collocated.m
index 742bf8e7483..c56db771fd6 100644
--- a/objective-c/test/Ice/objects/Collocated.m
+++ b/objective-c/test/Ice/objects/Collocated.m
@@ -126,7 +126,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestObjects", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/objects/Server.m b/objective-c/test/Ice/objects/Server.m
index 72c96b730ed..a7a58ef4570 100644
--- a/objective-c/test/Ice/objects/Server.m
+++ b/objective-c/test/Ice/objects/Server.m
@@ -79,7 +79,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestObjects", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/operations/Client.m b/objective-c/test/Ice/operations/Client.m
index 5ea0fca8cee..4feab149c1c 100644
--- a/objective-c/test/Ice/operations/Client.m
+++ b/objective-c/test/Ice/operations/Client.m
@@ -71,7 +71,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.MessageSizeMax" value:@"100"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestOperations", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/operations/Collocated.m b/objective-c/test/Ice/operations/Collocated.m
index b3937a6e441..e05f428d9e9 100644
--- a/objective-c/test/Ice/operations/Collocated.m
+++ b/objective-c/test/Ice/operations/Collocated.m
@@ -54,7 +54,7 @@ main(int argc, char* argv[])
 
             [initData.properties setProperty:@"Ice.BatchAutoFlushSize" value:@"100"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestOperations", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/operations/Server.m b/objective-c/test/Ice/operations/Server.m
index 9e422112c88..d49d76a37e9 100644
--- a/objective-c/test/Ice/operations/Server.m
+++ b/objective-c/test/Ice/operations/Server.m
@@ -57,7 +57,7 @@ main(int argc, char* argv[])
             //
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestOperations", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/optional/AllTests.m b/objective-c/test/Ice/optional/AllTests.m
index 2872c72eea6..75a204ec169 100644
--- a/objective-c/test/Ice/optional/AllTests.m
+++ b/objective-c/test/Ice/optional/AllTests.m
@@ -19,7 +19,7 @@
 @end
 
 @implementation TestObjectReader
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
     [is startSlice];
@@ -34,7 +34,7 @@
 @end
 
 @implementation BObjectReader
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
     // ::Test::B
@@ -55,7 +55,7 @@
 @end
 
 @implementation CObjectReader
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
     // ::Test::C
@@ -79,7 +79,7 @@
 @end
 
 @implementation DObjectWriter
--(void) write__:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)os
 {
     [os startValue:0];
     // ::Test::D
@@ -127,7 +127,7 @@
     [super dealloc];
 }
 #endif
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     [is startValue];
     // ::Test::D
@@ -178,7 +178,7 @@
     return self;
 }
 
--(void) read__:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)is
 {
     if(f_ != nil)
     {
diff --git a/objective-c/test/Ice/optional/Client.m b/objective-c/test/Ice/optional/Client.m
index 8ad1ad7cc72..f3affee43f0 100644
--- a/objective-c/test/Ice/optional/Client.m
+++ b/objective-c/test/Ice/optional/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestOptional", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m
index 9a65e15b5ad..2c3eaa10fe0 100644
--- a/objective-c/test/Ice/optional/Server.m
+++ b/objective-c/test/Ice/optional/Server.m
@@ -49,7 +49,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestOptional", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/proxy/Client.m b/objective-c/test/Ice/proxy/Client.m
index 880bef85659..3d2fc7a1eee 100644
--- a/objective-c/test/Ice/proxy/Client.m
+++ b/objective-c/test/Ice/proxy/Client.m
@@ -46,7 +46,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestProxy", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/proxy/Collocated.m b/objective-c/test/Ice/proxy/Collocated.m
index 4e8fb75d907..bcca5d6b0c2 100644
--- a/objective-c/test/Ice/proxy/Collocated.m
+++ b/objective-c/test/Ice/proxy/Collocated.m
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
             initData.properties = defaultServerProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestProxy", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/proxy/Server.m b/objective-c/test/Ice/proxy/Server.m
index 0f339cf6016..090794c701b 100644
--- a/objective-c/test/Ice/proxy/Server.m
+++ b/objective-c/test/Ice/proxy/Server.m
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
             initData.properties = defaultServerProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestProxy", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/retry/Client.m b/objective-c/test/Ice/retry/Client.m
index 22529dbf861..fa38ca00033 100644
--- a/objective-c/test/Ice/retry/Client.m
+++ b/objective-c/test/Ice/retry/Client.m
@@ -52,7 +52,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.RetryIntervals" value:@"0 1 10 1"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestRetry", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/retry/Collocated.m b/objective-c/test/Ice/retry/Collocated.m
index a40fc2df4cb..5580ea26dd0 100644
--- a/objective-c/test/Ice/retry/Collocated.m
+++ b/objective-c/test/Ice/retry/Collocated.m
@@ -53,7 +53,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
             [initData.properties setProperty:@"Ice.RetryIntervals" value:@"0 1 10 1"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestRetry", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/retry/Server.m b/objective-c/test/Ice/retry/Server.m
index 3a588109051..0100a62ad9d 100644
--- a/objective-c/test/Ice/retry/Server.m
+++ b/objective-c/test/Ice/retry/Server.m
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
             initData.properties = defaultServerProperties(&argc, argv);
             [initData.properties setProperty:@"Ice.Warn.Dispatch" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestRetry", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/servantLocator/Client.m b/objective-c/test/Ice/servantLocator/Client.m
index f0af07ce1b9..74b85d97071 100644
--- a/objective-c/test/Ice/servantLocator/Client.m
+++ b/objective-c/test/Ice/servantLocator/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestServantLocator", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/servantLocator/Collocated.m b/objective-c/test/Ice/servantLocator/Collocated.m
index e98e08636a8..cb4feaf14ac 100644
--- a/objective-c/test/Ice/servantLocator/Collocated.m
+++ b/objective-c/test/Ice/servantLocator/Collocated.m
@@ -99,7 +99,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestServantLocator", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/servantLocator/Server.m b/objective-c/test/Ice/servantLocator/Server.m
index f2c342caaf1..98de8a86719 100644
--- a/objective-c/test/Ice/servantLocator/Server.m
+++ b/objective-c/test/Ice/servantLocator/Server.m
@@ -100,7 +100,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestServantLocator", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/services/Client.m b/objective-c/test/Ice/services/Client.m
index c7bd1081dde..5728f8b5255 100644
--- a/objective-c/test/Ice/services/Client.m
+++ b/objective-c/test/Ice/services/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestServices", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/slicing/exceptions/Client.m b/objective-c/test/Ice/slicing/exceptions/Client.m
index 815f699149c..bda1fc0c64b 100644
--- a/objective-c/test/Ice/slicing/exceptions/Client.m
+++ b/objective-c/test/Ice/slicing/exceptions/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-        initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+        initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                   @"TestSlicingExceptionsClient", @"::Test",
                                   nil];
 #endif
diff --git a/objective-c/test/Ice/slicing/exceptions/Server.m b/objective-c/test/Ice/slicing/exceptions/Server.m
index 657b20d1f61..c4203dcaa2e 100644
--- a/objective-c/test/Ice/slicing/exceptions/Server.m
+++ b/objective-c/test/Ice/slicing/exceptions/Server.m
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestSlicingExceptionsServer", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/slicing/objects/Client.m b/objective-c/test/Ice/slicing/objects/Client.m
index 3dffd605226..21e631e3625 100644
--- a/objective-c/test/Ice/slicing/objects/Client.m
+++ b/objective-c/test/Ice/slicing/objects/Client.m
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestSlicingObjectsClient", @"::Test",
                                       @"TestSlicingObjectsShared", @"::TestShared",
                                       nil];
diff --git a/objective-c/test/Ice/slicing/objects/Server.m b/objective-c/test/Ice/slicing/objects/Server.m
index 40380311a33..8addd89ae37 100644
--- a/objective-c/test/Ice/slicing/objects/Server.m
+++ b/objective-c/test/Ice/slicing/objects/Server.m
@@ -52,7 +52,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestSlicingObjectsServer", @"::Test",
                                       @"TestSlicingObjectsShared", @"::TestShared",
                                     nil];
diff --git a/objective-c/test/Ice/stream/Client.m b/objective-c/test/Ice/stream/Client.m
index d6b4719d4c3..cfa767bfac1 100644
--- a/objective-c/test/Ice/stream/Client.m
+++ b/objective-c/test/Ice/stream/Client.m
@@ -937,7 +937,7 @@ main(int argc, char* argv[])
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestStream", @"::Test",
                                       @"TestStreamSub", @"::Test::Sub",
                                       @"TestStream2", @"::Test2",
diff --git a/objective-c/test/Ice/timeout/Client.m b/objective-c/test/Ice/timeout/Client.m
index ab3f10601f3..f3b87ed8cad 100644
--- a/objective-c/test/Ice/timeout/Client.m
+++ b/objective-c/test/Ice/timeout/Client.m
@@ -65,7 +65,7 @@ main(int argc, char* argv[])
             //
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestTimeout", @"::Test",
                                       nil];
 #endif
diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m
index 12c2f311ffd..8526e8fbbfb 100644
--- a/objective-c/test/Ice/timeout/Server.m
+++ b/objective-c/test/Ice/timeout/Server.m
@@ -67,7 +67,7 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.TCP.RcvSize" value:@"50000"];
 
 #if TARGET_OS_IPHONE
-            initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
+            initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys:
                                       @"TestTimeout", @"::Test",
                                       nil];
 #endif