Fix ICE-6987

Change writeOpt to writeOptional and readOpt to readOptional

4 files changed, 127 insertions, 127 deletions

diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp
index 77a4a9af86c..4a542d58b96 100644
--- a/cpp/src/Slice/ObjCUtil.cpp
+++ b/cpp/src/Slice/ObjCUtil.cpp
@@ -1009,11 +1009,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
         out << nl;
         if(marshal)
         {
-            out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];";
+            out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
         }
         else
         {
-            out << "[" << helper << " readOpt:&" << param << " stream:is_ tag:" << tag << "];";
+            out << "[" << helper << " readOptional:&" << param << " stream:is_ tag:" << tag << "];";
         }
         return;
     }
@@ -1021,11 +1021,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
     out << nl;
     if(marshal)
     {
-        out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];";
+        out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
     }
     else
     {
-        out << param << " = [" << helper << " readOpt:is_ tag:" << tag << "];";
+        out << param << " = [" << helper << " readOptional:is_ tag:" << tag << "];";
     }
 }
 
diff --git a/objective-c/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h
index 500e704cba6..be7a1ddde60 100644
--- a/objective-c/include/objc/Ice/Stream.h
+++ b/objective-c/include/objc/Ice/Stream.h
@@ -216,9 +216,9 @@ ICE_API @protocol ICEStreamHelper
 +(id) readRetained:(id<ICEInputStream>)stream NS_RETURNS_RETAINED;
 +(id) read:(id<ICEInputStream>)stream;
 +(void) write:(id)obj stream:(id<ICEOutputStream>)stream;
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag;
-+(id) readOpt:(id<ICEInputStream>)stream tag:(ICEInt)tag;
-+(void) writeOpt:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag;
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag;
++(id) readOptional:(id<ICEInputStream>)stream tag:(ICEInt)tag;
++(void) writeOptional:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag;
 +(ICEInt) minWireSize;
 @end
 
@@ -254,7 +254,7 @@ ICE_API @interface ICEStringHelper : ICEStreamHelper
 
 ICE_API @interface ICEObjectHelper : ICEStreamHelper
 +(void)read:(ICEObject**)v stream:(id<ICEInputStream>)stream;
-+(void)readOpt:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag;
++(void)readOptional:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag;
 @end
 
 ICE_API @interface ICEProxyHelper : ICEStreamHelper
diff --git a/objective-c/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm
index 93b9d2260ce..93b8b63c2f0 100644
--- a/objective-c/src/Ice/Stream.mm
+++ b/objective-c/src/Ice/Stream.mm
@@ -1119,7 +1119,7 @@ private:
     NSException* nsex = nil;
     try
     {
-        return is_->readOpt(tag, static_cast<Ice::OptionalFormat>(format));
+        return is_->readOptional(tag, static_cast<Ice::OptionalFormat>(format));
     }
     catch(const std::exception& ex)
     {
@@ -1793,7 +1793,7 @@ private:
     NSException* nsex = nil;
     try
     {
-        return os_->writeOpt(tag, static_cast<Ice::OptionalFormat>(format));
+        return os_->writeOptional(tag, static_cast<Ice::OptionalFormat>(format));
     }
     catch(const std::exception& ex)
     {
@@ -2295,17 +2295,17 @@ private:
 {
     NSAssert(NO, @"requires override");
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     NSAssert(NO, @"requires override");
     return nil;
 }
-+(id) readOpt:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptional:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
-    return [[self readOptRetained:stream tag:tag] autorelease];
+    return [[self readOptionalRetained:stream tag:tag] autorelease];
     return nil;
 }
-+(void) writeOpt:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     NSAssert(NO, @"requires override");
 }
