Got rid of underscore warnings in inheritance tests.

12 files changed, 256 insertions, 256 deletions

diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index 6a14986e056..a1cd880acf1 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -38,10 +38,10 @@ public class AllTests
 
         System.out.print("getting proxies for class hierarchy... ");
         System.out.flush();
-        M_A.C_APrx ca = initial.c_a();
-        M_B.C_BPrx cb = initial.c_b();
-        M_A.C_CPrx cc = initial.c_c();
-        M_A.C_DPrx cd = initial.c_d();
+        MA.CAPrx ca = initial.caop();
+        MB.CBPrx cb = initial.cbop();
+        MA.CCPrx cc = initial.ccop();
+        MA.CDPrx cd = initial.cdop();
         test(ca != cb);
         test(ca != cc);
         test(ca != cd);
@@ -52,10 +52,10 @@ public class AllTests
 
         System.out.print("getting proxies for interface hierarchy... ");
         System.out.flush();
-        M_A.I_APrx ia = initial.i_a();
-        M_B.I_B1Prx ib1 = initial.i_b1();
-        M_B.I_B2Prx ib2 = initial.i_b2();
-        M_A.I_CPrx ic = initial.i_c();
+        MA.IAPrx ia = initial.iaop();
+        MB.IB1Prx ib1 = initial.ib1op();
+        MB.IB2Prx ib2 = initial.ib2op();
+        MA.ICPrx ic = initial.icop();
         test(ia != ib1);
         test(ia != ib2);
         test(ia != ic);
@@ -65,168 +65,168 @@ public class AllTests
 
         System.out.print("invoking proxy operations on class hierarchy... ");
         System.out.flush();
-        M_A.C_APrx cao;
-        M_B.C_BPrx cbo;
-        M_A.C_CPrx cco;
+        MA.CAPrx cao;
+        MB.CBPrx cbo;
+        MA.CCPrx cco;
         
-        cao = ca.ca(ca);
+        cao = ca.caop(ca);
         test(cao.equals(ca));
-        cao = ca.ca(cb);
+        cao = ca.caop(cb);
         test(cao.equals(cb));
-        cao = ca.ca(cc);
+        cao = ca.caop(cc);
         test(cao.equals(cc));
-        cao = cb.ca(ca);
+        cao = cb.caop(ca);
         test(cao.equals(ca));
-        cao = cb.ca(cb);
+        cao = cb.caop(cb);
         test(cao.equals(cb));
-        cao = cb.ca(cc);
+        cao = cb.caop(cc);
         test(cao.equals(cc));
-        cao = cc.ca(ca);
+        cao = cc.caop(ca);
         test(cao.equals(ca));
-        cao = cc.ca(cb);
+        cao = cc.caop(cb);
         test(cao.equals(cb));
-        cao = cc.ca(cc);
+        cao = cc.caop(cc);
         test(cao.equals(cc));
         
-        cao = cb.cb(cb);
+        cao = cb.cbop(cb);
         test(cao.equals(cb));
-        cbo = cb.cb(cb);
+        cbo = cb.cbop(cb);
         test(cbo.equals(cb));
-        cao = cb.cb(cc);
+        cao = cb.cbop(cc);
         test(cao.equals(cc));
-        cbo = cb.cb(cc);
+        cbo = cb.cbop(cc);
         test(cbo.equals(cc));
-        cao = cc.cb(cb);
+        cao = cc.cbop(cb);
         test(cao.equals(cb));
-        cbo = cc.cb(cb);
+        cbo = cc.cbop(cb);
         test(cbo.equals(cb));
-        cao = cc.cb(cc);
+        cao = cc.cbop(cc);
         test(cao.equals(cc));
-        cbo = cc.cb(cc);
+        cbo = cc.cbop(cc);
         test(cbo.equals(cc));
 
-        cao = cc.cc(cc);
+        cao = cc.ccop(cc);
         test(cao.equals(cc));
-        cbo = cc.cc(cc);
+        cbo = cc.ccop(cc);
         test(cbo.equals(cc));
