Replaced double-underscores in java and java-compat

39 files changed, 495 insertions, 494 deletions

diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java
index 6855c538e92..ad14827ff88 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java
@@ -38,7 +38,7 @@ public interface Blobject extends com.zeroc.Ice.Object
         throws UserException;
 
     @Override
-    default CompletionStage<OutputStream> __dispatch(com.zeroc.IceInternal.Incoming in, Current current)
+    default CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
     {
         byte[] inEncaps = in.readParamEncaps();
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java b/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java
index 3498fcfaa2c..2e3acf67f54 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java
@@ -44,7 +44,7 @@ public interface BlobjectAsync extends com.zeroc.Ice.Object
         throws UserException;
 
     @Override
-    default CompletionStage<OutputStream> __dispatch(com.zeroc.IceInternal.Incoming in, Current current)
+    default CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
     {
         byte[] inEncaps = in.readParamEncaps();
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java
index 035c6b39f15..3ee8b9f7054 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java
@@ -206,16 +206,16 @@ public final class CommunicatorI implements Communicator
     @Override
     public void flushBatchRequests()
     {
-        __flushBatchRequestsAsync().__wait();
+        _iceI_flushBatchRequestsAsync().waitForResponse();
     }
 
     @Override
     public java.util.concurrent.CompletableFuture<Void> flushBatchRequestsAsync()
     {
-        return __flushBatchRequestsAsync();
+        return _iceI_flushBatchRequestsAsync();
     }
 
-    public com.zeroc.IceInternal.CommunicatorFlushBatch __flushBatchRequestsAsync()
+    public com.zeroc.IceInternal.CommunicatorFlushBatch _iceI_flushBatchRequestsAsync()
     {
         com.zeroc.IceInternal.OutgoingConnectionFactory connectionFactory = _instance.outgoingConnectionFactory();
         com.zeroc.IceInternal.ObjectAdapterFactory adapterFactory = _instance.objectAdapterFactory();
@@ -224,19 +224,19 @@ public final class CommunicatorI implements Communicator
         // This callback object receives the results of all invocations
         // of Connection.begin_flushBatchRequests.
         //
-        com.zeroc.IceInternal.CommunicatorFlushBatch __f =
+        com.zeroc.IceInternal.CommunicatorFlushBatch f =
             new com.zeroc.IceInternal.CommunicatorFlushBatch(this, _instance);
 
-        connectionFactory.flushAsyncBatchRequests(__f);
-        adapterFactory.flushAsyncBatchRequests(__f);
+        connectionFactory.flushAsyncBatchRequests(f);
+        adapterFactory.flushAsyncBatchRequests(f);
 
         //
         // Inform the callback that we have finished initiating all of the
         // flush requests.
         //
-        __f.ready();
+        f.ready();
 
-        return __f;
+        return f;
     }
 
     @Override
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
index 24ce63ef54d..3b73897443b 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
@@ -431,16 +431,16 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
     @Override
     public void flushBatchRequests()
     {
-        ObjectPrx.__waitForCompletion(flushBatchRequestsAsync());
+        ObjectPrx.waitForResponseForCompletion(flushBatchRequestsAsync());
     }
 
     @Override
     public java.util.concurrent.CompletableFuture<Void> flushBatchRequestsAsync()
     {
-        com.zeroc.IceInternal.ConnectionFlushBatch __f =
+        com.zeroc.IceInternal.ConnectionFlushBatch f =
             new com.zeroc.IceInternal.ConnectionFlushBatch(this, _communicator, _instance);
-        __f.invoke();
-        return __f;
+        f.invoke();
+        return f;
     }
 
     @Override
@@ -850,10 +850,10 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
                             throw ex;
                         }
 
-                        _readProtocol.ice_read(_readStream);
+                        _readProtocol.read(_readStream);
                         Protocol.checkSupportedProtocol(_readProtocol);
 
-                        _readProtocolEncoding.ice_read(_readStream);
+                        _readProtocolEncoding.read(_readStream);
                         Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding);
 
                         _readStream.readByte(); // messageType
@@ -1849,8 +1849,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
             //
             OutputStream os = new OutputStream(_instance, Protocol.currentProtocolEncoding);
             os.writeBlob(Protocol.magic);
-            Protocol.currentProtocol.ice_write(os);
-            Protocol.currentProtocolEncoding.ice_write(os);
+            Protocol.currentProtocol.write(os);
+            Protocol.currentProtocolEncoding.write(os);
             os.writeByte(Protocol.closeConnectionMsg);
             os.writeByte((byte) 0); // compression status: always report 0 for
                                     // CloseConnection in Java.
@@ -1882,8 +1882,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
         {
             OutputStream os = new OutputStream(_instance, Protocol.currentProtocolEncoding);
             os.writeBlob(Protocol.magic);
-            Protocol.currentProtocol.ice_write(os);
-            Protocol.currentProtocolEncoding.ice_write(os);
+            Protocol.currentProtocol.write(os);
+            Protocol.currentProtocolEncoding.write(os);
             os.writeByte(Protocol.validateConnectionMsg);
             os.writeByte((byte) 0);
             os.writeInt(Protocol.headerSize); // Message size.
@@ -1933,8 +1933,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
                 if(_writeStream.isEmpty())
                 {
                     _writeStream.writeBlob(Protocol.magic);
-                    Protocol.currentProtocol.ice_write(_writeStream);
-                    Protocol.currentProtocolEncoding.ice_write(_writeStream);
+                    Protocol.currentProtocol.write(_writeStream);
+                    Protocol.currentProtocolEncoding.write(_writeStream);
                     _writeStream.writeByte(Protocol.validateConnectionMsg);
                     _writeStream.writeByte((byte) 0); // Compression status
                                                       // (always zero for
@@ -2006,10 +2006,10 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
                     throw ex;
                 }
 
-                _readProtocol.ice_read(_readStream);
+                _readProtocol.read(_readStream);
                 Protocol.checkSupportedProtocol(_readProtocol);
 
-                _readProtocolEncoding.ice_read(_readStream);
+                _readProtocolEncoding.read(_readStream);
                 Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding);
 
                 byte messageType = _readStream.readByte();
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java b/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java
index d4cb560b808..58f7478dc00 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java
@@ -37,7 +37,7 @@ public abstract class DispatchInterceptor implements com.zeroc.Ice.Object
         throws UserException;
 
     @Override
