4 files changed, 9 insertions, 10 deletions
diff --git a/cpp/slice/Ice/TransportInfo.ice b/cpp/slice/Ice/Connection.ice
index 7a8ef22b1a6..056b75e777a 100644
--- a/cpp/slice/Ice/TransportInfo.ice
+++ b/cpp/slice/Ice/Connection.ice
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSPORT_INFO_ICE
-#define ICE_TRANSPORT_INFO_ICE
+#ifndef ICE_CONNECTION_ICE
+#define ICE_CONNECTION_ICE
 
 #include <Ice/Identity.ice>
 
@@ -20,7 +20,7 @@ module Ice
  * The user-level interface to a connection.
  *
  **/
-local interface TransportInfo
+local interface Connection
 {
     /**
      *
diff --git a/cpp/slice/Ice/TransportInfoF.ice b/cpp/slice/Ice/ConnectionF.ice
index fad4db66d17..7daba58adda 100644
--- a/cpp/slice/Ice/TransportInfoF.ice
+++ b/cpp/slice/Ice/ConnectionF.ice
@@ -7,13 +7,13 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSPORT_INFO_F_ICE
-#define ICE_TRANSPORT_INFO_F_ICE
+#ifndef ICE_CONNECTION_F_ICE
+#define ICE_CONNECTION_F_ICE
 
 module Ice
 {
 
-local interface TransportInfo;
+local interface Connection;
 
 };
 
diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice
index 977d685016e..ffc6edb6aeb 100644
--- a/cpp/slice/Ice/Current.ice
+++ b/cpp/slice/Ice/Current.ice
@@ -11,7 +11,7 @@
 #define ICE_CURRENT_ICE
 
 #include <Ice/ObjectAdapterF.ice>
-#include <Ice/TransportInfoF.ice>
+#include <Ice/ConnectionF.ice>
 #include <Ice/Identity.ice>
 
 module Ice
@@ -92,12 +92,12 @@ local struct Current
     
     /**
      *
-     * Information about the transport over which the current method
+     * Information about the connection over which the current method
      * invocation was received. If the invocation is direct due to
      * collocation optimization, this value is set to null.
      *
      **/
-    TransportInfo transport;
+    Connection con;
 
     /**
      *
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index 1c1ea7d4a97..e0d3cbff15b 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -14,7 +14,6 @@
 #include <Ice/ServantLocatorF.ice>
 #include <Ice/RouterF.ice>
 #include <Ice/LocatorF.ice>
-#include <Ice/TransportInfoF.ice>
 #include <Ice/Identity.ice>
 #include <Ice/FacetMap.ice>