-        cco = cc.cc(cc);
+        cco = cc.ccop(cc);
         test(cco.equals(cc));
         System.out.println("ok");
 
         System.out.print("ditto, but for interface hierarchy... ");
         System.out.flush();
-        M_A.I_APrx iao;
-        M_B.I_B1Prx ib1o;
-        M_B.I_B2Prx ib2o;
-        M_A.I_CPrx ico;
+        MA.IAPrx iao;
+        MB.IB1Prx ib1o;
+        MB.IB2Prx ib2o;
+        MA.ICPrx ico;
 
-        iao = ia.ia(ia);
+        iao = ia.iaop(ia);
         test(iao.equals(ia));
-        iao = ia.ia(ib1);
+        iao = ia.iaop(ib1);
         test(iao.equals(ib1));
-        iao = ia.ia(ib2);
+        iao = ia.iaop(ib2);
         test(iao.equals(ib2));
-        iao = ia.ia(ic);
+        iao = ia.iaop(ic);
         test(iao.equals(ic));
-        iao = ib1.ia(ia);
+        iao = ib1.iaop(ia);
         test(iao.equals(ia));
-        iao = ib1.ia(ib1);
+        iao = ib1.iaop(ib1);
         test(iao.equals(ib1));
-        iao = ib1.ia(ib2);
+        iao = ib1.iaop(ib2);
         test(iao.equals(ib2));
-        iao = ib1.ia(ic);
+        iao = ib1.iaop(ic);
         test(iao.equals(ic));
-        iao = ib2.ia(ia);
+        iao = ib2.iaop(ia);
         test(iao.equals(ia));
-        iao = ib2.ia(ib1);
+        iao = ib2.iaop(ib1);
         test(iao.equals(ib1));
-        iao = ib2.ia(ib2);
+        iao = ib2.iaop(ib2);
         test(iao.equals(ib2));
-        iao = ib2.ia(ic);
+        iao = ib2.iaop(ic);
         test(iao.equals(ic));
-        iao = ic.ia(ia);
+        iao = ic.iaop(ia);
         test(iao.equals(ia));
-        iao = ic.ia(ib1);
+        iao = ic.iaop(ib1);
         test(iao.equals(ib1));
-        iao = ic.ia(ib2);
+        iao = ic.iaop(ib2);
         test(iao.equals(ib2));
-        iao = ic.ia(ic);
+        iao = ic.iaop(ic);
         test(iao.equals(ic));
 
-        iao = ib1.ib1(ib1);
+        iao = ib1.ib1op(ib1);
         test(iao.equals(ib1));
-        ib1o = ib1.ib1(ib1);
+        ib1o = ib1.ib1op(ib1);
         test(ib1o.equals(ib1));
-        iao = ib1.ib1(ic);
+        iao = ib1.ib1op(ic);
         test(iao.equals(ic));
-        ib1o = ib1.ib1(ic);
+        ib1o = ib1.ib1op(ic);
         test(ib1o.equals(ic));
-        iao = ic.ib1(ib1);
+        iao = ic.ib1op(ib1);
         test(iao.equals(ib1));
-        ib1o = ic.ib1(ib1);
+        ib1o = ic.ib1op(ib1);
         test(ib1o.equals(ib1));
-        iao = ic.ib1(ic);
+        iao = ic.ib1op(ic);
         test(iao.equals(ic));
-        ib1o = ic.ib1(ic);
+        ib1o = ic.ib1op(ic);
         test(ib1o.equals(ic));
 
-        iao = ib2.ib2(ib2);
+        iao = ib2.ib2op(ib2);
         test(iao.equals(ib2));
-        ib2o = ib2.ib2(ib2);
+        ib2o = ib2.ib2op(ib2);
         test(ib2o.equals(ib2));
-        iao = ib2.ib2(ic);
+        iao = ib2.ib2op(ic);
         test(iao.equals(ic));
-        ib2o = ib2.ib2(ic);
+        ib2o = ib2.ib2op(ic);
         test(ib2o.equals(ic));
-        iao = ic.ib2(ib2);
+        iao = ic.ib2op(ib2);
         test(iao.equals(ib2));
-        ib2o = ic.ib2(ib2);
+        ib2o = ic.ib2op(ib2);
         test(ib2o.equals(ib2));
