1 files changed, 20 insertions, 20 deletions

diff --git a/csharp/src/Ice/InputStream.cs b/csharp/src/Ice/InputStream.cs
index 0f9de976656..1eac58e63f1 100644
--- a/csharp/src/Ice/InputStream.cs
+++ b/csharp/src/Ice/InputStream.cs
@@ -257,17 +257,17 @@ namespace Ice
         {
             initialize(encoding);
 
-            instance_ = instance;
-            _traceSlicing = instance_.traceLevels().slicing > 0;
+            _instance = instance;
+            _traceSlicing = _instance.traceLevels().slicing > 0;
 
-            _valueFactoryManager = instance_.initializationData().valueFactoryManager;
-            _logger = instance_.initializationData().logger;
-            _classResolver = instance_.resolveClass;
+            _valueFactoryManager = _instance.initializationData().valueFactoryManager;
+            _logger = _instance.initializationData().logger;
+            _classResolver = _instance.resolveClass;
         }
 
         private void initialize(EncodingVersion encoding)
         {
-            instance_ = null;
+            _instance = null;
             _encoding = encoding;
             _encapsStack = null;
             _encapsCache = null;
@@ -396,7 +396,7 @@ namespace Ice
 
         public IceInternal.Instance instance()
         {
-            return instance_;
+            return _instance;
         }
 
         /// <summary>
@@ -405,7 +405,7 @@ namespace Ice
         /// <param name="other">The other stream.</param>
         public void swap(InputStream other)
         {
-            Debug.Assert(instance_ == other.instance_);
+            Debug.Assert(_instance == other._instance);
 
             IceInternal.Buffer tmpBuf = other._buf;
             other._buf = _buf;
@@ -558,7 +558,7 @@ namespace Ice
             _encapsStack.sz = sz;
 
             EncodingVersion encoding = new EncodingVersion();
-            encoding.read__(this);
+            encoding.iceRead(this);
             Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported.
             _encapsStack.setEncoding(encoding);
 
@@ -627,7 +627,7 @@ namespace Ice
             }
 
             var encoding = new EncodingVersion();
-            encoding.read__(this);
+            encoding.iceRead(this);
             if(encoding.Equals(Util.Encoding_1_0))
             {
                 if(sz != 6)
@@ -664,7 +664,7 @@ namespace Ice
             }
 
             encoding = new EncodingVersion();
-            encoding.read__(this);
+            encoding.iceRead(this);
             _buf.b.position(_buf.b.position() - 6);
 
             byte[] v = new byte[sz];
@@ -710,7 +710,7 @@ namespace Ice
                 throw new UnmarshalOutOfBoundsException();
             }
             EncodingVersion encoding = new EncodingVersion();
-            encoding.read__(this);
+            encoding.iceRead(this);
             try
             {
                 _buf.b.position(_buf.b.position() + sz - 6);
@@ -1096,7 +1096,7 @@ namespace Ice
             }
             try
             {
-                var f = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.All, instance_));
+                var f = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.All, _instance));
                 return f.Deserialize(new IceInternal.InputStreamWrapper(sz, this));
             }
             catch(System.Exception ex)
@@ -2378,7 +2378,7 @@ namespace Ice
         /// <returns>The extracted proxy.</returns>
         public ObjectPrx readProxy()
         {
-            return instance_.proxyFactory().streamToProxy(this);
+            return _instance.proxyFactory().streamToProxy(this);
         }
 
         /// <summary>
@@ -2699,7 +2699,7 @@ namespace Ice
             return userEx;
         }
 
-        private IceInternal.Instance instance_;
+        private IceInternal.Instance _instance;
         private IceInternal.Buffer _buf;
         private object _closure;
         private byte[] _stringBytes; // Reusable array for reading strings.
@@ -2900,7 +2900,7 @@ namespace Ice
                 //
                 // Read the instance.
                 //
-                v.read__(_stream);
+                v.iceRead(_stream);
 
                 if(_patchMap != null)
                 {
@@ -3073,7 +3073,7 @@ namespace Ice
                     //
                     if(userEx != null)
                     {
-                        userEx.read__(_stream);
+                        userEx.iceRead(_stream);
                         if(usesClasses)
                         {
                             readPendingValues();
@@ -3382,7 +3382,7 @@ namespace Ice
                     //
                     if(userEx != null)
                     {
-                        userEx.read__(_stream);
+                        userEx.iceRead(_stream);
                         throw userEx;
 
                         // Never reached.
@@ -4018,12 +4018,12 @@ namespace Ice
         /// <param name="inStream">The input stream to read from.</param>
         public abstract void read(InputStream inStream);
 
-        public override void write__(OutputStream os)
+        public override void iceWrite(OutputStream os)
         {
             Debug.Assert(false);
         }
 
-        public override void read__(InputStream istr)
+        public override void iceRead(InputStream istr)
         {
             read(istr);
         }