-    public CompletionStage<OutputStream> __dispatch(com.zeroc.IceInternal.Incoming in, Current current)
+    public CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
     {
         return dispatch(in);
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
index 1e9803ff774..0da5e67d431 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
@@ -695,7 +695,7 @@ public class InputStream
 
         if(encoding != null)
         {
-            encoding.ice_read(this);
+            encoding.read(this);
             _buf.b.position(_buf.b.position() - 6);
         }
         else
@@ -2326,7 +2326,7 @@ public class InputStream
             //
             // Read the instance.
             //
-            v.__read(_stream);
+            v._iceRead(_stream);
 
             if(_patchMap != null)
             {
@@ -2501,7 +2501,7 @@ public class InputStream
                 //
                 if(userEx != null)
                 {
-                    userEx.__read(_stream);
+                    userEx._read(_stream);
                     if(usesClasses)
                     {
                         readPendingValues();
@@ -2662,7 +2662,7 @@ public class InputStream
                 // For the 1.0 encoding, the type ID for the base Object class
                 // marks the last slice.
                 //
-                if(_typeId.equals(Value.ice_staticId))
+                if(_typeId.equals(Value.ice_staticId()))
                 {
                     throw new NoValueFactoryException("", mostDerivedId);
                 }
@@ -2806,7 +2806,7 @@ public class InputStream
                 //
                 if(userEx != null)
                 {
-                    userEx.__read(_stream);
+                    userEx._read(_stream);
                     throw userEx;
 
                     // Never reached.
@@ -3225,7 +3225,7 @@ public class InputStream
                     // We pass the "::Ice::Object" ID to indicate that this is the
                     // last chance to preserve the instance.
                     //
-                    v = newInstance(Value.ice_staticId);
+                    v = newInstance(Value.ice_staticId());
                     if(v == null)
                     {
                         v = new UnknownSlicedValue(mostDerivedId);
@@ -3285,7 +3285,7 @@ public class InputStream
                 for(int j = 0; j < info.instances.length; ++j)
                 {
                     addPatchEntry(table[j],
-                                  new SequencePatcher<Value>(info.instances, Value.class, Value.ice_staticId, j));
+                                  new SequencePatcher<Value>(info.instances, Value.class, Value.ice_staticId(), j));
                 }
             }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java
index f3757a8817e..7a2cb5cc095 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java
@@ -35,17 +35,17 @@ public class InterfaceByValue extends Value
     }
 
     @Override
-    protected void __writeImpl(OutputStream __os)
+    protected void _iceWriteImpl(OutputStream ostr)
     {
-        __os.startSlice(ice_id(), -1, true);
-        __os.endSlice();
+        ostr.startSlice(ice_id(), -1, true);
+        ostr.endSlice();
     }
 
     @Override
-    protected void __readImpl(InputStream __is)
+    protected void _iceReadImpl(InputStream istr)
     {
-        __is.startSlice();
-        __is.endSlice();
+        istr.startSlice();
+        istr.endSlice();
     }
 
     public static final long serialVersionUID = 0L;
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java
index 6c230280d72..3e8efe94934 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java
@@ -18,11 +18,9 @@ import com.zeroc.IceInternal.Incoming;
  **/
 public interface Object
 {
-    public static final String ice_staticId = "::Ice::Object";
-
-    public final static String[] __ids =
+    final static String[] _iceIds =
     {
-        ice_staticId
+        "::Ice::Object"
     };
 
     /**
@@ -99,7 +97,7 @@ public interface Object
      **/
     default String[] ice_ids(Current current)
     {
-        return __ids;
+        return _iceIds;
     }
 
     /**
@@ -110,7 +108,7 @@ public interface Object
      **/
     default String ice_id(Current current)
     {
-        return __ids[0];
+        return ice_staticId();
     }
 
     /**
@@ -120,7 +118,7 @@ public interface Object
      **/
     public static String ice_staticId()
     {
-        return ice_staticId;
+        return _iceIds[0];
     }
 
     /**
@@ -153,7 +151,7 @@ public interface Object
         return 0;
     }
 
-    final static String[] __ops =
+    final static String[] _iceOps =
     {
         "ice_id",
         "ice_ids",
@@ -176,13 +174,13 @@ public interface Object
     {
         Incoming in = (Incoming)request;
         in.startOver();
-        return __dispatch(in, in.getCurrent());
+        return _iceDispatch(in, in.getCurrent());
     }
 
-    default CompletionStage<OutputStream> __dispatch(Incoming in, Current current)
+    default CompletionStage<OutputStream> _iceDispatch(Incoming in, Current current)
         throws UserException
     {
-        int pos = java.util.Arrays.binarySearch(__ops, current.operation);
+        int pos = java.util.Arrays.binarySearch(_iceOps, current.operation);
         if(pos < 0)
         {
             throw new OperationNotExistException(current.id, current.facet, current.operation);
@@ -192,19 +190,19 @@ public interface Object
         {
             case 0:
             {
-                return ___ice_id(this, in, current);
+                return _iceD_ice_id(this, in, current);
             }
             case 1:
             {
-                return ___ice_ids(this, in, current);
+                return _iceD_ice_ids(this, in, current);
             }
             case 2:
             {
-                return ___ice_isA(this, in, current);
+                return _iceD_ice_isA(this, in, current);
             }
             case 3:
             {
-                return ___ice_ping(this, in, current);
+                return _iceD_ice_ping(this, in, current);
             }
         }
 
@@ -212,68 +210,68 @@ public interface Object
         throw new OperationNotExistException(current.id, current.facet, current.operation);
     }
 
-    default void __write(OutputStream __os)
+    default void _iceWrite(OutputStream ostr)
     {
-         __os.startValue(null);
-         __writeImpl(__os);
-         __os.endValue();
+         ostr.startValue(null);
+         _iceWriteImpl(ostr);
+         ostr.endValue();
     }
 
-    default void __writeImpl(OutputStream __os)
+    default void _iceWriteImpl(OutputStream ostr)
     {
     }
 
-    default void __read(InputStream __is)
+    default void _iceRead(InputStream istr)
     {
-         __is.startValue();
-         __readImpl(__is);
-         __is.endValue(false);
+         istr.startValue();
+         _iceReadImpl(istr);
+         istr.endValue(false);
     }
 
-    default void __readImpl(InputStream __is)
+    default void _iceReadImpl(InputStream istr)
     {
     }
 
-    static CompletionStage<OutputStream> ___ice_isA(Object __obj, Incoming __inS, Current __current)
+    static CompletionStage<OutputStream> _iceD_ice_isA(Object obj, Incoming inS, Current current)
     {
-        InputStream __is = __inS.startReadParams();
-        String __id = __is.readString();
-        __inS.endReadParams();
-        boolean __ret = __obj.ice_isA(__id, __current);
-        OutputStream __os = __inS.startWriteParams();
-        __os.writeBool(__ret);
-        __inS.endWriteParams(__os);
-        return __inS.setResult(__os);
+        InputStream istr = inS.startReadParams();
+        String id = istr.readString();
+        inS.endReadParams();
+        boolean ret = obj.ice_isA(id, current);
+        OutputStream ostr = inS.startWriteParams();
+        ostr.writeBool(ret);
+        inS.endWriteParams(ostr);
+        return inS.setResult(ostr);
     }
 
-    static CompletionStage<OutputStream> ___ice_ping(Object __obj, Incoming __inS, Current __current)
+    static CompletionStage<OutputStream> _iceD_ice_ping(Object obj, Incoming inS, Current current)
     {
-        __inS.readEmptyParams();
-        __obj.ice_ping(__current);
-        return __inS.setResult(__inS.writeEmptyParams());
+        inS.readEmptyParams();
+        obj.ice_ping(current);
+        return inS.setResult(inS.writeEmptyParams());
     }
 
-    static CompletionStage<OutputStream> ___ice_ids(Object __obj, Incoming __inS, Current __current)
+    static CompletionStage<OutputStream> _iceD_ice_ids(Object obj, Incoming inS, Current current)
     {
-        __inS.readEmptyParams();
-        String[] __ret = __obj.ice_ids(__current);
-        OutputStream __os = __inS.startWriteParams();
-        __os.writeStringSeq(__ret);
-        __inS.endWriteParams(__os);
-        return __inS.setResult(__os);
+        inS.readEmptyParams();
+        String[] ret = obj.ice_ids(current);
+        OutputStream ostr = inS.startWriteParams();
+        ostr.writeStringSeq(ret);
+        inS.endWriteParams(ostr);
+        return inS.setResult(ostr);
     }
 
-    static CompletionStage<OutputStream> ___ice_id(Object __obj, Incoming __inS, Current __current)
+    static CompletionStage<OutputStream> _iceD_ice_id(Object obj, Incoming inS, Current current)
     {
-        __inS.readEmptyParams();
-        String __ret = __obj.ice_id(__current);
-        OutputStream __os = __inS.startWriteParams();
-        __os.writeString(__ret);
-        __inS.endWriteParams(__os);
-        return __inS.setResult(__os);
+        inS.readEmptyParams();
+        String ret = obj.ice_id(current);
+        OutputStream ostr = inS.startWriteParams();
+        ostr.writeString(ret);
+        inS.endWriteParams(ostr);
+        return inS.setResult(ostr);
     }
 
-    static String __operationModeToString(OperationMode mode)
+    static String _iceOperationModeToString(OperationMode mode)
     {
         if(mode == OperationMode.Normal)
         {
@@ -292,7 +290,7 @@ public interface Object
         return "???";
     }
 
-    static void __checkMode(OperationMode expected, OperationMode received)
+    static void _iceCheckMode(OperationMode expected, OperationMode received)
     {
         if(expected == null)
         {
@@ -312,8 +310,8 @@ public interface Object
             {
                 MarshalException ex = new MarshalException();
                 ex.reason = "unexpected operation mode. expected = "
-                    + __operationModeToString(expected) + " received = "
-                    + __operationModeToString(received);
+                    + _iceOperationModeToString(expected) + " received = "
+                    + _iceOperationModeToString(received);
                 throw ex;
             }
         }
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java
index 2ae50796171..1bbe0aa90e6 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java
@@ -517,7 +517,7 @@ public final class ObjectAdapterI implements ObjectAdapter
     {
         checkForDeactivation();
 
-        com.zeroc.IceInternal.Reference ref = ((_ObjectPrxI)proxy).__reference();
+        com.zeroc.IceInternal.Reference ref = ((_ObjectPrxI)proxy)._getReference();
         return findFacet(ref.getIdentity(), ref.getFacet());
     }
 
@@ -673,7 +673,7 @@ public final class ObjectAdapterI implements ObjectAdapter
         // it can be called for AMI invocations if the proxy has no delegate set yet.
         //
 
-        com.zeroc.IceInternal.Reference ref = ((_ObjectPrxI)proxy).__reference();
+        com.zeroc.IceInternal.Reference ref = ((_ObjectPrxI)proxy)._getReference();
         if(ref.isWellKnown())
         {
             //
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
index 22576393a9f..e28558dedf6 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
@@ -35,12 +35,12 @@ public interface ObjectPrx
      * Tests whether this object supports a specific Slice interface.
      *
      * @param id The type ID of the Slice interface to test against.
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return <code>true</code> if the target object has the interface
      * specified by <code>id</code> or derives from the interface
      * specified by <code>id</code>.
      **/
-    boolean ice_isA(String id, java.util.Map<String, String> __context);
+    boolean ice_isA(String id, java.util.Map<String, String> context);
 
     /**
      * Tests whether this object supports a specific Slice interface.
@@ -54,10 +54,10 @@ public interface ObjectPrx
      * Tests whether this object supports a specific Slice interface.
      *
      * @param id The type ID of the Slice interface to test against.
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return A future for the completion of the request.
      **/
-    java.util.concurrent.CompletableFuture<Boolean> ice_isAAsync(String id, java.util.Map<String, String> __context);
+    java.util.concurrent.CompletableFuture<Boolean> ice_isAAsync(String id, java.util.Map<String, String> context);
 
     /**
      * Tests whether the target object of this proxy can be reached.
@@ -67,9 +67,9 @@ public interface ObjectPrx
     /**
      * Tests whether the target object of this proxy can be reached.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      **/
-    void ice_ping(java.util.Map<String, String> __context);
+    void ice_ping(java.util.Map<String, String> context);
 
     /**
      * Tests whether the target object of this proxy can be reached.
@@ -81,10 +81,10 @@ public interface ObjectPrx
     /**
      * Tests whether the target object of this proxy can be reached.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return A future for the completion of the request.
      **/
-    java.util.concurrent.CompletableFuture<Void> ice_pingAsync(java.util.Map<String, String> __context);
+    java.util.concurrent.CompletableFuture<Void> ice_pingAsync(java.util.Map<String, String> context);
 
     /**
      * Returns the Slice type IDs of the interfaces supported by the target object of this proxy.
@@ -97,11 +97,11 @@ public interface ObjectPrx
     /**
      * Returns the Slice type IDs of the interfaces supported by the target object of this proxy.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived
      * order. The first element of the returned array is always <code>::Ice::Object</code>.
      **/
-    String[] ice_ids(java.util.Map<String, String> __context);
+    String[] ice_ids(java.util.Map<String, String> context);
 
     /**
      * Returns the Slice type IDs of the interfaces supported by the target object of this proxy.
@@ -113,10 +113,10 @@ public interface ObjectPrx
     /**
      * Returns the Slice type IDs of the interfaces supported by the target object of this proxy.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return A future for the completion of the request.
      **/
-    java.util.concurrent.CompletableFuture<String[]> ice_idsAsync(java.util.Map<String, String> __context);
+    java.util.concurrent.CompletableFuture<String[]> ice_idsAsync(java.util.Map<String, String> context);
 
     /**
      * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy.
@@ -128,10 +128,10 @@ public interface ObjectPrx
     /**
      * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return The Slice type ID of the most-derived interface.
      **/
-    String ice_id(java.util.Map<String, String> __context);
+    String ice_id(java.util.Map<String, String> context);
 
     /**
      * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy.
@@ -143,10 +143,10 @@ public interface ObjectPrx
     /**
      * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy.
      *
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return A future for the completion of the request.
      **/
-    java.util.concurrent.CompletableFuture<String> ice_idAsync(java.util.Map<String, String> __context);
+    java.util.concurrent.CompletableFuture<String> ice_idAsync(java.util.Map<String, String> context);
 
     /**
      * Invokes an operation dynamically.
@@ -167,14 +167,14 @@ public interface ObjectPrx
      * @param operation The name of the operation to invoke.
      * @param mode The operation mode (normal or idempotent).
      * @param inParams The encoded in-parameters for the operation.
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return The results of the invocation.
      *
      * @see Blobject
      * @see OperationMode
      **/
     com.zeroc.Ice.Object.Ice_invokeResult ice_invoke(String operation, OperationMode mode, byte[] inParams,
-                                                     java.util.Map<String, String> __context);
+                                                     java.util.Map<String, String> context);
 
     /**
      * Invokes an operation dynamically and asynchronously.
@@ -199,7 +199,7 @@ public interface ObjectPrx
      * @param mode The operation mode (normal or idempotent).
      * @param inParams The encoded in-parameters for the operation.
      * for the operation. The return value follows any out-parameters.
-     * @param __context The context map for the invocation.
+     * @param context The context map for the invocation.
      * @return A future for the completion of the request.
      *
      * @see Blobject
@@ -209,7 +209,7 @@ public interface ObjectPrx
         String operation,
         OperationMode mode,
         byte[] inParams,
-        java.util.Map<String, String> __context);
+        java.util.Map<String, String> context);
 
     /**
      * Returns the identity embedded in this proxy.
@@ -242,7 +242,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_context(java.util.Map<String, String> newContext)
     {
-        return __ice_context(newContext);
+        return _ice_context(newContext);
     }
 
     /**
@@ -275,7 +275,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_adapterId(String newAdapterId)
     {
-        return __ice_adapterId(newAdapterId);
+        return _ice_adapterId(newAdapterId);
     }
 
     /**
@@ -295,7 +295,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_endpoints(Endpoint[] newEndpoints)
     {
-        return __ice_endpoints(newEndpoints);
+        return _ice_endpoints(newEndpoints);
     }
 
     /**
@@ -332,7 +332,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_locatorCacheTimeout(int newTimeout)
     {
-        return __ice_locatorCacheTimeout(newTimeout);
+        return _ice_locatorCacheTimeout(newTimeout);
     }
 
     /**
@@ -344,7 +344,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_invocationTimeout(int newTimeout)
     {
-        return __ice_invocationTimeout(newTimeout);
+        return _ice_invocationTimeout(newTimeout);
     }
 
     /**
@@ -362,7 +362,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_connectionCached(boolean newCache)
     {
-        return __ice_connectionCached(newCache);
+        return _ice_connectionCached(newCache);
     }
 
     /**
@@ -384,7 +384,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_endpointSelection(EndpointSelectionType newType)
     {
-        return __ice_endpointSelection(newType);
+        return _ice_endpointSelection(newType);
     }
 
     /**
@@ -404,7 +404,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_secure(boolean b)
     {
-        return __ice_secure(b);
+        return _ice_secure(b);
     }
 
     /**
@@ -416,7 +416,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_encodingVersion(EncodingVersion e)
     {
-        return __ice_encodingVersion(e);
+        return _ice_encodingVersion(e);
     }
 
     /**
@@ -444,7 +444,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_preferSecure(boolean b)
     {
-        return __ice_preferSecure(b);
+        return _ice_preferSecure(b);
     }
 
     /**
@@ -463,7 +463,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_router(RouterPrx router)
     {
-        return __ice_router(router);
+        return _ice_router(router);
     }
 
     /**
@@ -481,7 +481,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_locator(LocatorPrx locator)
     {
-        return __ice_locator(locator);
+        return _ice_locator(locator);
     }
 
     /**
@@ -499,7 +499,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_collocationOptimized(boolean b)
     {
-        return __ice_collocationOptimized(b);
+        return _ice_collocationOptimized(b);
     }
 
     /**
@@ -509,7 +509,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_twoway()
     {
-        return __ice_twoway();
+        return _ice_twoway();
     }
 
     /**
@@ -525,7 +525,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_oneway()
     {
-        return __ice_oneway();
+        return _ice_oneway();
     }
 
     /**
@@ -541,7 +541,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_batchOneway()
     {
-        return __ice_batchOneway();
+        return _ice_batchOneway();
     }
 
     /**
@@ -557,7 +557,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_datagram()
     {
-        return __ice_datagram();
+        return _ice_datagram();
     }
 
     /**
@@ -573,7 +573,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_batchDatagram()
     {
-        return __ice_batchDatagram();
+        return _ice_batchDatagram();
     }
 
     /**
@@ -590,7 +590,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_compress(boolean co)
     {
-        return __ice_compress(co);
+        return _ice_compress(co);
     }
 
     /**
@@ -601,7 +601,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_timeout(int t)
     {
-        return __ice_timeout(t);
+        return _ice_timeout(t);
     }
 
     /**
@@ -614,7 +614,7 @@ public interface ObjectPrx
      **/
     default ObjectPrx ice_connectionId(String connectionId)
     {
-        return __ice_connectionId(connectionId);
+        return _ice_connectionId(connectionId);
     }
 
     /**
@@ -687,12 +687,12 @@ public interface ObjectPrx
      * the server and will throw an Ice run-time exception if the target
      * object does not exist or the server cannot be reached.
      *
-     * @param __obj The proxy to cast to @{link ObjectPrx}.
-     * @return <code>__obj</code>.
+     * @param obj The proxy to cast to @{link ObjectPrx}.
+     * @return <code>obj</code>.
      **/
-    static ObjectPrx checkedCast(ObjectPrx __obj)
+    static ObjectPrx checkedCast(ObjectPrx obj)
     {
-        return __obj;
+        return obj;
     }
 
     /**
@@ -700,13 +700,13 @@ public interface ObjectPrx
      * the server and throws an Ice run-time exception if the target
      * object does not exist or the server cannot be reached.
      *
-     * @param __obj The proxy to cast to {@link ObjectPrx}.
-     * @param __ctx The <code>Context</code> map for the invocation.
-     * @return <code>__obj</code>.
+     * @param obj The proxy to cast to {@link ObjectPrx}.
+     * @param context The <code>Context</code> map for the invocation.
+     * @return <code>obj</code>.
      **/
-    static ObjectPrx checkedCast(ObjectPrx __obj, java.util.Map<String, String> __ctx)
+    static ObjectPrx checkedCast(ObjectPrx obj, java.util.Map<String, String> context)
     {
-        return __obj;
+        return obj;
     }
 
     /**
@@ -715,13 +715,13 @@ public interface ObjectPrx
      * the server and throws an Ice run-time exception if the target
      * object does not exist, the specified facet does not exist, or the server cannot be reached.
      *
-     * @param __obj The proxy to cast to {@link ObjectPrx}.
-     * @param __facet The facet for the new proxy.
+     * @param obj The proxy to cast to {@link ObjectPrx}.
+     * @param facet The facet for the new proxy.
      * @return The new proxy with the specified facet.
      **/
-    static ObjectPrx checkedCast(ObjectPrx __obj, String __facet)
+    static ObjectPrx checkedCast(ObjectPrx obj, String facet)
     {
-        return checkedCast(__obj, __facet, noExplicitContext);
+        return checkedCast(obj, facet, noExplicitContext);
     }
 
     /**
@@ -730,23 +730,23 @@ public interface ObjectPrx
      * the server and throws an Ice run-time exception if the target
      * object does not exist, the specified facet does not exist, or the server cannot be reached.
      *
-     * @param __obj The proxy to cast to {@link ObjectPrx}.
-     * @param __facet The facet for the new proxy.
-     * @param __ctx The <code>Context</code> map for the invocation.
+     * @param obj The proxy to cast to {@link ObjectPrx}.
+     * @param facet The facet for the new proxy.
+     * @param context The <code>Context</code> map for the invocation.
      * @return The new proxy with the specified facet.
      **/
-    static ObjectPrx checkedCast(ObjectPrx __obj, String __facet, java.util.Map<String, String> __ctx)
+    static ObjectPrx checkedCast(ObjectPrx obj, String facet, java.util.Map<String, String> context)
     {
         ObjectPrx r = null;
-        if(__obj != null)
+        if(obj != null)
         {
-            ObjectPrx p = __obj.ice_facet(__facet);
+            ObjectPrx p = obj.ice_facet(facet);
             try
             {
-                boolean ok = p.ice_isA(ice_staticId, __ctx);
+                boolean ok = p.ice_isA(ice_staticId, context);
                 assert(ok);
                 r = new _ObjectPrxI();
-                r.__copyFrom(p);
+                r._copyFrom(p);
             }
             catch(FacetNotExistException ex)
             {
@@ -759,30 +759,30 @@ public interface ObjectPrx
      * Casts a proxy to {@link ObjectPrx}. This call does
      * not contact the server and always succeeds.
      *
-     * @param __obj The proxy to cast to {@link ObjectPrx}.
-     * @return <code>__obj</code>.
+     * @param obj The proxy to cast to {@link ObjectPrx}.
+     * @return <code>obj</code>.
      **/
-    static ObjectPrx uncheckedCast(ObjectPrx __obj)
+    static ObjectPrx uncheckedCast(ObjectPrx obj)
     {
-        return __obj;
+        return obj;
     }
 
     /**
      * Creates a new proxy that is identical to the passed proxy, except
      * for its facet. This call does not contact the server and always succeeds.
      *
-     * @param __obj The proxy to cast to {@link ObjectPrx}.
-     * @param __facet The facet for the new proxy.
+     * @param obj The proxy to cast to {@link ObjectPrx}.
+     * @param facet The facet for the new proxy.
      * @return The new proxy with the specified facet.
      **/
-    static ObjectPrx uncheckedCast(ObjectPrx __obj, String __facet)
+    static ObjectPrx uncheckedCast(ObjectPrx obj, String facet)
     {
         ObjectPrx r = null;
-        if(__obj != null)
+        if(obj != null)
         {
-            ObjectPrx p = __obj.ice_facet(__facet);
+            ObjectPrx p = obj.ice_facet(facet);
             r = new _ObjectPrxI();
-            r.__copyFrom(p);
+            r._copyFrom(p);
         }
         return r;
     }
@@ -809,29 +809,29 @@ public interface ObjectPrx
         return istr.readProxy();
     }
 
-    static <T> T __checkedCast(ObjectPrx obj, String id, Class<T> proxy, Class<?> impl)
+    static <T> T _checkedCast(ObjectPrx obj, String id, Class<T> proxy, Class<?> impl)
     {
-        return __checkedCast(obj, false, null, noExplicitContext, id, proxy, impl);
+        return _checkedCast(obj, false, null, noExplicitContext, id, proxy, impl);
     }
 
-    static <T> T __checkedCast(ObjectPrx obj, java.util.Map<String, String> ctx, String id, Class<T> proxy,
+    static <T> T _checkedCast(ObjectPrx obj, java.util.Map<String, String> ctx, String id, Class<T> proxy,
                                Class<?> impl)
     {
-        return __checkedCast(obj, false, null, ctx, id, proxy, impl);
+        return _checkedCast(obj, false, null, ctx, id, proxy, impl);
     }
 
-    static <T> T __checkedCast(ObjectPrx obj, String facet, String id, Class<T> proxy, Class<?> impl)
+    static <T> T _checkedCast(ObjectPrx obj, String facet, String id, Class<T> proxy, Class<?> impl)
     {
-        return __checkedCast(obj, true, facet, noExplicitContext, id, proxy, impl);
+        return _checkedCast(obj, true, facet, noExplicitContext, id, proxy, impl);
     }
 
-    static <T> T __checkedCast(ObjectPrx obj, String facet, java.util.Map<String, String> ctx, String id,
+    static <T> T _checkedCast(ObjectPrx obj, String facet, java.util.Map<String, String> ctx, String id,
                                Class<T> proxy, Class<?> impl)
     {
-        return __checkedCast(obj, true, facet, ctx, id, proxy, impl);
+        return _checkedCast(obj, true, facet, ctx, id, proxy, impl);
     }
 
-    static <T> T __checkedCast(ObjectPrx obj, boolean explicitFacet, String facet, java.util.Map<String, String> ctx,
+    static <T> T _checkedCast(ObjectPrx obj, boolean explicitFacet, String facet, java.util.Map<String, String> ctx,
                                String id, Class<T> proxy, Class<?> impl)
     {
         T r = null;
@@ -865,7 +865,7 @@ public interface ObjectPrx
                         {
                             throw new SyscallException(ex);
                         }
-                        h.__copyFrom(obj);
+                        h._copyFrom(obj);
                         r = proxy.cast(h);
                     }
                 }
@@ -877,17 +877,17 @@ public interface ObjectPrx
         return r;
     }
 
-    static <T> T __uncheckedCast(ObjectPrx obj, Class<T> proxy, Class<?> impl)
+    static <T> T _uncheckedCast(ObjectPrx obj, Class<T> proxy, Class<?> impl)
     {
-        return __uncheckedCast(obj, false, null, proxy, impl);
+        return _uncheckedCast(obj, false, null, proxy, impl);
     }
 
-    static <T> T __uncheckedCast(ObjectPrx obj, String facet, Class<T> proxy, Class<?> impl)
+    static <T> T _uncheckedCast(ObjectPrx obj, String facet, Class<T> proxy, Class<?> impl)
     {
-        return __uncheckedCast(obj, true, facet, proxy, impl);
+        return _uncheckedCast(obj, true, facet, proxy, impl);
     }
 
-    static <T> T __uncheckedCast(ObjectPrx obj, boolean explicitFacet, String facet, Class<T> proxy, Class<?> impl)
+    static <T> T _uncheckedCast(ObjectPrx obj, boolean explicitFacet, String facet, Class<T> proxy, Class<?> impl)
     {
         T r = null;
         if(obj != null)
@@ -897,7 +897,7 @@ public interface ObjectPrx
                 if(explicitFacet)
                 {
                     ObjectPrx h = _ObjectPrxI.class.cast(impl.newInstance());
-                    h.__copyFrom(obj.ice_facet(facet));
+                    h._copyFrom(obj.ice_facet(facet));
                     r = proxy.cast(h);
                 }
                 else
@@ -909,7 +909,7 @@ public interface ObjectPrx
                     else
                     {
                         ObjectPrx h = _ObjectPrxI.class.cast(impl.newInstance());
-                        h.__copyFrom(obj);
+                        h._copyFrom(obj);
                         r = proxy.cast(h);
                     }
                 }
@@ -926,11 +926,11 @@ public interface ObjectPrx
         return r;
     }
 
-    static <T> T __waitForCompletion(java.util.concurrent.CompletableFuture<T> f)
+    static <T> T waitForResponseForCompletion(java.util.concurrent.CompletableFuture<T> f)
     {
         try
         {
-            return __waitForCompletionUserEx(f);
+            return waitForResponseForCompletionUserEx(f);
         }
         catch(UserException ex)
         {
@@ -938,7 +938,7 @@ public interface ObjectPrx
         }
     }
 
-    static <T> T __waitForCompletionUserEx(java.util.concurrent.CompletableFuture<T> f)
+    static <T> T waitForResponseForCompletionUserEx(java.util.concurrent.CompletableFuture<T> f)
         throws UserException
     {
         if(Thread.interrupted())
@@ -975,36 +975,36 @@ public interface ObjectPrx
         }
     }
 
-    void __write(OutputStream os);
-    void __copyFrom(ObjectPrx p);
-    com.zeroc.IceInternal.Reference __reference();
-    ObjectPrx __newInstance(com.zeroc.IceInternal.Reference r);
+    void _write(OutputStream os);
+    void _copyFrom(ObjectPrx p);
+    com.zeroc.IceInternal.Reference _getReference();
+    ObjectPrx _newInstance(com.zeroc.IceInternal.Reference r);
 
-    default ObjectPrx __ice_context(java.util.Map<String, String> newContext)
+    default ObjectPrx _ice_context(java.util.Map<String, String> newContext)
     {
-        return __newInstance(__reference().changeContext(newContext));
+        return _newInstance(_getReference().changeContext(newContext));
     }
 
-    default ObjectPrx __ice_adapterId(String newAdapterId)
+    default ObjectPrx _ice_adapterId(String newAdapterId)
     {
         if(newAdapterId == null)
         {
             newAdapterId = "";
         }
 
-        if(newAdapterId.equals(__reference().getAdapterId()))
+        if(newAdapterId.equals(_getReference().getAdapterId()))
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeAdapterId(newAdapterId));
+            return _newInstance(_getReference().changeAdapterId(newAdapterId));
         }
     }
 
-    default ObjectPrx __ice_endpoints(Endpoint[] newEndpoints)
+    default ObjectPrx _ice_endpoints(Endpoint[] newEndpoints)
     {
-        if(java.util.Arrays.equals(newEndpoints, __reference().getEndpoints()))
+        if(java.util.Arrays.equals(newEndpoints, _getReference().getEndpoints()))
         {
             return this;
         }
@@ -1012,240 +1012,240 @@ public interface ObjectPrx
         {
             com.zeroc.IceInternal.EndpointI[] edpts = new com.zeroc.IceInternal.EndpointI[newEndpoints.length];
             edpts = java.util.Arrays.asList(newEndpoints).toArray(edpts);
-            return __newInstance(__reference().changeEndpoints(edpts));
+            return _newInstance(_getReference().changeEndpoints(edpts));
         }
     }
 
-    default ObjectPrx __ice_locatorCacheTimeout(int newTimeout)
+    default ObjectPrx _ice_locatorCacheTimeout(int newTimeout)
     {
         if(newTimeout < -1)
         {
             throw new IllegalArgumentException("invalid value passed to ice_locatorCacheTimeout: " + newTimeout);
         }
-        if(newTimeout == __reference().getLocatorCacheTimeout())
+        if(newTimeout == _getReference().getLocatorCacheTimeout())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeLocatorCacheTimeout(newTimeout));
+            return _newInstance(_getReference().changeLocatorCacheTimeout(newTimeout));
         }
     }
 