-        iao = ic.ib2(ic);
+        iao = ic.ib2op(ic);
         test(iao.equals(ic));
-        ib2o = ic.ib2(ic);
+        ib2o = ic.ib2op(ic);
         test(ib2o.equals(ic));
 
-        iao = ic.ic(ic);
+        iao = ic.icop(ic);
         test(iao.equals(ic));
-        ib1o = ic.ic(ic);
+        ib1o = ic.icop(ic);
         test(ib1o.equals(ic));
-        ib2o = ic.ic(ic);
+        ib2o = ic.icop(ic);
         test(ib2o.equals(ic));
-        ico = ic.ic(ic);
+        ico = ic.icop(ic);
         test(ico.equals(ic));
         System.out.println("ok");
 
         System.out.print("ditto, but for class implementing interfaces... ");
         System.out.flush();
-        M_A.C_DPrx cdo;
+        MA.CDPrx cdo;
 
-        cao = cd.ca(cd);
+        cao = cd.caop(cd);
         test(cao.equals(cd));
-        cbo = cd.cb(cd);
+        cbo = cd.cbop(cd);
         test(cbo.equals(cd));
-        cco = cd.cc(cd);
+        cco = cd.ccop(cd);
         test(cco.equals(cd));
 
-        iao = cd.ia(cd);
+        iao = cd.iaop(cd);
         test(iao.equals(cd));
-        ib1o = cd.ib1(cd);
+        ib1o = cd.ib1op(cd);
         test(ib1o.equals(cd));
-        ib2o = cd.ib2(cd);
+        ib2o = cd.ib2op(cd);
         test(ib2o.equals(cd));
 
-        cao = cd.cd(cd);
+        cao = cd.cdop(cd);
         test(cao.equals(cd));
-        cbo = cd.cd(cd);
+        cbo = cd.cdop(cd);
         test(cbo.equals(cd));
-        cco = cd.cd(cd);
+        cco = cd.cdop(cd);
         test(cco.equals(cd));
 
-        iao = cd.cd(cd);
+        iao = cd.cdop(cd);
         test(iao.equals(cd));
-        ib1o = cd.cd(cd);
+        ib1o = cd.cdop(cd);
         test(ib1o.equals(cd));
-        ib2o = cd.cd(cd);
+        ib2o = cd.cdop(cd);
         test(ib2o.equals(cd));
         System.out.println("ok");
 
diff --git a/java/test/Ice/inheritance/C_A_I.java b/java/test/Ice/inheritance/CAI.java
index a18ae8a1e55..f8d5b454d01 100644
--- a/java/test/Ice/inheritance/C_A_I.java
+++ b/java/test/Ice/inheritance/CAI.java
@@ -8,15 +8,15 @@
 //
 // **********************************************************************
 