@@ -2329,7 +2329,7 @@ private:
     }
     [stream writeBool:[obj boolValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF1])
     {
@@ -2337,7 +2337,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     BOOL value;
     if([ICEOptionalGetter getBool:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF1])
@@ -2364,7 +2364,7 @@ private:
     }
     [stream writeByte:[obj unsignedCharValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF1])
     {
@@ -2372,7 +2372,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEByte value;
     if([ICEOptionalGetter getByte:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF1])
@@ -2399,7 +2399,7 @@ private:
     }
     [stream writeShort:[obj shortValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF2])
     {
@@ -2407,7 +2407,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEShort value;
     if([ICEOptionalGetter getShort:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF2])
@@ -2434,7 +2434,7 @@ private:
     }
     [stream writeInt:[obj intValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF4])
     {
@@ -2442,7 +2442,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEInt value;
     if([ICEOptionalGetter getInt:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF4])
@@ -2469,7 +2469,7 @@ private:
     }
     [stream writeLong:[obj longValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF8])
     {
@@ -2477,7 +2477,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICELong value;
     if([ICEOptionalGetter getLong:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF8])
@@ -2504,7 +2504,7 @@ private:
     }
     [stream writeFloat:[obj floatValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF4])
     {
@@ -2512,7 +2512,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEFloat value;
     if([ICEOptionalGetter getFloat:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF4])
@@ -2539,7 +2539,7 @@ private:
     }
     [stream writeDouble:[obj doubleValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatF8])
     {
@@ -2547,7 +2547,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEDouble value;
     if([ICEOptionalGetter getDouble:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatF8])
@@ -2574,7 +2574,7 @@ private:
     }
     [stream writeString:obj];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatVSize])
     {
@@ -2582,7 +2582,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     NSString* value;
     if([ICEOptionalGetter get:v value:&value type:[NSString class]] &&
@@ -2610,7 +2610,7 @@ private:
     }
     [stream writeEnumerator:[obj intValue] min:[self getMinValue] max:[self getMaxValue]];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatSize])
     {
@@ -2618,7 +2618,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEInt value;
     if([ICEOptionalGetter getInt:v value:&value] && [stream writeOptional:tag format:ICEOptionalFormatSize])
@@ -2665,7 +2665,7 @@ private:
 {
     [stream writeObject:obj];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatClass])
     {
@@ -2673,7 +2673,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEObject* value;
     if([ICEOptionalGetter get:v value:&value type:[ICEObject class]] &&
@@ -2682,7 +2682,7 @@ private:
         [self write:value stream:stream];
     }
 }
-+(void)readOptRetained:(id *)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(void)readOptionalRetained:(id *)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatClass])
     {
@@ -2693,7 +2693,7 @@ private:
         *v = ICENone;
     }
 }