-    default ObjectPrx __ice_invocationTimeout(int newTimeout)
+    default ObjectPrx _ice_invocationTimeout(int newTimeout)
     {
         if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2)
         {
             throw new IllegalArgumentException("invalid value passed to ice_invocationTimeout: " + newTimeout);
         }
-        if(newTimeout == __reference().getInvocationTimeout())
+        if(newTimeout == _getReference().getInvocationTimeout())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeInvocationTimeout(newTimeout));
+            return _newInstance(_getReference().changeInvocationTimeout(newTimeout));
         }
     }
 
-    default ObjectPrx __ice_connectionCached(boolean newCache)
+    default ObjectPrx _ice_connectionCached(boolean newCache)
     {
-        if(newCache == __reference().getCacheConnection())
+        if(newCache == _getReference().getCacheConnection())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeCacheConnection(newCache));
+            return _newInstance(_getReference().changeCacheConnection(newCache));
         }
     }
 
-    default ObjectPrx __ice_endpointSelection(EndpointSelectionType newType)
+    default ObjectPrx _ice_endpointSelection(EndpointSelectionType newType)
     {
-        if(newType == __reference().getEndpointSelection())
+        if(newType == _getReference().getEndpointSelection())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeEndpointSelection(newType));
+            return _newInstance(_getReference().changeEndpointSelection(newType));
         }
     }
 