-public final class C_A_I extends M_A.C_A
+public final class CAI extends MA.CA
 {
     public
-    C_A_I()
+    CAI()
     {
     }
 
-    public M_A.C_APrx
-    ca(M_A.C_APrx p, Ice.Current current)
+    public MA.CAPrx
+    caop(MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/C_B_I.java b/java/test/Ice/inheritance/CBI.java
index 42194c890f1..ed6cba55c13 100644
--- a/java/test/Ice/inheritance/C_B_I.java
+++ b/java/test/Ice/inheritance/CBI.java
@@ -8,21 +8,21 @@
 //
 // **********************************************************************
 
-public final class C_B_I extends M_B.C_B
+public final class CBI extends MB.CB
 {
     public
-    C_B_I()
+    CBI()
     {
     }
 
-    public M_A.C_APrx
-    ca(M_A.C_APrx p, Ice.Current current)
+    public MA.CAPrx
+    caop(MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.C_BPrx
-    cb(M_B.C_BPrx p, Ice.Current current)
+    public MB.CBPrx
+    cbop(MB.CBPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/C_C_I.java b/java/test/Ice/inheritance/CCI.java
index b65b4dab8c9..179b43b70a2 100644
--- a/java/test/Ice/inheritance/C_C_I.java
+++ b/java/test/Ice/inheritance/CCI.java
@@ -8,27 +8,27 @@
 //
 // **********************************************************************
 
-public final class C_C_I extends M_A.C_C
+public final class CCI extends MA.CC
 {
     public
-    C_C_I()
+    CCI()
     {
     }
 
-    public M_A.C_APrx
-    ca(M_A.C_APrx p, Ice.Current current)
+    public MA.CAPrx
+    caop(MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_A.C_CPrx
-    cc(M_A.C_CPrx p, Ice.Current current)
+    public MA.CCPrx
+    ccop(MA.CCPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.C_BPrx
-    cb(M_B.C_BPrx p, Ice.Current current)
+    public MB.CBPrx
+    cbop(MB.CBPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java
new file mode 100644
index 00000000000..caa8814292f
--- /dev/null
+++ b/java/test/Ice/inheritance/CDI.java
@@ -0,0 +1,59 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// Mutable Realms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+public final class CDI extends MA.CD
+{
+    public
+    CDI()
+    {
+    }
+
+    public MA.CAPrx
+    caop(MA.CAPrx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MA.CCPrx
+    ccop(MA.CCPrx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MA.CDPrx
+    cdop(MA.CDPrx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MA.IAPrx
+    iaop(MA.IAPrx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MB.CBPrx
+    cbop(MB.CBPrx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MB.IB1Prx
+    ib1op(MB.IB1Prx p, Ice.Current current)
+    {
+        return p;
+    }
+
+    public MB.IB2Prx
+    ib2op(MB.IB2Prx p, Ice.Current current)
+    {
+        return p;
+    }
+}
diff --git a/java/test/Ice/inheritance/C_D_I.java b/java/test/Ice/inheritance/C_D_I.java
deleted file mode 100644
index e48cc29d914..00000000000
--- a/java/test/Ice/inheritance/C_D_I.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// Mutable Realms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-public final class C_D_I extends M_A.C_D
-{
-    public
-    C_D_I()
-    {
-    }
-
-    public M_A.C_APrx
-    ca(M_A.C_APrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_A.C_CPrx
-    cc(M_A.C_CPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_A.C_DPrx
-    cd(M_A.C_DPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_A.I_APrx
-    ia(M_A.I_APrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_B.C_BPrx
-    cb(M_B.C_BPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_B.I_B1Prx
-    ib1(M_B.I_B1Prx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public M_B.I_B2Prx
-    ib2(M_B.I_B2Prx p, Ice.Current current)
-    {
-        return p;
-    }
-}
diff --git a/java/test/Ice/inheritance/I_A_I.java b/java/test/Ice/inheritance/IAI.java
index 50b47a1de6d..4bb9dadf19b 100644
--- a/java/test/Ice/inheritance/I_A_I.java
+++ b/java/test/Ice/inheritance/IAI.java
@@ -8,15 +8,15 @@
 //
 // **********************************************************************
 
-public final class I_A_I extends M_A._I_ADisp
+public final class IAI extends MA._IADisp
 {
     public
-    I_A_I()
+    IAI()
     {
     }
 
-    public M_A.I_APrx
-    ia(M_A.I_APrx p, Ice.Current current)
+    public MA.IAPrx
+    iaop(MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/I_B2_I.java b/java/test/Ice/inheritance/IB1I.java
index fb8391737fc..899a2e21db6 100644
--- a/java/test/Ice/inheritance/I_B2_I.java
+++ b/java/test/Ice/inheritance/IB1I.java
@@ -8,21 +8,21 @@
 //
 // **********************************************************************
 
-public final class I_B2_I extends M_B._I_B2Disp
+public final class IB1I extends MB._IB1Disp
 {
     public
-    I_B2_I()
+    IB1I()
     {
     }
 
-    public M_A.I_APrx
-    ia(M_A.I_APrx p, Ice.Current current)
+    public MA.IAPrx
+    iaop(MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.I_B2Prx
-    ib2(M_B.I_B2Prx p, Ice.Current current)
+    public MB.IB1Prx
+    ib1op(MB.IB1Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/I_B1_I.java b/java/test/Ice/inheritance/IB2I.java
index 2a7cc06aebd..35818e93eba 100644
--- a/java/test/Ice/inheritance/I_B1_I.java
+++ b/java/test/Ice/inheritance/IB2I.java
@@ -8,21 +8,21 @@
 //
 // **********************************************************************
 
-public final class I_B1_I extends M_B._I_B1Disp
+public final class IB2I extends MB._IB2Disp
 {
     public
-    I_B1_I()
+    IB2I()
     {
     }
 
-    public M_A.I_APrx
-    ia(M_A.I_APrx p, Ice.Current current)
+    public MA.IAPrx
+    iaop(MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.I_B1Prx
-    ib1(M_B.I_B1Prx p, Ice.Current current)
+    public MB.IB2Prx
+    ib2op(MB.IB2Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/I_C_I.java b/java/test/Ice/inheritance/ICI.java
index 8a14beb6090..96812379697 100644
--- a/java/test/Ice/inheritance/I_C_I.java
+++ b/java/test/Ice/inheritance/ICI.java
@@ -8,33 +8,33 @@
 //
 // **********************************************************************
 
-public final class I_C_I extends M_A._I_CDisp
+public final class ICI extends MA._ICDisp
 {
     public
-    I_C_I()
+    ICI()
     {
     }
 
-    public M_A.I_APrx
-    ia(M_A.I_APrx p, Ice.Current current)
+    public MA.IAPrx
+    iaop(MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_A.I_CPrx
-    ic(M_A.I_CPrx p, Ice.Current current)
+    public MA.ICPrx
+    icop(MA.ICPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.I_B1Prx
-    ib1(M_B.I_B1Prx p, Ice.Current current)
+    public MB.IB1Prx
+    ib1op(MB.IB1Prx p, Ice.Current current)
     {
         return p;
     }
 
-    public M_B.I_B2Prx
-    ib2(M_B.I_B2Prx p, Ice.Current current)
+    public MB.IB2Prx
+    ib2op(MB.IB2Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java
index b51d2aa8081..288ef916631 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/Ice/inheritance/InitialI.java
@@ -14,68 +14,68 @@ public final class InitialI extends _InitialDisp
     InitialI(Ice.ObjectAdapter adapter)
     {
         _adapter = adapter;
-        _ca = M_A.C_APrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new C_A_I()));
-        _cb = M_B.C_BPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new C_B_I()));
-        _cc = M_A.C_CPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new C_C_I()));
-        _cd = M_A.C_DPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new C_D_I()));
-        _ia = M_A.I_APrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new I_A_I()));
-        _ib1 = M_B.I_B1PrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new I_B1_I()));
-        _ib2 = M_B.I_B2PrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new I_B2_I()));
-        _ic = M_A.I_CPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new I_C_I()));
+        _ca = MA.CAPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new CAI()));
+        _cb = MB.CBPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new CBI()));
+        _cc = MA.CCPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new CCI()));
+        _cd = MA.CDPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new CDI()));
+        _ia = MA.IAPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new IAI()));
+        _ib1 = MB.IB1PrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new IB1I()));
+        _ib2 = MB.IB2PrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new IB2I()));
+        _ic = MA.ICPrxHelper.uncheckedCast(
+            _adapter.addWithUUID(new ICI()));
     }
 
-    public M_A.C_APrx
-    c_a(Ice.Current current)
+    public MA.CAPrx
+    caop(Ice.Current current)
     {
         return _ca;
     }
 
-    public M_B.C_BPrx
-    c_b(Ice.Current current)
+    public MB.CBPrx
+    cbop(Ice.Current current)
     {
         return _cb;
     }
 
-    public M_A.C_CPrx
-    c_c(Ice.Current current)
+    public MA.CCPrx
+    ccop(Ice.Current current)
     {
         return _cc;
     }
 
-    public M_A.C_DPrx
-    c_d(Ice.Current current)
+    public MA.CDPrx
+    cdop(Ice.Current current)
     {
         return _cd;
     }
 
-    public M_A.I_APrx
-    i_a(Ice.Current current)
+    public MA.IAPrx
+    iaop(Ice.Current current)
     {
         return _ia;
     }
 
-    public M_B.I_B1Prx
-    i_b1(Ice.Current current)
+    public MB.IB1Prx
+    ib1op(Ice.Current current)
     {
         return _ib1;
     }
 
-    public M_B.I_B2Prx
-    i_b2(Ice.Current current)
+    public MB.IB2Prx
+    ib2op(Ice.Current current)
     {
         return _ib2;
     }
 
-    public M_A.I_CPrx
-    i_c(Ice.Current current)
+    public MA.ICPrx
+    icop(Ice.Current current)
     {
         return _ic;
     }
@@ -87,12 +87,12 @@ public final class InitialI extends _InitialDisp
     }
 
     private Ice.ObjectAdapter _adapter;
-    private M_A.C_APrx _ca;
-    private M_B.C_BPrx _cb;
-    private M_A.C_CPrx _cc;
-    private M_A.C_DPrx _cd;
-    private M_A.I_APrx _ia;
-    private M_B.I_B1Prx _ib1;
-    private M_B.I_B2Prx _ib2;
-    private M_A.I_CPrx _ic;
+    private MA.CAPrx _ca;
+    private MB.CBPrx _cb;
+    private MA.CCPrx _cc;
+    private MA.CDPrx _cd;
+    private MA.IAPrx _ia;
+    private MB.IB1Prx _ib1;
+    private MB.IB2Prx _ib2;
+    private MA.ICPrx _ic;
 }
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice
index bdb1e2ec96e..2e13e8eb27f 100644
--- a/java/test/Ice/inheritance/Test.ice
+++ b/java/test/Ice/inheritance/Test.ice
@@ -8,60 +8,60 @@
 //
 // **********************************************************************
 