-+(void)readOpt:(id *)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(void)readOptional:(id *)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatClass])
     {
@@ -2719,7 +2719,7 @@ private:
 {
     [stream writeProxy:obj];
 }
-+(id)readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id)readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatFSize])
     {
@@ -2727,7 +2727,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     ICEObjectPrx* value;
     if([ICEOptionalGetter get:v value:&value type:[ICEObjectPrx class]] &&
@@ -2792,7 +2792,7 @@ private:
         [obj write__:stream];
     }
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     if([stream readOptional:tag format:[helper optionalFormat]])
@@ -2801,7 +2801,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     NSObject* a;
@@ -2836,7 +2836,7 @@ private:
 {
     [stream writeSequence:obj helper:[self getElementHelper]];
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     if([stream readOptional:tag format:[helper optionalFormat]])
@@ -2845,7 +2845,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     NSArray* a;
@@ -2884,7 +2884,7 @@ private:
 {
     NSAssert(NO, @"write requires override");
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatVSize])
     {
@@ -2892,7 +2892,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     NSData* a;
     if([ICEOptionalGetter get:v value:&a type:[NSData class]] &&
@@ -2924,7 +2924,7 @@ private:
 {
     [stream writeBoolSeq:obj];
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatVSize])
     {
@@ -2932,7 +2932,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     NSData* a;
     if([ICEOptionalGetter get:v value:&a type:[NSData class]] &&
@@ -2956,7 +2956,7 @@ private:
 {
     [stream writeByteSeq:obj];
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     if([stream readOptional:tag format:ICEOptionalFormatVSize])
     {
@@ -2964,7 +2964,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
 {
     NSData* a;
     if([ICEOptionalGetter get:v value:&a type:[NSData class]] &&
@@ -3123,7 +3123,7 @@ private:
 {
     [stream writeDictionary:obj helper:[self getKeyValueHelper]];
 }
-+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     if([stream readOptional:tag format:[helper optionalFormat]])
@@ -3132,7 +3132,7 @@ private:
     }
     return ICENone;
 }
-+(void) writeOpt:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
++(void) writeOptional:(id)v stream:(id<ICEOutputStream>)s tag:(ICEInt)tag
 {
     Class helper = [self getOptionalHelper];
     NSDictionary* a;
diff --git a/objective-c/test/Ice/optional/AllTests.m b/objective-c/test/Ice/optional/AllTests.m
index 07647b3b5f8..6845e7a0b75 100644
--- a/objective-c/test/Ice/optional/AllTests.m
+++ b/objective-c/test/Ice/optional/AllTests.m
@@ -797,7 +797,7 @@ optionalAllTests(id<ICECommunicator> communicator)
             [os startEncapsulation];
             [os writeObject:a];
             DObjectWriter* writer = [DObjectWriter new];
-            [ICEObjectHelper writeOpt:writer stream:os tag:1];
+            [ICEObjectHelper writeOptional:writer stream:os tag:1];
             ICE_RELEASE(writer);
             [os endEncapsulation];
             inEncaps = [os finished];
@@ -823,17 +823,17 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEByteHelper writeOpt:p1 stream:os tag:2];
+        [ICEByteHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opByte" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [ICEByteHelper readOpt:is tag:1];
-        p3 = [ICEByteHelper readOpt:is tag:3];
+        p2 = [ICEByteHelper readOptional:is tag:1];
+        p3 = [ICEByteHelper readOptional:is tag:3];
 
         id p4 = @0x08;
-        p4 = [ICEByteHelper readOpt:is tag:89];
+        p4 = [ICEByteHelper readOptional:is tag:89];
 
         [is endEncapsulation];
         test([p2 isEqual:@0x56] && [p3 isEqual:@0x56] && [p4 isEqual:ICENone]);
@@ -855,14 +855,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEBoolHelper writeOpt:p1 stream:os tag:2];
+        [ICEBoolHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opBool" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [ICEBoolHelper readOpt:is tag:1];
-        p3 = [ICEBoolHelper readOpt:is tag:3];
+        p2 = [ICEBoolHelper readOptional:is tag:1];
+        p3 = [ICEBoolHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@YES] && [p3 isEqual:@YES]);
 
@@ -883,14 +883,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEShortHelper writeOpt:p1 stream:os tag:2];
+        [ICEShortHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opShort" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [ICEShortHelper readOpt:is tag:1];
-        p3 = [ICEShortHelper readOpt:is tag:3];
+        p2 = [ICEShortHelper readOptional:is tag:1];
+        p3 = [ICEShortHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@56] && [p3 isEqual:@56]);
 
@@ -911,14 +911,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEIntHelper writeOpt:p1 stream:os tag:2];
+        [ICEIntHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opInt" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [ICEIntHelper readOpt:is tag:1];
-        p3 = [ICEIntHelper readOpt:is tag:3];
+        p2 = [ICEIntHelper readOptional:is tag:1];
+        p3 = [ICEIntHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@56] && [p3 isEqual:@56]);
 
@@ -939,14 +939,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICELongHelper writeOpt:p1 stream:os tag:1];
+        [ICELongHelper writeOptional:p1 stream:os tag:1];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opLong" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p3 = [ICELongHelper readOpt:is tag:2];
-        p2 = [ICELongHelper readOpt:is tag:3];
+        p3 = [ICELongHelper readOptional:is tag:2];
+        p2 = [ICELongHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@56] && [p3 isEqual:@56]);
 
@@ -967,14 +967,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEFloatHelper writeOpt:p1 stream:os tag:2];
+        [ICEFloatHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opFloat" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p3 = [ICEFloatHelper readOpt:is tag:1];
-        p2 = [ICEFloatHelper readOpt:is tag:3];
+        p3 = [ICEFloatHelper readOptional:is tag:1];
+        p2 = [ICEFloatHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@1.0f] && [p3 isEqual:@1.0f]);
 
@@ -995,14 +995,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEDoubleHelper writeOpt:p1 stream:os tag:2];
+        [ICEDoubleHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opDouble" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p3 = [ICEDoubleHelper readOpt:is tag:1];
-        p2 = [ICEDoubleHelper readOpt:is tag:3];
+        p3 = [ICEDoubleHelper readOptional:is tag:1];
+        p2 = [ICEDoubleHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@1.0] && [p3 isEqual:@1.0]);
 