-    default ObjectPrx __ice_secure(boolean b)
+    default ObjectPrx _ice_secure(boolean b)
     {
-        if(b == __reference().getSecure())
+        if(b == _getReference().getSecure())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeSecure(b));
+            return _newInstance(_getReference().changeSecure(b));
         }
     }
 
-    default ObjectPrx __ice_encodingVersion(EncodingVersion e)
+    default ObjectPrx _ice_encodingVersion(EncodingVersion e)
     {
-        if(e.equals(__reference().getEncoding()))
+        if(e.equals(_getReference().getEncoding()))
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeEncoding(e));
+            return _newInstance(_getReference().changeEncoding(e));
         }
     }
 
-    default ObjectPrx __ice_preferSecure(boolean b)
+    default ObjectPrx _ice_preferSecure(boolean b)
     {
-        if(b == __reference().getPreferSecure())
+        if(b == _getReference().getPreferSecure())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changePreferSecure(b));
+            return _newInstance(_getReference().changePreferSecure(b));
         }
     }
 
-    default ObjectPrx __ice_router(RouterPrx router)
+    default ObjectPrx _ice_router(RouterPrx router)
     {
-        com.zeroc.IceInternal.Reference ref = __reference().changeRouter(router);
-        if(ref.equals(__reference()))
+        com.zeroc.IceInternal.Reference ref = _getReference().changeRouter(router);
+        if(ref.equals(_getReference()))
         {
             return this;
         }
         else
         {
-            return __newInstance(ref);
+            return _newInstance(ref);
         }
     }
 
-    default ObjectPrx __ice_locator(LocatorPrx locator)
+    default ObjectPrx _ice_locator(LocatorPrx locator)
     {
-        com.zeroc.IceInternal.Reference ref = __reference().changeLocator(locator);
-        if(ref.equals(__reference()))
+        com.zeroc.IceInternal.Reference ref = _getReference().changeLocator(locator);
+        if(ref.equals(_getReference()))
         {
             return this;
         }
         else
         {
-            return __newInstance(ref);
+            return _newInstance(ref);
         }
     }
 
-    default ObjectPrx __ice_collocationOptimized(boolean b)
+    default ObjectPrx _ice_collocationOptimized(boolean b)
     {
-        if(b == __reference().getCollocationOptimized())
+        if(b == _getReference().getCollocationOptimized())
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeCollocationOptimized(b));
+            return _newInstance(_getReference().changeCollocationOptimized(b));
         }
     }
 
-    default ObjectPrx __ice_twoway()
+    default ObjectPrx _ice_twoway()
     {
-        if(__reference().getMode() == com.zeroc.IceInternal.Reference.ModeTwoway)
+        if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeTwoway)
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeMode(com.zeroc.IceInternal.Reference.ModeTwoway));
+            return _newInstance(_getReference().changeMode(com.zeroc.IceInternal.Reference.ModeTwoway));
         }
     }
 
-    default ObjectPrx __ice_oneway()
+    default ObjectPrx _ice_oneway()
     {
-        if(__reference().getMode() == com.zeroc.IceInternal.Reference.ModeOneway)
+        if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeOneway)
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeMode(com.zeroc.IceInternal.Reference.ModeOneway));
+            return _newInstance(_getReference().changeMode(com.zeroc.IceInternal.Reference.ModeOneway));
         }
     }
 
-    default ObjectPrx __ice_batchOneway()
+    default ObjectPrx _ice_batchOneway()
     {
-        if(__reference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchOneway)
+        if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchOneway)
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeMode(com.zeroc.IceInternal.Reference.ModeBatchOneway));
+            return _newInstance(_getReference().changeMode(com.zeroc.IceInternal.Reference.ModeBatchOneway));
         }
     }
 
-    default ObjectPrx __ice_datagram()
+    default ObjectPrx _ice_datagram()
     {
-        if(__reference().getMode() == com.zeroc.IceInternal.Reference.ModeDatagram)
+        if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeDatagram)
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeMode(com.zeroc.IceInternal.Reference.ModeDatagram));
+            return _newInstance(_getReference().changeMode(com.zeroc.IceInternal.Reference.ModeDatagram));
         }
     }
 
-    default ObjectPrx __ice_batchDatagram()
+    default ObjectPrx _ice_batchDatagram()
     {
-        if(__reference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchDatagram)
+        if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchDatagram)
         {
             return this;
         }
         else
         {
-            return __newInstance(__reference().changeMode(com.zeroc.IceInternal.Reference.ModeBatchDatagram));
+            return _newInstance(_getReference().changeMode(com.zeroc.IceInternal.Reference.ModeBatchDatagram));
         }
     }
 
-    default ObjectPrx __ice_compress(boolean co)
+    default ObjectPrx _ice_compress(boolean co)
     {
-        com.zeroc.IceInternal.Reference ref = __reference().changeCompress(co);
-        if(ref.equals(__reference()))
+        com.zeroc.IceInternal.Reference ref = _getReference().changeCompress(co);
+        if(ref.equals(_getReference()))
         {
             return this;
         }
         else
         {
-            return __newInstance(ref);
+            return _newInstance(ref);
         }
     }
 
-    default ObjectPrx __ice_timeout(int t)
+    default ObjectPrx _ice_timeout(int t)
     {
         if(t < 1 && t != -1)
         {
             throw new IllegalArgumentException("invalid value passed to ice_timeout: " + t);
         }
-        com.zeroc.IceInternal.Reference ref = __reference().changeTimeout(t);
-        if(ref.equals(__reference()))
+        com.zeroc.IceInternal.Reference ref = _getReference().changeTimeout(t);
+        if(ref.equals(_getReference()))
         {
             return this;
         }
         else
         {
-            return __newInstance(ref);
+            return _newInstance(ref);
         }
     }
 
-    default ObjectPrx __ice_connectionId(String connectionId)
+    default ObjectPrx _ice_connectionId(String connectionId)
     {
-        com.zeroc.IceInternal.Reference ref = __reference().changeConnectionId(connectionId);
-        if(ref.equals(__reference()))
+        com.zeroc.IceInternal.Reference ref = _getReference().changeConnectionId(connectionId);
+        if(ref.equals(_getReference()))
         {
             return this;
         }
         else
         {
-            return __newInstance(ref);
+            return _newInstance(ref);
         }
     }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java
index 5d3f5adfb01..4df391c80ce 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java
@@ -387,7 +387,7 @@ public class OutputStream
         _encapsStack.start = _buf.size();
 
         writeInt(0); // Placeholder for the encapsulation length.
