2 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index 5c73c51d6f1..c21da7740f3 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.cpp
@@ -1212,7 +1212,7 @@ Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat)
         }
         else if(tag < readTag)
         {
-            skipOpt(format); // Skip optional data members
+            skipOptional(format); // Skip optional data members
         }
         else
         {
@@ -1229,7 +1229,7 @@ Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat)
 }
 
 void
-Ice::InputStream::skipOpt(OptionalFormat type)
+Ice::InputStream::skipOptional(OptionalFormat type)
 {
     switch(type)
     {
@@ -1283,7 +1283,7 @@ Ice::InputStream::skipOpt(OptionalFormat type)
 }
 
 void
-Ice::InputStream::skipOpts()
+Ice::InputStream::skipOptionals()
 {
     //
     // Skip remaining un-read optional members.
@@ -1307,7 +1307,7 @@ Ice::InputStream::skipOpts()
         {
             skipSize();
         }
-        skipOpt(format);
+        skipOptional(format);
     }
 }
 
@@ -2181,7 +2181,7 @@ Ice::InputStream::EncapsDecoder11::endSlice()
 {
     if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
     {
-        _stream->skipOpts();
+        _stream->skipOptionals();
     }
 
     //
@@ -2298,7 +2298,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice()
 }
 
 bool
-Ice::InputStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat)
+Ice::InputStream::EncapsDecoder11::readOptional(Ice::Int readTag, Ice::OptionalFormat expectedFormat)
 {
     if(!_current)
     {
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 318f411cc4a..605855d5460 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -1265,7 +1265,7 @@ Ice::OutputStream::EncapsEncoder11::endSlice()
 }
 
 bool
-Ice::OutputStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format)
+Ice::OutputStream::EncapsEncoder11::writeOptional(Ice::Int tag, Ice::OptionalFormat format)
 {
     if(!_current)
     {