@@ -1023,14 +1023,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEStringHelper writeOpt:p1 stream:os tag:2];
+        [ICEStringHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opString" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [ICEStringHelper readOpt:is tag:1];
-        p3 = [ICEStringHelper readOpt:is tag:3];
+        p2 = [ICEStringHelper readOptional:is tag:1];
+        p3 = [ICEStringHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqualToString:@"test"] && [p3 isEqualToString:@"test"]);
 
@@ -1051,14 +1051,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalMyEnumHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalMyEnumHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opMyEnum" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalMyEnumHelper readOpt:is tag:1];
-        p3 = [TestOptionalMyEnumHelper readOpt:is tag:3];
+        p2 = [TestOptionalMyEnumHelper readOptional:is tag:1];
+        p3 = [TestOptionalMyEnumHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:@(TestOptionalMyEnumMember)] && [p3 isEqual:@(TestOptionalMyEnumMember)]);
 
@@ -1079,14 +1079,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalSmallStructHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalSmallStructHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opSmallStruct" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalSmallStructHelper readOpt:is tag:1];
-        p3 = [TestOptionalSmallStructHelper readOpt:is tag:3];
+        p2 = [TestOptionalSmallStructHelper readOptional:is tag:1];
+        p3 = [TestOptionalSmallStructHelper readOptional:is tag:3];
         [is endEncapsulation];
         test(((TestOptionalSmallStruct*)p2).m == 56 && ((TestOptionalSmallStruct*)p3).m== 56);
 
@@ -1107,14 +1107,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalFixedStructHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalFixedStructHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opFixedStruct" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalFixedStructHelper readOpt:is tag:1];
-        p3 = [TestOptionalFixedStructHelper readOpt:is tag:3];
+        p2 = [TestOptionalFixedStructHelper readOptional:is tag:1];
+        p3 = [TestOptionalFixedStructHelper readOptional:is tag:3];
         [is endEncapsulation];
         test(((TestOptionalFixedStruct*)p2).m == 56 && ((TestOptionalFixedStruct*)p3).m== 56);
 