-        _encapsStack.encoding.ice_write(this);
+        _encapsStack.encoding.write(this);
     }
 
     /**
@@ -418,7 +418,7 @@ public class OutputStream
     {
         com.zeroc.IceInternal.Protocol.checkSupportedEncoding(encoding);
         writeInt(6); // Size
-        encoding.ice_write(this);
+        encoding.write(this);
     }
 
     /**
@@ -1574,12 +1574,12 @@ public class OutputStream
     {
         if(v != null)
         {
-            v.__write(this);
+            v._write(this);
         }
         else
         {
             Identity ident = new Identity();
-            ident.ice_write(this);
+            ident.write(this);
         }
     }
 
@@ -1867,9 +1867,9 @@ public class OutputStream
             // This allows reading the pending instances even if some part of
             // the exception was sliced.
             //
-            boolean usesClasses = v.__usesClasses();
+            boolean usesClasses = v._usesClasses();
             _stream.writeBool(usesClasses);
-            v.__write(_stream);
+            v._write(_stream);
             if(usesClasses)
             {
                 writePendingValues();
@@ -1890,7 +1890,7 @@ public class OutputStream
                 //
                 // Write the Object slice.
                 //
-                startSlice(Value.ice_staticId, -1, true);
+                startSlice(Value.ice_staticId(), -1, true);
                 _stream.writeSize(0); // For compatibility with the old AFM.
                 endSlice();
             }
@@ -1974,7 +1974,7 @@ public class OutputStream
                         _stream.instance().initializationData().logger.warning(s);
                     }
 
-                    p.getKey().__write(_stream);
+                    p.getKey()._iceWrite(_stream);
                 }
             }
             _stream.writeSize(0); // Zero marker indicates end of sequence of sequences of instances.
@@ -2074,7 +2074,7 @@ public class OutputStream
         @Override
         void writeException(UserException v)
         {
-            v.__write(_stream);
+            v._write(_stream);
         }
 
         @Override
@@ -2321,7 +2321,7 @@ public class OutputStream
             }
 
             _stream.writeSize(1); // Class instance marker.
-            v.__write(_stream);
+            v._iceWrite(_stream);
         }
 
         private static final class InstanceData
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java b/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java
index 39e606cc2ee..18734abb867 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java
@@ -35,17 +35,17 @@ public final class UnknownSlicedValue extends Value
     }
 
     @Override
-    public void __write(OutputStream __os)
+    public void _iceWrite(OutputStream ostr)
     {
-        __os.startValue(_slicedData);
-        __os.endValue();
+        ostr.startValue(_slicedData);
+        ostr.endValue();
     }
 
     @Override
-    public void __read(InputStream __is)
+    public void _iceRead(InputStream istr)
     {
-        __is.startValue();
-        _slicedData = __is.endValue(true);
+        istr.startValue();
+        _slicedData = istr.endValue(true);
     }
 
     private final String _unknownTypeId;
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java b/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java
index 388cd92111a..88479216740 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java
@@ -83,28 +83,28 @@ public abstract class UserException extends java.lang.Exception implements Clone
         return sw.toString();
     }
 
-    public void __write(OutputStream os)
+    public void _write(OutputStream os)
     {
         os.startException(null);
-        __writeImpl(os);
+        _writeImpl(os);
         os.endException();
     }
 
-    public void __read(InputStream is)
+    public void _read(InputStream is)
     {
         is.startException();
-        __readImpl(is);
+        _readImpl(is);
         is.endException(false);
     }
 
-    public boolean __usesClasses()
+    public boolean _usesClasses()
     {
         return false;
     }
 
-    protected abstract void __writeImpl(OutputStream os);
+    protected abstract void _writeImpl(OutputStream os);
 
-    protected abstract void __readImpl(InputStream is);
+    protected abstract void _readImpl(InputStream is);
 
     public static final long serialVersionUID = 0L;
 }
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java
index 7b1c64781f8..362ff7d9414 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java
@@ -52,8 +52,6 @@ public abstract class Value implements java.lang.Cloneable, java.io.Serializable
     {
     }
 
-    public static final String ice_staticId = "::Ice::Object";
-
     /**
      * Returns the Slice type ID of the most-derived interface supported by this object.
      *
@@ -61,28 +59,33 @@ public abstract class Value implements java.lang.Cloneable, java.io.Serializable
      **/
     public String ice_id()
     {
-        return ice_staticId;
+        return ice_staticId();
+    }
+
+    public static String ice_staticId()
+    {
+        return "::Ice::Object";
     }
 
-    public void __write(OutputStream __os)
+    public void _iceWrite(OutputStream ostr)
     {
-        __os.startValue(null);
-        __writeImpl(__os);
-        __os.endValue();
+        ostr.startValue(null);
+        _iceWriteImpl(ostr);
+        ostr.endValue();
     }
 
-    public void __read(InputStream __is)
+    public void _iceRead(InputStream istr)
     {
-        __is.startValue();
-        __readImpl(__is);
-        __is.endValue(false);
+        istr.startValue();
+        _iceReadImpl(istr);
+        istr.endValue(false);
     }
 
-    protected void __writeImpl(OutputStream __os)
+    protected void _iceWriteImpl(OutputStream ostr)
     {
     }
 
-    protected void __readImpl(InputStream __is)
+    protected void _iceReadImpl(InputStream istr)
     {
     }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java
index 90dbdd46cb6..d56a2a634fb 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java
@@ -22,13 +22,13 @@ public abstract class ValueReader extends Value
     public abstract void read(InputStream in);
 
     @Override
-    public void __write(OutputStream os)
+    public void _iceWrite(OutputStream os)
     {
         assert(false);
     }
 
     @Override
-    public void __read(InputStream is)
+    public void _iceRead(InputStream is)
     {
         read(is);
     }
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java
index 89860e8bedf..f232a1dcb28 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java
@@ -22,13 +22,13 @@ public abstract class ValueWriter extends Value
     public abstract void write(OutputStream out);
 
     @Override
-    public void __write(OutputStream os)
+    public void _iceWrite(OutputStream os)
     {
         write(os);
     }
 
     @Override
-    public void __read(InputStream is)
+    public void _iceRead(InputStream is)
     {
         assert(false);
     }
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
index 10af97bb35a..322257dbd1d 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
@@ -29,38 +29,38 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return ice_isA(id, ObjectPrx.noExplicitContext);
     }
 
-    public boolean ice_isA(String id, java.util.Map<String, String> __ctx)
+    public boolean ice_isA(String id, java.util.Map<String, String> context)
     {
-        return __ice_isAAsync(id, __ctx, true).__wait();
+        return _iceI_ice_isAAsync(id, context, true).waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<java.lang.Boolean> ice_isAAsync(String id)
     {
-        return __ice_isAAsync(id, ObjectPrx.noExplicitContext, false);
+        return _iceI_ice_isAAsync(id, ObjectPrx.noExplicitContext, false);
     }
 
     public java.util.concurrent.CompletableFuture<java.lang.Boolean> ice_isAAsync(
         String id,
-        java.util.Map<String, String> __ctx)
+        java.util.Map<String, String> context)
     {
-        return __ice_isAAsync(id, __ctx, false);
+        return _iceI_ice_isAAsync(id, context, false);
     }
 