-#ifndef TEST_ICE
-#define TEST_ICE
+#ifndef TESTICE
+#define TESTICE
 
-module M_A
+module MA
 {
 
-interface I_A
+interface IA
 {
-    I_A* ia(I_A* p);
+    IA* iaop(IA* p);
 };
 
-class C_A
+class CA
 {
-    C_A* ca(C_A* p);
+    CA* caop(CA* p);
 };
 
 };
 
-module M_B
+module MB
 {
 
-interface I_B1 extends M_A::I_A
+interface IB1 extends MA::IA
 {
-    I_B1* ib1(I_B1* p);
+    IB1* ib1op(IB1* p);
 };
 
-interface I_B2 extends M_A::I_A
+interface IB2 extends MA::IA
 {
-    I_B2* ib2(I_B2* p);
+    IB2* ib2op(IB2* p);
 };
 
-class C_B extends M_A::C_A
+class CB extends MA::CA
 {
-    C_B* cb(C_B* p);
+    CB* cbop(CB* p);
 };
 
 };
 
-module M_A
+module MA
 {
 
-interface I_C extends M_B::I_B1, M_B::I_B2
+interface IC extends MB::IB1, MB::IB2
 {
-    I_C* ic(I_C* p);
+    IC* icop(IC* p);
 };
 
-class C_C extends M_B::C_B
+class CC extends MB::CB
 {
-    C_C* cc(C_C* p);
+    CC* ccop(CC* p);
 };
 
-class C_D extends C_C implements M_B::I_B1, M_B::I_B2
+class CD extends CC implements MB::IB1, MB::IB2
 {
-    C_D* cd(C_D* p);
+    CD* cdop(CD* p);
 };
 
 };
@@ -69,14 +69,14 @@ class C_D extends C_C implements M_B::I_B1, M_B::I_B2
 interface Initial
 {
     void shutdown();
-    M_A::C_A* c_a();
-    M_B::C_B* c_b();
-    M_A::C_C* c_c();
-    M_A::C_D* c_d();
-    M_A::I_A* i_a();
-    M_B::I_B1* i_b1();
-    M_B::I_B2* i_b2();
-    M_A::I_C* i_c();
+    MA::CA* caop();
+    MB::CB* cbop();
+    MA::CC* ccop();
+    MA::CD* cdop();
+    MA::IA* iaop();
+    MB::IB1* ib1op();
+    MB::IB2* ib2op();
+    MA::IC* icop();
 };
 
 #endif