3 files changed, 8 insertions, 8 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 36a02ffc738..0bcaccfff27 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -966,7 +966,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     Test::MyClassPrxPtr cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13));
     cl13->ice_ping();
 #ifdef ICE_CPP11_MAPPING
-    cl13->ice_ping_async().get();
+    cl13->ice_pingAsync().get();
 #else
     cl13->end_ice_ping(cl13->begin_ice_ping());
 #endif
@@ -1044,7 +1044,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13));
     cl13->ice_ping();
 #ifdef ICE_CPP11_MAPPING
-    cl13->ice_ping_async().get();
+    cl13->ice_pingAsync().get();
 #else
     cl13->end_ice_ping(cl13->begin_ice_ping());
 #endif
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index dafc480b067..8ed80f009f2 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -19,7 +19,7 @@ MyDerivedClassI::MyDerivedClassI()
 
 #ifdef ICE_CPP11_MAPPING
 void
-MyDerivedClassI::echo_async(
+MyDerivedClassI::echoAsync(
     shared_ptr<Ice::ObjectPrx> obj,
     function<void (const shared_ptr<Ice::ObjectPrx>&)> response,
     function<void (exception_ptr)>,
@@ -29,7 +29,7 @@ MyDerivedClassI::echo_async(
 }
 
 void
-MyDerivedClassI::shutdown_async(
+MyDerivedClassI::shutdownAsync(
     function<void ()> response,
     function<void (exception_ptr)>,
     const Ice::Current& current)
@@ -39,7 +39,7 @@ MyDerivedClassI::shutdown_async(
 }
 
 void
-MyDerivedClassI::getContext_async(
+MyDerivedClassI::getContextAsync(
     function<void (const Ice::Context&)> response,
     function<void (exception_ptr)>,
     const Ice::Current&)
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index b21e0ead930..69f674c6be7 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -24,18 +24,18 @@ public:
     MyDerivedClassI();
     
 #ifdef ICE_CPP11_MAPPING
-    virtual void echo_async(
+    virtual void echoAsync(
         std::shared_ptr<Ice::ObjectPrx>,
         ::std::function<void (const ::std::shared_ptr<Ice::ObjectPrx>&)>,
         ::std::function<void (::std::exception_ptr)>,
         const Ice::Current&);
     
-    virtual void shutdown_async(
+    virtual void shutdownAsync(
         ::std::function<void ()>,
         ::std::function<void (::std::exception_ptr)>,
         const Ice::Current&);
 
-    virtual void getContext_async(
+    virtual void getContextAsync(
         ::std::function<void (const Ice::Context&)>,
         ::std::function<void (::std::exception_ptr)>,
         const Ice::Current&);