@@ -1135,14 +1135,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalVarStructHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalVarStructHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opVarStruct" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalVarStructHelper readOpt:is tag:1];
-        p3 = [TestOptionalVarStructHelper readOpt:is tag:3];
+        p2 = [TestOptionalVarStructHelper readOptional:is tag:1];
+        p3 = [TestOptionalVarStructHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([((TestOptionalVarStruct*)p2).m isEqual:@"test"] && [((TestOptionalVarStruct*)p3).m isEqual:@"test"]);
 
@@ -1164,14 +1164,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEObjectHelper writeOpt:p1 stream:os tag:2];
+        [ICEObjectHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opOneOptional" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        [ICEObjectHelper readOpt:&p2 stream:is tag:1];
-        [ICEObjectHelper readOpt:&p3 stream:is tag:3];
+        [ICEObjectHelper readOptional:&p2 stream:is tag:1];
+        [ICEObjectHelper readOptional:&p3 stream:is tag:3];
         [is endEncapsulation];
         test([p2 isKindOfClass:[TestOptionalOneOptional class]] && [p3 isKindOfClass:[TestOptionalOneOptional class]]);
         test(((TestOptionalOneOptional*)p2).a == 58 && ((TestOptionalOneOptional*)p3).a == 58);
@@ -1195,14 +1195,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [ICEProxyHelper writeOpt:p1 stream:os tag:2];
+        [ICEProxyHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opOneOptionalProxy" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalOneOptionalPrxHelper readOpt:is tag:1];
-        p3 = [TestOptionalOneOptionalPrxHelper readOpt:is tag:3];
+        p2 = [TestOptionalOneOptionalPrxHelper readOptional:is tag:1];
+        p3 = [TestOptionalOneOptionalPrxHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isKindOfClass:[TestOptionalOneOptionalPrx class]] &&
              [p3 isKindOfClass:[TestOptionalOneOptionalPrx class]]);
@@ -1221,15 +1221,15 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalFHelper writeOpt:f stream:os tag:1];
-        [TestOptionalFHelper writeOpt:f.ae stream:os tag:2];
+        [TestOptionalFHelper writeOptional:f stream:os tag:1];
+        [TestOptionalFHelper writeOptional:f.ae stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
 
         is = [ICEUtil createInputStream:communicator data:inEncaps];
         [is startEncapsulation];
         id a;
-        [TestOptionalAHelper readOpt:&a stream:is tag:2];
+        [TestOptionalAHelper readOptional:&a stream:is tag:2];
         [is endEncapsulation];
         test(a != nil && [a isKindOfClass:[TestOptionalA class]] && ((TestOptionalA*)a).requiredA == 56);
     }
@@ -1249,14 +1249,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalByteSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalByteSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opByteSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalByteSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalByteSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalByteSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalByteSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1278,14 +1278,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalBoolSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalBoolSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opBoolSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalBoolSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalBoolSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalBoolSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalBoolSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1307,14 +1307,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalShortSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalShortSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opShortSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalShortSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalShortSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalShortSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalShortSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1336,14 +1336,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalIntSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalIntSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opIntSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalIntSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalIntSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalIntSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalIntSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1365,14 +1365,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalLongSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalLongSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opLongSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalLongSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalLongSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalLongSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalLongSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1394,14 +1394,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalFloatSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalFloatSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opFloatSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalFloatSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalFloatSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalFloatSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalFloatSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1423,14 +1423,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalDoubleSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalDoubleSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opDoubleSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalDoubleSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalDoubleSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalDoubleSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalDoubleSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:bs] && [p3 isEqual:bs]);
 
@@ -1453,14 +1453,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalStringSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalStringSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opStringSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalStringSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalStringSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalStringSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalStringSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test([p2 isEqual:ss] && [p3 isEqual:ss]);
 
@@ -1496,14 +1496,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalFixedStructSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalFixedStructSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opFixedStructSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalFixedStructSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalFixedStructSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalFixedStructSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalFixedStructSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test(p2 != nil && p3 != nil);
         test([p2 isEqual:fss] && [p3 isEqual:fss]);
@@ -1540,14 +1540,14 @@ optionalAllTests(id<ICECommunicator> communicator)
 
         os = [ICEUtil createOutputStream:communicator];
         [os startEncapsulation];
-        [TestOptionalVarStructSeqHelper writeOpt:p1 stream:os tag:2];
+        [TestOptionalVarStructSeqHelper writeOptional:p1 stream:os tag:2];
         [os endEncapsulation];
         inEncaps = [os finished];
         [initial ice_invoke:@"opVarStructSeq" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps];
         is = [ICEUtil createInputStream:communicator data:outEncaps];
         [is startEncapsulation];
-        p2 = [TestOptionalVarStructSeqHelper readOpt:is tag:1];
-        p3 = [TestOptionalVarStructSeqHelper readOpt:is tag:3];
+        p2 = [TestOptionalVarStructSeqHelper readOptional:is tag:1];
+        p3 = [TestOptionalVarStructSeqHelper readOptional:is tag:3];
         [is endEncapsulation];
         test(p2 != nil && p3 != nil);
         test([p2 isEqual:fss] && [p3 isEqual:fss]);