-    private OutgoingAsync<java.lang.Boolean> __ice_isAAsync(
+    private OutgoingAsync<java.lang.Boolean> _iceI_ice_isAAsync(
         String id,
-        java.util.Map<String, String> __ctx,
-        boolean __sync)
-    {
-        OutgoingAsync<java.lang.Boolean> __f =
-            new OutgoingAsync<>(this, "ice_isA", OperationMode.Nonmutating, __sync, null);
-        __f.invoke(true, __ctx, null, __os -> {
-                       __os.writeString(id);
-                   }, __is -> {
-                       boolean __ret;
-                       __ret = __is.readBool();
-                       return __ret;
+        java.util.Map<String, String> context,
+        boolean sync)
+    {
+        OutgoingAsync<java.lang.Boolean> f =
+            new OutgoingAsync<>(this, "ice_isA", OperationMode.Nonmutating, sync, null);
+        f.invoke(true, context, null, ostr -> {
+                       ostr.writeString(id);
+                   }, istr -> {
+                       boolean ret;
+                       ret = istr.readBool();
+                       return ret;
                    });
-        return __f;
+        return f;
     }
 
     public void ice_ping()
@@ -68,28 +68,28 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         ice_ping(ObjectPrx.noExplicitContext);
     }
 
-    public void ice_ping(java.util.Map<String, String> __ctx)
+    public void ice_ping(java.util.Map<String, String> context)
     {
-        __ice_pingAsync(__ctx, true).__wait();
+        _iceI_ice_pingAsync(context, true).waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<Void> ice_pingAsync()
     {
-        return __ice_pingAsync(ObjectPrx.noExplicitContext, false);
+        return _iceI_ice_pingAsync(ObjectPrx.noExplicitContext, false);
     }
 
-    public java.util.concurrent.CompletableFuture<Void> ice_pingAsync(java.util.Map<String, String> __ctx)
+    public java.util.concurrent.CompletableFuture<Void> ice_pingAsync(java.util.Map<String, String> context)
     {
-        return __ice_pingAsync(__ctx, false);
+        return _iceI_ice_pingAsync(context, false);
     }
 
-    private OutgoingAsync<Void> __ice_pingAsync(
-        java.util.Map<String, String> __ctx,
-        boolean __sync)
+    private OutgoingAsync<Void> _iceI_ice_pingAsync(
+        java.util.Map<String, String> context,
+        boolean sync)
     {
-        OutgoingAsync<Void> __f = new OutgoingAsync<>(this, "ice_ping", OperationMode.Nonmutating, __sync, null);
-        __f.invoke(false, __ctx, null, null, null);
-        return __f;
+        OutgoingAsync<Void> f = new OutgoingAsync<>(this, "ice_ping", OperationMode.Nonmutating, sync, null);
+        f.invoke(false, context, null, null, null);
+        return f;
     }
 
     public String[] ice_ids()
@@ -97,33 +97,33 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return ice_ids(ObjectPrx.noExplicitContext);
     }
 
-    public String[] ice_ids(java.util.Map<String, String> __ctx)
+    public String[] ice_ids(java.util.Map<String, String> context)
     {
-        return __ice_idsAsync(__ctx, true).__wait();
+        return _iceI_ice_idsAsync(context, true).waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<String[]> ice_idsAsync()
     {
-        return __ice_idsAsync(ObjectPrx.noExplicitContext, false);
+        return _iceI_ice_idsAsync(ObjectPrx.noExplicitContext, false);
     }
 
-    public java.util.concurrent.CompletableFuture<String[]> ice_idsAsync(java.util.Map<String, String> __ctx)
+    public java.util.concurrent.CompletableFuture<String[]> ice_idsAsync(java.util.Map<String, String> context)
     {
-        return __ice_idsAsync(__ctx, false);
+        return _iceI_ice_idsAsync(context, false);
     }
 
-    private OutgoingAsync<String[]> __ice_idsAsync(
-        java.util.Map<String, String> __ctx,
-        boolean __sync)
+    private OutgoingAsync<String[]> _iceI_ice_idsAsync(
+        java.util.Map<String, String> context,
+        boolean sync)
     {
-        OutgoingAsync<String[]> __f =
-            new OutgoingAsync<>(this, "ice_ids", OperationMode.Nonmutating, __sync, null);
-        __f.invoke(true, __ctx, null, null, __is -> {
-                       String[] __ret;
-                       __ret = StringSeqHelper.read(__is);
-                       return __ret;
+        OutgoingAsync<String[]> f =
+            new OutgoingAsync<>(this, "ice_ids", OperationMode.Nonmutating, sync, null);
+        f.invoke(true, context, null, null, istr -> {
+                       String[] ret;
+                       ret = StringSeqHelper.read(istr);
+                       return ret;
                    });
-        return __f;
+        return f;
     }
 
     public String ice_id()
@@ -131,33 +131,33 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return ice_id(ObjectPrx.noExplicitContext);
     }
 
-    public String ice_id(java.util.Map<String, String> __ctx)
+    public String ice_id(java.util.Map<String, String> context)
     {
-        return __ice_idAsync(__ctx, true).__wait();
+        return _iceI_ice_idAsync(context, true).waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<java.lang.String> ice_idAsync()
     {
-        return __ice_idAsync(ObjectPrx.noExplicitContext, false);
+        return _iceI_ice_idAsync(ObjectPrx.noExplicitContext, false);
     }
 
-    public java.util.concurrent.CompletableFuture<java.lang.String> ice_idAsync(java.util.Map<String, String> __ctx)
+    public java.util.concurrent.CompletableFuture<java.lang.String> ice_idAsync(java.util.Map<String, String> context)
     {
-        return __ice_idAsync(__ctx, false);
+        return _iceI_ice_idAsync(context, false);
     }
 
-    private OutgoingAsync<java.lang.String> __ice_idAsync(
-        java.util.Map<String, String> __ctx,
-        boolean __sync)
+    private OutgoingAsync<java.lang.String> _iceI_ice_idAsync(
+        java.util.Map<String, String> context,
+        boolean sync)
     {
-        OutgoingAsync<java.lang.String> __f =
-            new OutgoingAsync<>(this, "ice_id", OperationMode.Nonmutating, __sync, null);
-        __f.invoke(true, __ctx, null, null, __is -> {
-                       String __ret;
-                       __ret = __is.readString();
-                       return __ret;
+        OutgoingAsync<java.lang.String> f =
+            new OutgoingAsync<>(this, "ice_id", OperationMode.Nonmutating, sync, null);
+        f.invoke(true, context, null, null, istr -> {
+                       String ret;
+                       ret = istr.readString();
+                       return ret;
                    });
-        return __f;
+        return f;
     }
 
     public com.zeroc.Ice.Object.Ice_invokeResult ice_invoke(String operation, OperationMode mode, byte[] inParams)
@@ -166,9 +166,9 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
     }
 
     public com.zeroc.Ice.Object.Ice_invokeResult ice_invoke(String operation, OperationMode mode, byte[] inParams,
-                                                            java.util.Map<String, String> __context)
+                                                            java.util.Map<String, String> context)
     {
-        return __ice_invokeAsync(operation, mode, inParams, __context, true).__wait();
+        return _iceI_ice_invokeAsync(operation, mode, inParams, context, true).waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<com.zeroc.Ice.Object.Ice_invokeResult> ice_invokeAsync(
@@ -183,22 +183,22 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         String operation,
         OperationMode mode,
         byte[] inParams,
-        java.util.Map<String, String> __context)
+        java.util.Map<String, String> context)
     {
-        return __ice_invokeAsync(operation, mode, inParams, __context, false);
+        return _iceI_ice_invokeAsync(operation, mode, inParams, context, false);
     }
 
-    private com.zeroc.IceInternal.ProxyIceInvoke __ice_invokeAsync(
+    private com.zeroc.IceInternal.ProxyIceInvoke _iceI_ice_invokeAsync(
         String operation,
         OperationMode mode,
         byte[] inParams,
-        java.util.Map<String, String> __context,
-        boolean __sync)
+        java.util.Map<String, String> context,
+        boolean sync)
     {
-        com.zeroc.IceInternal.ProxyIceInvoke __f =
-            new com.zeroc.IceInternal.ProxyIceInvoke(this, operation, mode, __sync);
-        __f.invoke(inParams, __context);
-        return __f;
+        com.zeroc.IceInternal.ProxyIceInvoke f =
+            new com.zeroc.IceInternal.ProxyIceInvoke(this, operation, mode, sync);
+        f.invoke(inParams, context);
+        return f;
     }
 
     public Identity ice_getIdentity()
@@ -219,7 +219,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         else
         {
             _ObjectPrxI proxy = new _ObjectPrxI();
-            proxy.__setup(_reference.changeIdentity(newIdentity));
+            proxy._setup(_reference.changeIdentity(newIdentity));
             return proxy;
         }
     }
@@ -248,7 +248,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         else
         {
             _ObjectPrxI proxy = new _ObjectPrxI();
-            proxy.__setup(_reference.changeFacet(newFacet));
+            proxy._setup(_reference.changeFacet(newFacet));
             return proxy;
         }
     }
@@ -347,15 +347,15 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
 
     public Connection ice_getConnection()
     {
-        return __ice_getConnectionAsync().__wait();
+        return _iceI_ice_getConnectionAsync().waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<Connection> ice_getConnectionAsync()
     {
-        return __ice_getConnectionAsync();
+        return _iceI_ice_getConnectionAsync();
     }
 
-    private com.zeroc.IceInternal.ProxyGetConnection __ice_getConnectionAsync()
+    private com.zeroc.IceInternal.ProxyGetConnection _iceI_ice_getConnectionAsync()
     {
         com.zeroc.IceInternal.ProxyGetConnection r = new com.zeroc.IceInternal.ProxyGetConnection(this);
         r.invoke();
@@ -385,26 +385,26 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
 
     public void ice_flushBatchRequests()
     {
-        __ice_flushBatchRequestsAsync().__wait();
+        _iceI_ice_flushBatchRequestsAsync().waitForResponse();
     }
 
     public java.util.concurrent.CompletableFuture<Void> ice_flushBatchRequestsAsync()
     {
-        return __ice_flushBatchRequestsAsync();
+        return _iceI_ice_flushBatchRequestsAsync();
     }
 
-    private com.zeroc.IceInternal.ProxyFlushBatch __ice_flushBatchRequestsAsync()
+    private com.zeroc.IceInternal.ProxyFlushBatch _iceI_ice_flushBatchRequestsAsync()
     {
-        com.zeroc.IceInternal.ProxyFlushBatch __f = new com.zeroc.IceInternal.ProxyFlushBatch(this);
+        com.zeroc.IceInternal.ProxyFlushBatch f = new com.zeroc.IceInternal.ProxyFlushBatch(this);
         try
         {
-            __f.invoke();
+            f.invoke();
         }
         catch(Exception ex)
         {
-            __f.abort(ex);
+            f.abort(ex);
         }
-        return __f;
+        return f;
     }
 
     @Override
@@ -436,14 +436,14 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
     }
 
     @Override
-    public void __write(OutputStream os)
+    public void _write(OutputStream os)
     {
-        _reference.getIdentity().ice_write(os);
+        _reference.getIdentity().write(os);
         _reference.streamWrite(os);
     }
 
     @Override
-    public void __copyFrom(ObjectPrx p)
+    public void _copyFrom(ObjectPrx p)
     {
         synchronized(p)
         {
@@ -454,18 +454,18 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
     }
 
     @Override
-    public com.zeroc.IceInternal.Reference __reference()
+    public com.zeroc.IceInternal.Reference _getReference()
     {
         return _reference;
     }
 
     @Override
-    public ObjectPrx __newInstance(com.zeroc.IceInternal.Reference ref)
+    public ObjectPrx _newInstance(com.zeroc.IceInternal.Reference ref)
     {
         try
         {
             _ObjectPrxI proxy = getClass().newInstance();
-            proxy.__setup(ref);
+            proxy._setup(ref);
             return proxy;
         }
         catch(InstantiationException e)
@@ -486,7 +486,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         }
     }
 
-    public StreamPair __getCachedMessageBuffers()
+    public StreamPair _getCachedMessageBuffers()
     {
         synchronized(this)
         {
@@ -498,7 +498,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return null;
     }
 
-    public void __cacheMessageBuffers(InputStream is, OutputStream os)
+    public void _cacheMessageBuffers(InputStream is, OutputStream os)
     {
         synchronized(this)
         {
@@ -510,10 +510,10 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         }
     }
 
-    public int __handleException(Exception ex, com.zeroc.IceInternal.RequestHandler handler, OperationMode mode,
+    public int _handleException(Exception ex, com.zeroc.IceInternal.RequestHandler handler, OperationMode mode,
                                  boolean sent, com.zeroc.IceInternal.Holder<Integer> interval, int cnt)
     {
-        __updateRequestHandler(handler, null); // Clear the request handler
+        _updateRequestHandler(handler, null); // Clear the request handler
 
         //
         // We only retry local exception, system exceptions aren't retried.
@@ -556,7 +556,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         }
     }
 
-    public com.zeroc.IceInternal.RequestHandler __getRequestHandler()
+    public com.zeroc.IceInternal.RequestHandler _getRequestHandler()
     {
         if(_reference.getCacheConnection())
         {
@@ -571,7 +571,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return _reference.getRequestHandler(this);
     }
 
-    synchronized public com.zeroc.IceInternal.BatchRequestQueue __getBatchRequestQueue()
+    synchronized public com.zeroc.IceInternal.BatchRequestQueue _getBatchRequestQueue()
     {
         if(_batchRequestQueue == null)
         {
@@ -580,7 +580,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return _batchRequestQueue;
     }
 
-    public com.zeroc.IceInternal.RequestHandler __setRequestHandler(com.zeroc.IceInternal.RequestHandler handler)
+    public com.zeroc.IceInternal.RequestHandler _setRequestHandler(com.zeroc.IceInternal.RequestHandler handler)
     {
         if(_reference.getCacheConnection())
         {
@@ -596,7 +596,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return handler;
     }
 
-    public void __updateRequestHandler(com.zeroc.IceInternal.RequestHandler previous,
+    public void _updateRequestHandler(com.zeroc.IceInternal.RequestHandler previous,
                                        com.zeroc.IceInternal.RequestHandler handler)
     {
         if(_reference.getCacheConnection() && previous != null)
@@ -621,7 +621,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
     //
     // Only for use by ProxyFactory
     //
-    public void __setup(com.zeroc.IceInternal.Reference ref)
+    public void _setup(com.zeroc.IceInternal.Reference ref)
     {
         //
         // No need to synchronize, as this operation is only called
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java
index 13bc6a5b5a0..a7c4dc65b38 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java
@@ -28,9 +28,9 @@ public class CommunicatorFlushBatch extends InvocationFutureI<Void>
     }
 
     @Override
-    protected void __sent()
+    protected void markSent()
     {
-        super.__sent();
+        super.markSent();
 
         assert((_state & StateOK) != 0);
         complete(null);
@@ -48,19 +48,19 @@ public class CommunicatorFlushBatch extends InvocationFutureI<Void>
             }
 
             @Override
-            protected void __sent()
+            protected void markSent()
             {
                 assert(false);
             }
 
             @Override
-            protected boolean __needCallback()
+            protected boolean needCallback()
             {
                 return false;
             }
 
             @Override
-            protected void __completed()
+            protected void markCompleted()
             {
                 assert(false);
             }
@@ -145,7 +145,7 @@ public class CommunicatorFlushBatch extends InvocationFutureI<Void>
         doCheck(true);
     }
 
-    public void __wait()
+    public void waitForResponse()
     {
         if(Thread.interrupted())
         {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java
index 12e6d3616a1..ffc5c51be46 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java
@@ -343,7 +343,7 @@ public class ConnectRequestHandler
             }
             for(com.zeroc.Ice._ObjectPrxI proxy : _proxies)
             {
-                proxy.__updateRequestHandler(previous, _requestHandler);
+                proxy._updateRequestHandler(previous, _requestHandler);
             }
         }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java
index d576323caed..2d4a35a0f82 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java
@@ -27,22 +27,22 @@ public class ConnectionFlushBatch extends OutgoingAsyncBaseI<Void>
     }
 
     @Override
-    protected void __sent()
+    protected void markSent()
     {
-        super.__sent();
+        super.markSent();
 
         assert((_state & StateOK) != 0);
         complete(null);
     }
 
     @Override
-    protected void __completed()
+    protected void markCompleted()
     {
         if(_exception != null)
         {
             completeExceptionally(_exception);
         }
-        super.__completed();
+        super.markCompleted();
     }
 
     public void invoke()
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java
index a861857bf4d..d7d7ce1ba09 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java
@@ -278,7 +278,7 @@ public class FixedReference extends Reference
         {
             handler = new QueueRequestHandler(getInstance(), handler);
         }
-        return proxy.__setRequestHandler(handler);
+        return proxy._setRequestHandler(handler);
     }
 
     @Override
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
index 67941f3b1e5..687bc03d412 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
@@ -114,7 +114,7 @@ final public class Incoming implements com.zeroc.Ice.Request
         //
         // Read the current.
         //
-        _current.id.ice_read(_is);
+        _current.id.read(_is);
 
         //
         // For compatibility with the old FacetPath.
@@ -223,7 +223,7 @@ final public class Incoming implements com.zeroc.Ice.Request
 
             try
             {
-                CompletionStage<OutputStream> f = _servant.__dispatch(this, _current);
+                CompletionStage<OutputStream> f = _servant._iceDispatch(this, _current);
                 if(f == null)
                 {
                     completed(null, false);
@@ -617,7 +617,7 @@ final public class Incoming implements com.zeroc.Ice.Request
                 {
                     assert(false);
                 }
-                ex.id.ice_write(_os);
+                ex.id.write(_os);
 
                 //
                 // For compatibility with the old FacetPath.
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
index 38821b2d98e..a99f3788e85 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
@@ -211,7 +211,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
         return r;
     }
 
-    protected synchronized void __sent()
+    protected synchronized void markSent()
     {
         if(_sentFuture != null && !_sentFuture.isDone())
         {
@@ -230,7 +230,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
         
         try
         {
-            __sent();
+            markSent();
         }
         catch(java.lang.RuntimeException ex)
         {
@@ -265,12 +265,12 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
         }
     }
 
-    protected boolean __needCallback()
+    protected boolean needCallback()
     {
         return true;
     }
 
-    protected void __completed()
+    protected void markCompleted()
     {
         if(_exception != null && _sentFuture != null)
         {
@@ -289,7 +289,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
         
         try
         {
-            __completed();
+            markCompleted();
         }
         catch(RuntimeException ex)
         {
@@ -403,7 +403,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
                 _state |= StateOK;
             }
             _cancellationHandler = null;
-            if(!__needCallback())
+            if(!needCallback())
             {
                 if(_observer != null)
                 {
@@ -412,7 +412,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
                 }
             }
             this.notifyAll();
-            return __needCallback();
+            return needCallback();
         }
     }
 
@@ -427,7 +427,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
             {
                 _observer.failed(ex.ice_id());
             }
-            if(!__needCallback())
+            if(!needCallback())
             {
                 if(_observer != null)
                 {
@@ -436,7 +436,7 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
                 }
             }
             this.notifyAll();
-            return __needCallback();
+            return needCallback();
         }
     }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java
index 8e5cc8974ce..bc7406c876d 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java
@@ -25,7 +25,7 @@ public final class LocatorInfo
             EndpointI[] endpoints = null;
             if(proxy != null)
             {
-                Reference r = ((com.zeroc.Ice._ObjectPrxI)proxy).__reference();
+                Reference r = ((com.zeroc.Ice._ObjectPrxI)proxy)._getReference();
                 if(_ref.isWellKnown() && !Protocol.isSupported(_ref.getEncoding(), r.getEncoding()))
                 {
                     //
@@ -644,7 +644,7 @@ public final class LocatorInfo
     finishRequest(Reference ref, java.util.List<Reference> wellKnownRefs, com.zeroc.Ice.ObjectPrx proxy,
                   boolean notRegistered)
     {
-        if(proxy == null || ((com.zeroc.Ice._ObjectPrxI)proxy).__reference().isIndirect())
+        if(proxy == null || ((com.zeroc.Ice._ObjectPrxI)proxy)._getReference().isIndirect())
         {
             //
             // Remove the cached references of well-known objects for which we tried
@@ -658,11 +658,11 @@ public final class LocatorInfo
 
         if(!ref.isWellKnown())
         {
-            if(proxy != null && !((com.zeroc.Ice._ObjectPrxI)proxy).__reference().isIndirect())
+            if(proxy != null && !((com.zeroc.Ice._ObjectPrxI)proxy)._getReference().isIndirect())
             {
                 // Cache the adapter endpoints.
                 _table.addAdapterEndpoints(ref.getAdapterId(),
-                                           ((com.zeroc.Ice._ObjectPrxI)proxy).__reference().getEndpoints());
+                                           ((com.zeroc.Ice._ObjectPrxI)proxy)._getReference().getEndpoints());
             }
             else if(notRegistered) // If the adapter isn't registered anymore, remove it from the cache.
             {
@@ -677,10 +677,10 @@ public final class LocatorInfo
         }
         else
         {
-            if(proxy != null && !((com.zeroc.Ice._ObjectPrxI)proxy).__reference().isWellKnown())
+            if(proxy != null && !((com.zeroc.Ice._ObjectPrxI)proxy)._getReference().isWellKnown())
             {
                 // Cache the well-known object reference.
-                _table.addObjectReference(ref.getIdentity(), ((com.zeroc.Ice._ObjectPrxI)proxy).__reference());
+                _table.addObjectReference(ref.getIdentity(), ((com.zeroc.Ice._ObjectPrxI)proxy)._getReference());
             }
             else if(notRegistered) // If the well-known object isn't registered anymore, remove it from the cache.
             {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java
index ae1aaca8019..a32a221e3f9 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java
@@ -58,7 +58,7 @@ public final class LocatorManager
 
         LocatorKey set(com.zeroc.Ice.LocatorPrx locator)
         {
-            Reference r = ((com.zeroc.Ice._ObjectPrxI)locator).__reference();
+            Reference r = ((com.zeroc.Ice._ObjectPrxI)locator)._getReference();
             _id = r.getIdentity();
             _encoding = r.getEncoding();
             return this;
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java
index 6075fcbd2b7..3be5ddc1f13 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java
@@ -40,7 +40,7 @@ public final class ObserverHelper
     get(com.zeroc.Ice.ObjectPrx proxy, String op, java.util.Map<String, String> context)
     {
         CommunicatorObserver obsv = 
-            ((com.zeroc.Ice._ObjectPrxI)proxy).__reference().getInstance().initializationData().observer;
+            ((com.zeroc.Ice._ObjectPrxI)proxy)._getReference().getInstance().initializationData().observer;
         if(obsv != null)
         {
             InvocationObserver observer;
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
index bff6a72055d..e3965ad6650 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
@@ -34,11 +34,11 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
         _mode = mode == null ? OperationMode.Normal : mode;
         _synchronous = synchronous;
         _userExceptions = userExceptions;
-        _encoding = Protocol.getCompatibleEncoding(_proxy.__reference().getEncoding());
+        _encoding = Protocol.getCompatibleEncoding(_proxy._getReference().getEncoding());
 
         if(_instance.cacheMessageBuffers() > 0)
         {
-            _ObjectPrxI.StreamPair p = _proxy.__getCachedMessageBuffers();
+            _ObjectPrxI.StreamPair p = _proxy._getCachedMessageBuffers();
             if(p != null)
             {
                 _is = p.is;
@@ -87,7 +87,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
                 // NOTE: we don't call sent/completed callbacks for batch AMI requests
                 //
                 _sentSynchronously = true;
-                _proxy.__getBatchRequestQueue().finishBatchRequest(_os, _proxy, _operation);
+                _proxy._getBatchRequestQueue().finishBatchRequest(_os, _proxy, _operation);
                 finished(true);
             }
             else
@@ -106,7 +106,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
         }
     }
 
-    public T __wait()
+    public T waitForResponse()
     {
         if(isBatch())
         {
@@ -115,7 +115,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
 
         try
         {
-            return __waitUserEx();
+            return waitForResponseOrUserEx();
         }
         catch(UserException ex)
         {
@@ -123,7 +123,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
         }
     }
 
-    public T __waitUserEx()
+    public T waitForResponseOrUserEx()
         throws UserException
     {
         if(Thread.interrupted())
@@ -161,9 +161,9 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
     }
 
     @Override
-    protected void __sent()
+    protected void markSent()
     {
-        super.__sent();
+        super.markSent();
 
         if(!_proxy.ice_isTwoway())
         {
@@ -192,7 +192,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
     public int invokeCollocated(CollocatedRequestHandler handler)
     {
         // The stream cannot be cached if the proxy is not a twoway or there is an invocation timeout set.
-        if(!_proxy.ice_isTwoway() || _proxy.__reference().getInvocationTimeout() > 0)
+        if(!_proxy.ice_isTwoway() || _proxy._getReference().getInvocationTimeout() > 0)
         {
             // Disable caching by marking the streams as cached!
             _state |= StateCachedBuffers;
@@ -210,16 +210,16 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
             // must notify the connection about that we give up ownership
             // of the batch stream.
             //
-            _proxy.__getBatchRequestQueue().abortBatchRequest(_os);
+            _proxy._getBatchRequestQueue().abortBatchRequest(_os);
         }
 
         super.abort(ex);
     }
 
     @Override
-    protected void __completed()
+    protected void markCompleted()
     {
-        super.__completed();
+        super.markCompleted();
 
         try
         {
@@ -374,7 +374,7 @@ public class OutgoingAsync<T> extends ProxyOutgoingAsyncBaseI<T>
             }
             _os.reset();
 
-            _proxy.__cacheMessageBuffers(_is, _os);
+            _proxy._cacheMessageBuffers(_is, _os);
 
             _is = null;
             _os = null;
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
index 941dbab051a..0150fb73f78 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
@@ -26,7 +26,7 @@ public final class ProxyFactory
         if(proxy != null)
         {
             com.zeroc.Ice._ObjectPrxI h = (com.zeroc.Ice._ObjectPrxI)proxy;
-            return h.__reference().toString();
+            return h._getReference().toString();
         }
         else
         {
@@ -48,7 +48,7 @@ public final class ProxyFactory
         if(proxy != null)
         {
             com.zeroc.Ice._ObjectPrxI h = (com.zeroc.Ice._ObjectPrxI)proxy;
-            return h.__reference().toProperty(prefix);
+            return h._getReference().toProperty(prefix);
         }
         else
         {
@@ -71,7 +71,7 @@ public final class ProxyFactory
         if(ref != null)
         {
             com.zeroc.Ice._ObjectPrxI proxy = new com.zeroc.Ice._ObjectPrxI();
-            proxy.__setup(ref);
+            proxy._setup(ref);
             return proxy;
         }
         else
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java
index 5bdd570cd82..527a26658bd 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java
@@ -15,7 +15,7 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBaseI<Void>
     {
         super(prx, "ice_flushBatchRequests");
         _observer = ObserverHelper.get(prx, "ice_flushBatchRequests");
-        _batchRequestNum = prx.__getBatchRequestQueue().swap(_os);
+        _batchRequestNum = prx._getBatchRequestQueue().swap(_os);
     }
 
     @Override
@@ -26,24 +26,24 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBaseI<Void>
     }
 
     @Override
-    protected synchronized void __sent()
+    protected synchronized void markSent()
     {
-        super.__sent();
+        super.markSent();
 
         assert((_state & StateOK) != 0);
         complete(null);
     }
 
     @Override
-    protected boolean __needCallback()
+    protected boolean needCallback()
     {
         return true;
     }
 
     @Override
-    protected void __completed()
+    protected void markCompleted()
     {
-        super.__completed();
+        super.markCompleted();
         if(_exception != null)
         {
             completeExceptionally(_exception);
@@ -74,11 +74,11 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBaseI<Void>
 
     public void invoke()
     {
-        Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy.__reference().getProtocol()));
+        Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy._getReference().getProtocol()));
         invokeImpl(true); // userThread = true
     }
 
-    public void __wait()
+    public void waitForResponse()
     {
         if(Thread.interrupted())
         {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java
index 0363b63aba2..84effe3a4e7 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java
@@ -18,15 +18,15 @@ public class ProxyGetConnection extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Co
     }
 
     @Override
-    protected boolean __needCallback()
+    protected boolean needCallback()
     {
         return true;
     }
 
     @Override
-    protected void __completed()
+    protected void markCompleted()
     {
-        super.__completed();
+        super.markCompleted();
 
         if(_exception != null)
         {
@@ -72,7 +72,7 @@ public class ProxyGetConnection extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Co
         invokeImpl(true); // userThread = true
     }
 
-    public com.zeroc.Ice.Connection __wait()
+    public com.zeroc.Ice.Connection waitForResponse()
     {
         if(Thread.interrupted())
         {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
index e5fcdbe89b8..94f2dd82a64 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
@@ -25,7 +25,7 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
         super((com.zeroc.Ice._ObjectPrxI)prx, operation);
         _mode = mode == null ? com.zeroc.Ice.OperationMode.Normal : mode;
         _synchronous = synchronous;
-        _encoding = Protocol.getCompatibleEncoding(_proxy.__reference().getEncoding());
+        _encoding = Protocol.getCompatibleEncoding(_proxy._getReference().getEncoding());
         _is = null;
     }
 
@@ -42,7 +42,7 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
                 // NOTE: we don't call sent/completed callbacks for batch AMI requests
                 //
                 _sentSynchronously = true;
-                _proxy.__getBatchRequestQueue().finishBatchRequest(_os, _proxy, _operation);
+                _proxy._getBatchRequestQueue().finishBatchRequest(_os, _proxy, _operation);
                 finished(true);
             }
             else
@@ -61,7 +61,7 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
         }
     }
 
-    public com.zeroc.Ice.Object.Ice_invokeResult __wait()
+    public com.zeroc.Ice.Object.Ice_invokeResult waitForResponse()
     {
         if(isBatch())
         {
@@ -102,9 +102,9 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
     }
 
     @Override
-    protected void __sent()
+    protected void markSent()
     {
-        super.__sent();
+        super.markSent();
 
         if(!_proxy.ice_isTwoway())
         {
@@ -133,7 +133,7 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
     public int invokeCollocated(CollocatedRequestHandler handler)
     {
         // The stream cannot be cached if the proxy is not a twoway or there is an invocation timeout set.
-        if(!_proxy.ice_isTwoway() || _proxy.__reference().getInvocationTimeout() > 0)
+        if(!_proxy.ice_isTwoway() || _proxy._getReference().getInvocationTimeout() > 0)
         {
             // Disable caching by marking the streams as cached!
             _state |= StateCachedBuffers;
@@ -151,16 +151,16 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object
             // must notify the connection about that we give up ownership
             // of the batch stream.
             //
-            _proxy.__getBatchRequestQueue().abortBatchRequest(_os);
+            _proxy._getBatchRequestQueue().abortBatchRequest(_os);
         }
 
         super.abort(ex);
     }
 
     @Override
-    protected void __completed()
+    protected void markCompleted()
     {
-        super.__completed();
+        super.markCompleted();
 
         if(_exception != null)
         {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java
index cb29f052104..7cb2a1ee367 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java
@@ -220,7 +220,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
             // require could end up waiting for the flush of the
             // connection to be done.
             //
-            _proxy.__updateRequestHandler(_handler, null); // Clear request handler and always retry.
+            _proxy._updateRequestHandler(_handler, null); // Clear request handler and always retry.
             _instance.retryQueue().add(this, 0);
         }
         catch(com.zeroc.Ice.Exception exc)
@@ -240,7 +240,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
 
     public void cancelable(final CancellationHandler handler)
     {
-        if(_proxy.__reference().getInvocationTimeout() == -2 && _cachedConnection != null)
+        if(_proxy._getReference().getInvocationTimeout() == -2 && _cachedConnection != null)
         {
             final int timeout = _cachedConnection.timeout();
             if(timeout > 0)
@@ -280,26 +280,26 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
 
     protected ProxyOutgoingAsyncBaseI(com.zeroc.Ice._ObjectPrxI prx, String op)
     {
-        super(prx.ice_getCommunicator(), prx.__reference().getInstance(), op);
+        super(prx.ice_getCommunicator(), prx._getReference().getInstance(), op);
         _proxy = prx;
         _mode = com.zeroc.Ice.OperationMode.Normal;
         _cnt = 0;
         _sent = false;
-        _proxyMode = _proxy.__reference().getMode();
+        _proxyMode = _proxy._getReference().getMode();
     }
 
     protected ProxyOutgoingAsyncBaseI(com.zeroc.Ice._ObjectPrxI prx, String op, com.zeroc.Ice.OutputStream os)
     {
-        super(prx.ice_getCommunicator(), prx.__reference().getInstance(), op, os);
+        super(prx.ice_getCommunicator(), prx._getReference().getInstance(), op, os);
         _proxy = prx;
         _mode = com.zeroc.Ice.OperationMode.Normal;
         _cnt = 0;
         _sent = false;
-        _proxyMode = _proxy.__reference().getMode();
+        _proxyMode = _proxy._getReference().getMode();
     }
 
     @Override
-    protected boolean __needCallback()
+    protected boolean needCallback()
     {
         return !isBatch();
     }
@@ -310,7 +310,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
         {
             if(userThread)
             {
-                int invocationTimeout = _proxy.__reference().getInvocationTimeout();
+                int invocationTimeout = _proxy._getReference().getInvocationTimeout();
                 if(invocationTimeout > 0)
                 {
                     _timerFuture = _instance.timer().schedule(
@@ -338,7 +338,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
                 {
                     _sent = false;
                     _handler = null;
-                    _handler = _proxy.__getRequestHandler();
+                    _handler = _proxy._getRequestHandler();
                     int status = _handler.sendAsyncRequest(this);
                     if((status & AsyncStatus.Sent) > 0)
                     {
@@ -362,7 +362,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
                 }
                 catch(RetryException ex)
                 {
-                    _proxy.__updateRequestHandler(_handler, null); // Clear request handler and always retry.
+                    _proxy._updateRequestHandler(_handler, null); // Clear request handler and always retry.
                 }
                 catch(com.zeroc.Ice.Exception ex)
                 {
@@ -442,13 +442,13 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
     protected int handleException(com.zeroc.Ice.Exception exc)
     {
         Holder<Integer> interval = new Holder<>();
-        _cnt = _proxy.__handleException(exc, _handler, _mode, _sent, interval, _cnt);
+        _cnt = _proxy._handleException(exc, _handler, _mode, _sent, interval, _cnt);
         return interval.value;
     }
 
     protected void prepare(java.util.Map<String, String> ctx)
     {
-        Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy.__reference().getProtocol()));
+        Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy._getReference().getProtocol()));
 
         _observer = ObserverHelper.get(_proxy, _operation, ctx == null ? _emptyContext : ctx);
 
@@ -465,14 +465,14 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i
             case Reference.ModeBatchOneway:
             case Reference.ModeBatchDatagram:
             {
-                _proxy.__getBatchRequestQueue().prepareBatchRequest(_os);
+                _proxy._getBatchRequestQueue().prepareBatchRequest(_os);
                 break;
             }
         }
 
-        Reference ref = _proxy.__reference();
+        Reference ref = _proxy._getReference();
 
-        ref.getIdentity().ice_write(_os);
+        ref.getIdentity().write(_os);
 
         //
         // For compatibility with the old FacetPath.
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java
index 2b2d2fc12e0..0b246868519 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java
@@ -283,8 +283,8 @@ public abstract class Reference implements Cloneable
 
         if(!s.getEncoding().equals(com.zeroc.Ice.Util.Encoding_1_0))
         {
-            _protocol.ice_write(s);
-            _encoding.ice_write(s);
+            _protocol.write(s);
+            _encoding.write(s);
         }
 
         // Derived class writes the remainder of the reference.
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java
index b9313f1d136..47d6622bafa 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java
@@ -744,7 +744,7 @@ public final class ReferenceFactory
         LocatorInfo locatorInfo = null;
         if(_defaultLocator != null)
         {
-            if(!((com.zeroc.Ice._ObjectPrxI)_defaultLocator).__reference().getEncoding().equals(encoding))
+            if(!((com.zeroc.Ice._ObjectPrxI)_defaultLocator)._getReference().getEncoding().equals(encoding))
             {
                 locatorInfo = _instance.locatorManager().get(_defaultLocator.ice_encodingVersion(encoding));
             }
@@ -784,7 +784,7 @@ public final class ReferenceFactory
                 com.zeroc.Ice.LocatorPrx.uncheckedCast(_communicator.propertyToProxy(property));
             if(locator != null)
             {
-                if(!((com.zeroc.Ice._ObjectPrxI)locator).__reference().getEncoding().equals(encoding))
+                if(!((com.zeroc.Ice._ObjectPrxI)locator)._getReference().getEncoding().equals(encoding))
                 {
                     locatorInfo = _instance.locatorManager().get(locator.ice_encodingVersion(encoding));
                 }
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java
index 19b2a85ad9b..491449fe503 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java
@@ -28,7 +28,7 @@ public final class RequestHandlerFactory
             com.zeroc.Ice.ObjectAdapter adapter = _instance.objectAdapterFactory().findObjectAdapter(proxy);
             if(adapter != null)
             {
-                return proxy.__setRequestHandler(new CollocatedRequestHandler(ref, adapter));
+                return proxy._setRequestHandler(new CollocatedRequestHandler(ref, adapter));
             }
         }
 
@@ -73,7 +73,7 @@ public final class RequestHandlerFactory
                 ref.getConnection(handler);
             }
         }
-        return proxy.__setRequestHandler(handler.connect(proxy));
+        return proxy._setRequestHandler(handler.connect(proxy));
     }
 
     void
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java
index 4600da1e9d3..846708989bf 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java
@@ -395,7 +395,7 @@ public class RoutableReference extends Reference
         if(_routerInfo != null)
         {
             com.zeroc.Ice._ObjectPrxI h = (com.zeroc.Ice._ObjectPrxI)_routerInfo.getRouter();
-            java.util.Map<String, String> routerProperties = h.__reference().toProperty(prefix + ".Router");
+            java.util.Map<String, String> routerProperties = h._getReference().toProperty(prefix + ".Router");
             for(java.util.Map.Entry<String, String> p : routerProperties.entrySet())
             {
                 properties.put(p.getKey(), p.getValue());
@@ -405,7 +405,7 @@ public class RoutableReference extends Reference
         if(_locatorInfo != null)
         {
             com.zeroc.Ice._ObjectPrxI h = (com.zeroc.Ice._ObjectPrxI)_locatorInfo.getLocator();
-            java.util.Map<String, String> locatorProperties = h.__reference().toProperty(prefix + ".Locator");
+            java.util.Map<String, String> locatorProperties = h._getReference().toProperty(prefix + ".Locator");
             for(java.util.Map.Entry<String, String> p : locatorProperties.entrySet())
             {
                 properties.put(p.getKey(), p.getValue());
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java
index e103ead153a..109965fe194 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java
@@ -201,7 +201,7 @@ public final class RouterInfo
                 //
                 // If getClientProxy() return nil, use router endpoints.
                 //
-                _clientEndpoints = ((com.zeroc.Ice._ObjectPrxI)_router).__reference().getEndpoints();
+                _clientEndpoints = ((com.zeroc.Ice._ObjectPrxI)_router)._getReference().getEndpoints();
             }
             else
             {
@@ -217,7 +217,7 @@ public final class RouterInfo
                     clientProxy = clientProxy.ice_timeout(_router.ice_getConnection().timeout());
                 }
 
-                _clientEndpoints = ((com.zeroc.Ice._ObjectPrxI)clientProxy).__reference().getEndpoints();
+                _clientEndpoints = ((com.zeroc.Ice._ObjectPrxI)clientProxy)._getReference().getEndpoints();
             }
         }
         return _clientEndpoints;
@@ -232,7 +232,7 @@ public final class RouterInfo
         }
 
         serverProxy = serverProxy.ice_router(null); // The server proxy cannot be routed.
-        _serverEndpoints = ((com.zeroc.Ice._ObjectPrxI)serverProxy).__reference().getEndpoints();
+        _serverEndpoints = ((com.zeroc.Ice._ObjectPrxI)serverProxy)._getReference().getEndpoints();
         return _serverEndpoints;
     }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java
index d11b031271f..67057b67191 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java
@@ -258,8 +258,8 @@ final class UdpEndpointI extends IPEndpointI
         super.streamWriteImpl(s);
         if(s.getEncoding().equals(com.zeroc.Ice.Util.Encoding_1_0))
         {
-            com.zeroc.Ice.Util.Protocol_1_0.ice_write(s);
-            com.zeroc.Ice.Util.Encoding_1_0.ice_write(s);
+            com.zeroc.Ice.Util.Protocol_1_0.write(s);
+            com.zeroc.Ice.Util.Encoding_1_0.write(s);
         }
         // Not transmitted.
         //s.writeBool(_connect);
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java
index 45f4c8e8a94..2ac38d8bb26 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java
@@ -84,7 +84,7 @@ public final class ValueWriter
             {
                 writeName(name, out);
                 com.zeroc.Ice._ObjectPrxI proxy = (com.zeroc.Ice._ObjectPrxI)value;
-                out.print(proxy.__reference().toString());
+                out.print(proxy._getReference().toString());
             }
             else if(value instanceof com.zeroc.Ice.Value)
             {