Deprecation of global Slice definitions.

117 files changed, 578 insertions, 2833 deletions

diff --git a/java/test/Glacier/starter/Callback.ice b/java/test/Glacier/starter/Callback.ice
index fb56ee553d1..7fe414331e9 100644
--- a/java/test/Glacier/starter/Callback.ice
+++ b/java/test/Glacier/starter/Callback.ice
@@ -10,6 +10,9 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
+module Test
+{
+
 exception CallbackException
 {
     double someValue;
@@ -34,4 +37,6 @@ class Callback
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index e026b19805a..7282dc6f673 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 class CallbackClient extends Ice.Application
 {
     public int
diff --git a/java/test/Glacier/starter/CallbackI.java b/java/test/Glacier/starter/CallbackI.java
index 048f4c47aac..2b3ddbb8e71 100644
--- a/java/test/Glacier/starter/CallbackI.java
+++ b/java/test/Glacier/starter/CallbackI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 final class CallbackI extends Callback
 {
     CallbackI(Ice.Communicator communicator)
diff --git a/java/test/Glacier/starter/CallbackReceiverI.java b/java/test/Glacier/starter/CallbackReceiverI.java
index 5e5d8ff8dcc..89f8ff891b5 100644
--- a/java/test/Glacier/starter/CallbackReceiverI.java
+++ b/java/test/Glacier/starter/CallbackReceiverI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 final class CallbackReceiverI extends CallbackReceiver
 {
     CallbackReceiverI()
diff --git a/java/test/Glacier/starter/CallbackServer.java b/java/test/Glacier/starter/CallbackServer.java
index afe840fe1c0..c57e82f9d6c 100644
--- a/java/test/Glacier/starter/CallbackServer.java
+++ b/java/test/Glacier/starter/CallbackServer.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 class CallbackServer extends Ice.Application
 {
     public int
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index d9a0a22bc97..a93c2deccd9 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -18,7 +20,7 @@ public class AllTests
         }
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTests(Ice.Communicator communicator)
     {
         System.out.print("testing stringToProxy... ");
@@ -30,7 +32,7 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        TestPrx obj = TestPrxHelper.checkedCast(base);
+        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
         test(obj != null);
         test(obj.equals(base));
         System.out.println("ok");
diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/Ice/adapterDeactivation/CookieI.java
index f2b653a37ab..f83d53c5b8f 100644
--- a/java/test/Ice/adapterDeactivation/CookieI.java
+++ b/java/test/Ice/adapterDeactivation/CookieI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class CookieI extends Cookie
 {
     public String
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index aed23396c93..2fb210c1ff8 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
 {
     public
diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/Ice/adapterDeactivation/Test.ice
index 61e539de9be..30c397569bc 100644
--- a/java/test/Ice/adapterDeactivation/Test.ice
+++ b/java/test/Ice/adapterDeactivation/Test.ice
@@ -10,7 +10,10 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-interface Test
+module Test
+{
+
+interface TestIntf
 {
     void transient();
 
@@ -22,4 +25,6 @@ local class Cookie
     nonmutating string message();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/Ice/adapterDeactivation/TestI.java
index d35599a1426..9cf9f7c076b 100644
--- a/java/test/Ice/adapterDeactivation/TestI.java
+++ b/java/test/Ice/adapterDeactivation/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public void
     _transient(Ice.Current current)
diff --git a/java/test/Ice/checksum/client/Types.ice b/java/test/Ice/checksum/client/Types.ice
index 5162f718775..1fd712e3963 100644
--- a/java/test/Ice/checksum/client/Types.ice
+++ b/java/test/Ice/checksum/client/Types.ice
@@ -10,6 +10,9 @@
 #ifndef CLASS_ICE
 #define CLASS_ICE
 
+module Test
+{
+
 //
 // TEST: Same
 //
@@ -432,4 +435,6 @@ local class LocalClass
 {
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/checksum/server/Types.ice b/java/test/Ice/checksum/server/Types.ice
index 0dd61483918..3f848504eb3 100644
--- a/java/test/Ice/checksum/server/Types.ice
+++ b/java/test/Ice/checksum/server/Types.ice
@@ -10,6 +10,9 @@
 #ifndef CLASS_ICE
 #define CLASS_ICE
 
+module Test
+{
+
 //
 // TEST: Same
 //
@@ -427,4 +430,6 @@ local class LocalClass
 {
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java
index 7caa9e220f4..21beb2ad679 100644
--- a/java/test/Ice/custom/AllTests.java
+++ b/java/test/Ice/custom/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -18,7 +20,7 @@ public class AllTests
         }
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTests(Ice.Communicator communicator)
     {
         System.out.print("testing stringToProxy... ");
@@ -30,7 +32,7 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        TestPrx t = TestPrxHelper.checkedCast(obj);
+        TestIntfPrx t = TestIntfPrxHelper.checkedCast(obj);
         test(t != null);
         test(t.equals(obj));
         System.out.println("ok");
diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java
index 4bed35f2413..d4eb5361446 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/Ice/custom/Client.java
@@ -7,12 +7,14 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        TestPrx test = AllTests.allTests(communicator);
+        TestIntfPrx test = AllTests.allTests(communicator);
         test.shutdown();
         return 0;
     }
diff --git a/java/test/Ice/custom/Test.ice b/java/test/Ice/custom/Test.ice
index ce5b7477a8b..e715fd2448a 100644
--- a/java/test/Ice/custom/Test.ice
+++ b/java/test/Ice/custom/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 class C {};
 
 sequence<C> CSeq;
@@ -39,7 +42,7 @@ dictionary<int, string> D;
 
 sequence<StringSeq> StringSeqSeq;
 
-class Test
+class TestIntf
 {
     CSeq opCSeq(CSeq inSeq, out CSeq outSeq);
     CArray opCArray(CArray inSeq, out CArray outSeq);
@@ -62,4 +65,6 @@ class Test
     ["java:type:java.util.ArrayList"] CSeq seq;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java
index 841b9c9851b..c2b6efe568a 100644
--- a/java/test/Ice/custom/TestI.java
+++ b/java/test/Ice/custom/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends Test
+import Test.*;
+
+public final class TestI extends TestIntf
 {
     public
     TestI(Ice.Communicator communicator)
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index a182c19a8c2..c6392c12003 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index 9df1ff4576f..5f053e4d0eb 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/Ice/exceptions/EmptyI.java
index 29c04eaf89c..798e8d20f77 100644
--- a/java/test/Ice/exceptions/EmptyI.java
+++ b/java/test/Ice/exceptions/EmptyI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class EmptyI extends _EmptyDisp
 {
 }
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index f6d13e9d1df..770654b6ee8 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 interface Empty
 {
 };
@@ -63,4 +66,6 @@ exception D
     void noSuchOperation();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index 4006e6a215f..47684ce5c86 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class ThrowerI extends _ThrowerDisp
 {
     public
diff --git a/java/test/Ice/exceptionsAMD/TestAMD.ice b/java/test/Ice/exceptionsAMD/TestAMD.ice
index 11719036fda..ce98802bc9c 100644
--- a/java/test/Ice/exceptionsAMD/TestAMD.ice
+++ b/java/test/Ice/exceptionsAMD/TestAMD.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_AMD_ICE
 #define TEST_AMD_ICE
 
+module Test
+{
+
 interface Thrower;
 
 exception A
@@ -58,4 +61,6 @@ exception D
     void noSuchOperation();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/exceptionsAMD/ThrowerI.java b/java/test/Ice/exceptionsAMD/ThrowerI.java
index be7a9f2e116..b00b4feafa8 100644
--- a/java/test/Ice/exceptionsAMD/ThrowerI.java
+++ b/java/test/Ice/exceptionsAMD/ThrowerI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class ThrowerI extends _ThrowerDisp
 {
     public
diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java
index 84f93f2046b..ce18a6955ca 100644
--- a/java/test/Ice/facets/AI.java
+++ b/java/test/Ice/facets/AI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class AI extends _ADisp
 {
     public
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 1f83dedde45..061926a7640 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java
index 5dc13f18884..7796fbc3a6b 100644
--- a/java/test/Ice/facets/BI.java
+++ b/java/test/Ice/facets/BI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class BI extends _BDisp
 {
     public
diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java
index b7bc6a89396..13f8fa4d369 100644
--- a/java/test/Ice/facets/CI.java
+++ b/java/test/Ice/facets/CI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class CI extends _CDisp
 {
     public
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index 3aa5592873d..b934a152322 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java
index 2d086fd708f..e05dd828ad6 100644
--- a/java/test/Ice/facets/DI.java
+++ b/java/test/Ice/facets/DI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class DI extends _DDisp
 {
     public
diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java
index f3b2e7af2e6..6df929c2480 100644
--- a/java/test/Ice/facets/EI.java
+++ b/java/test/Ice/facets/EI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class EI extends _EDisp
 {
     public
diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/Ice/facets/EmptyI.java
index 29c04eaf89c..798e8d20f77 100644
--- a/java/test/Ice/facets/EmptyI.java
+++ b/java/test/Ice/facets/EmptyI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class EmptyI extends _EmptyDisp
 {
 }
diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java
index 68e766f6da2..d27023bf8b1 100644
--- a/java/test/Ice/facets/FI.java
+++ b/java/test/Ice/facets/FI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class FI extends _FDisp
 {
     public
diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java
index ea39ff00943..08042a185ac 100644
--- a/java/test/Ice/facets/GI.java
+++ b/java/test/Ice/facets/GI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class GI extends _GDisp
 {
     public
diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java
index df2e7636328..3a00c3eb975 100644
--- a/java/test/Ice/facets/HI.java
+++ b/java/test/Ice/facets/HI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class HI extends _HDisp
 {
     public
diff --git a/java/test/Ice/facets/Test.ice b/java/test/Ice/facets/Test.ice
index adfcb0b9c31..3ee6b51a8f1 100644
--- a/java/test/Ice/facets/Test.ice
+++ b/java/test/Ice/facets/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 interface Empty
 {
 };
@@ -55,4 +58,6 @@ interface H extends G
     string callH();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index 6bb918f5c6c..577f94b7934 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     public static void
@@ -60,7 +62,7 @@ public class AllTests
 	private boolean _called;
     }
 
-    private static class AMI_Test_pidI extends AMI_Test_pid
+    private static class AMI_Test_pidI extends AMI_TestIntf_pid
     {
 	public void
 	ice_response(int pid)
@@ -98,7 +100,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
     
-    private static class AMI_Test_shutdownI extends AMI_Test_shutdown
+    private static class AMI_Test_shutdownI extends AMI_TestIntf_shutdown
     {
 	public void
 	ice_response()
@@ -127,7 +129,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
     
-    private static class AMI_Test_abortI extends AMI_Test_abort
+    private static class AMI_Test_abortI extends AMI_TestIntf_abort
     {
 	public void
 	ice_response()
@@ -173,7 +175,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
     
-    private static class AMI_Test_idempotentAbortI extends AMI_Test_idempotentAbort
+    private static class AMI_Test_idempotentAbortI extends AMI_TestIntf_idempotentAbort
     {
 	public void
 	ice_response()
@@ -202,7 +204,7 @@ public class AllTests
 	private AMI_Test_abortI delegate = new AMI_Test_abortI();
     }
     
-    private static class AMI_Test_nonmutatingAbortI extends AMI_Test_nonmutatingAbort
+    private static class AMI_Test_nonmutatingAbortI extends AMI_TestIntf_nonmutatingAbort
     {
 	public void
 	ice_response()
@@ -247,7 +249,7 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        TestPrx obj = TestPrxHelper.checkedCast(base);
+        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
         test(obj != null);
         test(obj.equals(base));
         System.out.println("ok");
diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/Ice/faultTolerance/Test.ice
index aa61a3d687f..9f054386a61 100644
--- a/java/test/Ice/faultTolerance/Test.ice
+++ b/java/test/Ice/faultTolerance/Test.ice
@@ -10,7 +10,10 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-["ami"] interface Test
+module Test
+{
+
+["ami"] interface TestIntf
 {
     void shutdown();
     void abort();
@@ -19,4 +22,6 @@
     idempotent int pid();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java
index db6ba133d80..c6d31b813ad 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/Ice/faultTolerance/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter, int port)
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index 2210d3ca1dc..c20d0a652f6 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -18,7 +18,7 @@ public class AllTests
         }
     }
 
-    public static InitialPrx
+    public static Test.InitialPrx
     allTests(Ice.Communicator communicator)
     {
         System.out.print("testing stringToProxy... ");
@@ -30,17 +30,17 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        InitialPrx initial = InitialPrxHelper.checkedCast(base);
+        Test.InitialPrx initial = Test.InitialPrxHelper.checkedCast(base);
         test(initial != null);
         test(initial.equals(base));
         System.out.println("ok");
 
         System.out.print("getting proxies for class hierarchy... ");
         System.out.flush();
-        MA.CAPrx ca = initial.caop();
-        MB.CBPrx cb = initial.cbop();
-        MA.CCPrx cc = initial.ccop();
-        MA.CDPrx cd = initial.cdop();
+        Test.MA.CAPrx ca = initial.caop();
+        Test.MB.CBPrx cb = initial.cbop();
+        Test.MA.CCPrx cc = initial.ccop();
+        Test.MA.CDPrx cd = initial.cdop();
         test(ca != cb);
         test(ca != cc);
         test(ca != cd);
@@ -51,10 +51,10 @@ public class AllTests
 
         System.out.print("getting proxies for interface hierarchy... ");
         System.out.flush();
-        MA.IAPrx ia = initial.iaop();
-        MB.IB1Prx ib1 = initial.ib1op();
-        MB.IB2Prx ib2 = initial.ib2op();
-        MA.ICPrx ic = initial.icop();
+        Test.MA.IAPrx ia = initial.iaop();
+        Test.MB.IB1Prx ib1 = initial.ib1op();
+        Test.MB.IB2Prx ib2 = initial.ib2op();
+        Test.MA.ICPrx ic = initial.icop();
         test(ia != ib1);
         test(ia != ib2);
         test(ia != ic);
@@ -64,9 +64,9 @@ public class AllTests
 
         System.out.print("invoking proxy operations on class hierarchy... ");
         System.out.flush();
-        MA.CAPrx cao;
-        MB.CBPrx cbo;
-        MA.CCPrx cco;
+        Test.MA.CAPrx cao;
+        Test.MB.CBPrx cbo;
+        Test.MA.CCPrx cco;
         
         cao = ca.caop(ca);
         test(cao.equals(ca));
@@ -114,10 +114,10 @@ public class AllTests
 
         System.out.print("ditto, but for interface hierarchy... ");
         System.out.flush();
-        MA.IAPrx iao;
-        MB.IB1Prx ib1o;
-        MB.IB2Prx ib2o;
-        MA.ICPrx ico;
+        Test.MA.IAPrx iao;
+        Test.MB.IB1Prx ib1o;
+        Test.MB.IB2Prx ib2o;
+        Test.MA.ICPrx ico;
 
         iao = ia.iaop(ia);
         test(iao.equals(ia));
@@ -198,7 +198,7 @@ public class AllTests
 
         System.out.print("ditto, but for class implementing interfaces... ");
         System.out.flush();
-        MA.CDPrx cdo;
+        Test.MA.CDPrx cdo;
 
         cao = cd.caop(cd);
         test(cao.equals(cd));
diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java
index 8b5d9ef263c..a4c6d3b7f65 100644
--- a/java/test/Ice/inheritance/CAI.java
+++ b/java/test/Ice/inheritance/CAI.java
@@ -7,15 +7,15 @@
 //
 // **********************************************************************
 
-public final class CAI extends MA.CA
+public final class CAI extends Test.MA.CA
 {
     public
     CAI()
     {
     }
 
-    public MA.CAPrx
-    caop(MA.CAPrx p, Ice.Current current)
+    public Test.MA.CAPrx
+    caop(Test.MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java
index 6ede8b568b1..d0a2056aa67 100644
--- a/java/test/Ice/inheritance/CBI.java
+++ b/java/test/Ice/inheritance/CBI.java
@@ -7,21 +7,21 @@
 //
 // **********************************************************************
 
-public final class CBI extends MB.CB
+public final class CBI extends Test.MB.CB
 {
     public
     CBI()
     {
     }
 
-    public MA.CAPrx
-    caop(MA.CAPrx p, Ice.Current current)
+    public Test.MA.CAPrx
+    caop(Test.MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.CBPrx
-    cbop(MB.CBPrx p, Ice.Current current)
+    public Test.MB.CBPrx
+    cbop(Test.MB.CBPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java
index c04b5c3a8af..1df898246dc 100644
--- a/java/test/Ice/inheritance/CCI.java
+++ b/java/test/Ice/inheritance/CCI.java
@@ -7,27 +7,27 @@
 //
 // **********************************************************************
 
-public final class CCI extends MA.CC
+public final class CCI extends Test.MA.CC
 {
     public
     CCI()
     {
     }
 
-    public MA.CAPrx
-    caop(MA.CAPrx p, Ice.Current current)
+    public Test.MA.CAPrx
+    caop(Test.MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MA.CCPrx
-    ccop(MA.CCPrx p, Ice.Current current)
+    public Test.MA.CCPrx
+    ccop(Test.MA.CCPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.CBPrx
-    cbop(MB.CBPrx p, Ice.Current current)
+    public Test.MB.CBPrx
+    cbop(Test.MB.CBPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java
index cd40db1856c..b030f9f30df 100644
--- a/java/test/Ice/inheritance/CDI.java
+++ b/java/test/Ice/inheritance/CDI.java
@@ -7,51 +7,51 @@
 //
 // **********************************************************************
 
-public final class CDI extends MA.CD
+public final class CDI extends Test.MA.CD
 {
     public
     CDI()
     {
     }
 
-    public MA.CAPrx
-    caop(MA.CAPrx p, Ice.Current current)
+    public Test.MA.CAPrx
+    caop(Test.MA.CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MA.CCPrx
-    ccop(MA.CCPrx p, Ice.Current current)
+    public Test.MA.CCPrx
+    ccop(Test.MA.CCPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MA.CDPrx
-    cdop(MA.CDPrx p, Ice.Current current)
+    public Test.MA.CDPrx
+    cdop(Test.MA.CDPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MA.IAPrx
-    iaop(MA.IAPrx p, Ice.Current current)
+    public Test.MA.IAPrx
+    iaop(Test.MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.CBPrx
-    cbop(MB.CBPrx p, Ice.Current current)
+    public Test.MB.CBPrx
+    cbop(Test.MB.CBPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB1Prx
-    ib1op(MB.IB1Prx p, Ice.Current current)
+    public Test.MB.IB1Prx
+    ib1op(Test.MB.IB1Prx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB2Prx
-    ib2op(MB.IB2Prx p, Ice.Current current)
+    public Test.MB.IB2Prx
+    ib2op(Test.MB.IB2Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index f44c53c0dc9..01e365c9a85 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java
index f5a3b85baf6..5dfabdd78fb 100644
--- a/java/test/Ice/inheritance/IAI.java
+++ b/java/test/Ice/inheritance/IAI.java
@@ -7,15 +7,15 @@
 //
 // **********************************************************************
 
-public final class IAI extends MA._IADisp
+public final class IAI extends Test.MA._IADisp
 {
     public
     IAI()
     {
     }
 
-    public MA.IAPrx
-    iaop(MA.IAPrx p, Ice.Current current)
+    public Test.MA.IAPrx
+    iaop(Test.MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java
index 536ac0336da..e8f46fadd80 100644
--- a/java/test/Ice/inheritance/IB1I.java
+++ b/java/test/Ice/inheritance/IB1I.java
@@ -7,21 +7,21 @@
 //
 // **********************************************************************
 
-public final class IB1I extends MB._IB1Disp
+public final class IB1I extends Test.MB._IB1Disp
 {
     public
     IB1I()
     {
     }
 
-    public MA.IAPrx
-    iaop(MA.IAPrx p, Ice.Current current)
+    public Test.MA.IAPrx
+    iaop(Test.MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB1Prx
-    ib1op(MB.IB1Prx p, Ice.Current current)
+    public Test.MB.IB1Prx
+    ib1op(Test.MB.IB1Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java
index 0c1d60c4a28..1a6598f4bc3 100644
--- a/java/test/Ice/inheritance/IB2I.java
+++ b/java/test/Ice/inheritance/IB2I.java
@@ -7,21 +7,21 @@
 //
 // **********************************************************************
 
-public final class IB2I extends MB._IB2Disp
+public final class IB2I extends Test.MB._IB2Disp
 {
     public
     IB2I()
     {
     }
 
-    public MA.IAPrx
-    iaop(MA.IAPrx p, Ice.Current current)
+    public Test.MA.IAPrx
+    iaop(Test.MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB2Prx
-    ib2op(MB.IB2Prx p, Ice.Current current)
+    public Test.MB.IB2Prx
+    ib2op(Test.MB.IB2Prx p, Ice.Current current)
     {
         return p;
     }
diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java
index d893438aeeb..16e98f73f09 100644
--- a/java/test/Ice/inheritance/ICI.java
+++ b/java/test/Ice/inheritance/ICI.java
@@ -7,33 +7,33 @@
 //
 // **********************************************************************
 
-public final class ICI extends MA._ICDisp
+public final class ICI extends Test.MA._ICDisp
 {
     public
     ICI()
     {
     }
 
-    public MA.IAPrx
-    iaop(MA.IAPrx p, Ice.Current current)
+    public Test.MA.IAPrx
+    iaop(Test.MA.IAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MA.ICPrx
-    icop(MA.ICPrx p, Ice.Current current)
+    public Test.MA.ICPrx
+    icop(Test.MA.ICPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB1Prx
-    ib1op(MB.IB1Prx p, Ice.Current current)
+    public Test.MB.IB1Prx
+    ib1op(Test.MB.IB1Prx p, Ice.Current current)
     {
         return p;
     }
 
-    public MB.IB2Prx
-    ib2op(MB.IB2Prx p, Ice.Current current)
+    public Test.MB.IB2Prx
+    ib2op(Test.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 a932de05350..cdbb1986712 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/Ice/inheritance/InitialI.java
@@ -7,73 +7,73 @@
 //
 // **********************************************************************
 
-public final class InitialI extends _InitialDisp
+public final class InitialI extends Test._InitialDisp
 {
     public
     InitialI(Ice.ObjectAdapter adapter)
     {
         _adapter = adapter;
-        _ca = MA.CAPrxHelper.uncheckedCast(
+        _ca = Test.MA.CAPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new CAI()));
-        _cb = MB.CBPrxHelper.uncheckedCast(
+        _cb = Test.MB.CBPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new CBI()));
-        _cc = MA.CCPrxHelper.uncheckedCast(
+        _cc = Test.MA.CCPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new CCI()));
-        _cd = MA.CDPrxHelper.uncheckedCast(
+        _cd = Test.MA.CDPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new CDI()));
-        _ia = MA.IAPrxHelper.uncheckedCast(
+        _ia = Test.MA.IAPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new IAI()));
-        _ib1 = MB.IB1PrxHelper.uncheckedCast(
+        _ib1 = Test.MB.IB1PrxHelper.uncheckedCast(
             _adapter.addWithUUID(new IB1I()));
-        _ib2 = MB.IB2PrxHelper.uncheckedCast(
+        _ib2 = Test.MB.IB2PrxHelper.uncheckedCast(
             _adapter.addWithUUID(new IB2I()));
-        _ic = MA.ICPrxHelper.uncheckedCast(
+        _ic = Test.MA.ICPrxHelper.uncheckedCast(
             _adapter.addWithUUID(new ICI()));
     }
 
-    public MA.CAPrx
+    public Test.MA.CAPrx
     caop(Ice.Current current)
     {
         return _ca;
     }
 
-    public MB.CBPrx
+    public Test.MB.CBPrx
     cbop(Ice.Current current)
     {
         return _cb;
     }
 
-    public MA.CCPrx
+    public Test.MA.CCPrx
     ccop(Ice.Current current)
     {
         return _cc;
     }
 
-    public MA.CDPrx
+    public Test.MA.CDPrx
     cdop(Ice.Current current)
     {
         return _cd;
     }
 
-    public MA.IAPrx
+    public Test.MA.IAPrx
     iaop(Ice.Current current)
     {
         return _ia;
     }
 
-    public MB.IB1Prx
+    public Test.MB.IB1Prx
     ib1op(Ice.Current current)
     {
         return _ib1;
     }
 
-    public MB.IB2Prx
+    public Test.MB.IB2Prx
     ib2op(Ice.Current current)
     {
         return _ib2;
     }
 
-    public MA.ICPrx
+    public Test.MA.ICPrx
     icop(Ice.Current current)
     {
         return _ic;
@@ -86,12 +86,12 @@ public final class InitialI extends _InitialDisp
     }
 
     private Ice.ObjectAdapter _adapter;
-    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;
+    private Test.MA.CAPrx _ca;
+    private Test.MB.CBPrx _cb;
+    private Test.MA.CCPrx _cc;
+    private Test.MA.CDPrx _cd;
+    private Test.MA.IAPrx _ia;
+    private Test.MB.IB1Prx _ib1;
+    private Test.MB.IB2Prx _ib2;
+    private Test.MA.ICPrx _ic;
 }
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice
index 3c532e6e855..47e5ec41820 100644
--- a/java/test/Ice/inheritance/Test.ice
+++ b/java/test/Ice/inheritance/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TESTICE
 #define TESTICE
 
+module Test
+{
+
 module MA
 {
 
@@ -78,4 +81,6 @@ interface Initial
     MA::IC* icop();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index b5a63504cec..a01183231c4 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -45,11 +47,11 @@ public class AllTests
 
 	System.out.print("testing checked cast... ");
         System.out.flush();
-	TestPrx obj = TestPrxHelper.checkedCast(base);
+	TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
 	test(obj != null);
-	TestPrx obj2 = TestPrxHelper.checkedCast(base2);
+	TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2);
 	test(obj2 != null);
-	TestPrx obj3 = TestPrxHelper.checkedCast(base3);
+	TestIntfPrx obj3 = TestIntfPrxHelper.checkedCast(base3);
 	test(obj3 != null);
 	ServerManagerPrx obj4 = ServerManagerPrxHelper.checkedCast(base4);
 	test(obj4 != null);
diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java
index 3436535d9d9..5019a59f72d 100644
--- a/java/test/Ice/location/HelloI.java
+++ b/java/test/Ice/location/HelloI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class HelloI extends _HelloDisp
 {
     public void
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index 871cfe15f9a..dc207892900 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class ServerManagerI extends _ServerManagerDisp
 {
     ServerManagerI(Ice.ObjectAdapter adapter)
diff --git a/java/test/Ice/location/Test.ice b/java/test/Ice/location/Test.ice
index 03f7b371bf9..53e0a2fc2a9 100644
--- a/java/test/Ice/location/Test.ice
+++ b/java/test/Ice/location/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 interface ServerManager
 {
     void startServer();
@@ -21,11 +24,13 @@ interface Hello
     void sayHello();
 };
 
-interface Test
+interface TestIntf
 {
     void shutdown();
 
     Hello* getHello();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java
index 373bb50b44b..ea24d6a79c1 100644
--- a/java/test/Ice/location/TestI.java
+++ b/java/test/Ice/location/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class TestI extends _TestDisp
+import Test.*;
+
+public class TestI extends _TestIntfDisp
 {
     TestI(Ice.ObjectAdapter adapter)
     {
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index 9f31311b775..2ea9cb40dc1 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java
index 378cc8ad2c5..cc3eed75841 100644
--- a/java/test/Ice/objects/BI.java
+++ b/java/test/Ice/objects/BI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class BI extends B
 {
     public
diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java
index 5299b2218b8..c04eeaf19c3 100644
--- a/java/test/Ice/objects/CI.java
+++ b/java/test/Ice/objects/CI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class CI extends C
 {
     public
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index bb5b3c0a4ea..f174b4aa1fb 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
@@ -14,15 +16,15 @@ public class Client
         public Ice.Object
         create(String type)
         {
-            if(type.equals("::B"))
+            if(type.equals("::Test::B"))
             {
                 return new BI();
             }
-            else if(type.equals("::C"))
+            else if(type.equals("::Test::C"))
             {
                 return new CI();
             }
-            else if(type.equals("::D"))
+            else if(type.equals("::Test::D"))
             {
                 return new DI();
             }
@@ -41,9 +43,9 @@ public class Client
     run(String[] args, Ice.Communicator communicator)
     {
         Ice.ObjectFactory factory = new MyObjectFactory();
-        communicator.addObjectFactory(factory, "::B");
-        communicator.addObjectFactory(factory, "::C");
-        communicator.addObjectFactory(factory, "::D");
+        communicator.addObjectFactory(factory, "::Test::B");
+        communicator.addObjectFactory(factory, "::Test::C");
+        communicator.addObjectFactory(factory, "::Test::D");
 
         InitialPrx initial = AllTests.allTests(communicator, false);
         initial.shutdown();
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 4e550480892..0eb00e5ea3f 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Collocated
 {
     private static int
diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java
index 0b2a8a5c117..16d9f875b51 100644
--- a/java/test/Ice/objects/DI.java
+++ b/java/test/Ice/objects/DI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class DI extends D
 {
     public
diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java
index 5c11b97f3a0..5426e827dec 100644
--- a/java/test/Ice/objects/InitialI.java
+++ b/java/test/Ice/objects/InitialI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public final class InitialI extends Initial
 {
     public
diff --git a/java/test/Ice/objects/Test.ice b/java/test/Ice/objects/Test.ice
index 3f57616f160..90af1dacd63 100644
--- a/java/test/Ice/objects/Test.ice
+++ b/java/test/Ice/objects/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 class B;
 class C;
 
@@ -55,4 +58,6 @@ class Initial
     void getAll(out B b1, out B b2, out C theC, out D theD);
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/exceptions/Test.ice b/java/test/Ice/slicing/exceptions/Test.ice
index cc3e8b3f85f..1bf3f61f5b5 100644
--- a/java/test/Ice/slicing/exceptions/Test.ice
+++ b/java/test/Ice/slicing/exceptions/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 exception Base
 {
     string b;
@@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate
     string kmd;
 };
 
-["ami"] interface Test
+["ami"] interface TestIntf
 {
     void baseAsBase() throws Base;
     void unknownDerivedAsBase() throws Base;
@@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/exceptions/csrc/AllTests.java b/java/test/Ice/slicing/exceptions/csrc/AllTests.java
index 1460fa7c977..f4ad7bb6ad1 100644
--- a/java/test/Ice/slicing/exceptions/csrc/AllTests.java
+++ b/java/test/Ice/slicing/exceptions/csrc/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -60,7 +62,7 @@ public class AllTests
 	private boolean _called;
     }
 
-    private static class AMI_Test_baseAsBaseI extends AMI_Test_baseAsBase
+    private static class AMI_Test_baseAsBaseI extends AMI_TestIntf_baseAsBase
     {
         public void
 	ice_response()
@@ -84,7 +86,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("Base.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -102,7 +104,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_unknownDerivedAsBaseI extends AMI_Test_unknownDerivedAsBase
+    private static class AMI_Test_unknownDerivedAsBaseI extends AMI_TestIntf_unknownDerivedAsBase
     {
         public void
 	ice_response()
@@ -126,7 +128,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownDerived.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -144,7 +146,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_knownDerivedAsBaseI extends AMI_Test_knownDerivedAsBase
+    private static class AMI_Test_knownDerivedAsBaseI extends AMI_TestIntf_knownDerivedAsBase
     {
         public void
 	ice_response()
@@ -169,7 +171,7 @@ public class AllTests
 	    {
 		test(k.b.equals("KnownDerived.b"));
 		test(k.kd.equals("KnownDerived.kd"));
-		test(k.ice_name().equals("KnownDerived"));
+		test(k.ice_name().equals("Test::KnownDerived"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -187,7 +189,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_knownDerivedAsKnownDerivedI extends AMI_Test_knownDerivedAsKnownDerived
+    private static class AMI_Test_knownDerivedAsKnownDerivedI extends AMI_TestIntf_knownDerivedAsKnownDerived
     {
         public void
 	ice_response()
@@ -212,7 +214,7 @@ public class AllTests
 	    {
 		test(k.b.equals("KnownDerived.b"));
 		test(k.kd.equals("KnownDerived.kd"));
-		test(k.ice_name().equals("KnownDerived"));
+		test(k.ice_name().equals("Test::KnownDerived"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -230,7 +232,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_unknownIntermediateAsBaseI extends AMI_Test_unknownIntermediateAsBase
+    private static class AMI_Test_unknownIntermediateAsBaseI extends AMI_TestIntf_unknownIntermediateAsBase
     {
         public void
 	ice_response()
@@ -254,7 +256,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownIntermediate.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -272,7 +274,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_knownIntermediateAsBaseI extends AMI_Test_knownIntermediateAsBase
+    private static class AMI_Test_knownIntermediateAsBaseI extends AMI_TestIntf_knownIntermediateAsBase
     {
         public void
 	ice_response()
@@ -297,7 +299,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("KnownIntermediate.b"));
 		test(ki.ki.equals("KnownIntermediate.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -315,7 +317,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_knownMostDerivedAsBaseI extends AMI_Test_knownMostDerivedAsBase
+    private static class AMI_Test_knownMostDerivedAsBaseI extends AMI_TestIntf_knownMostDerivedAsBase
     {
         public void
 	ice_response()
@@ -341,7 +343,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -360,7 +362,7 @@ public class AllTests
     }
 
     private static class AMI_Test_knownIntermediateAsKnownIntermediateI
-	extends AMI_Test_knownIntermediateAsKnownIntermediate
+	extends AMI_TestIntf_knownIntermediateAsKnownIntermediate
     {
         public void
 	ice_response()
@@ -385,7 +387,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("KnownIntermediate.b"));
 		test(ki.ki.equals("KnownIntermediate.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -404,7 +406,7 @@ public class AllTests
     }
 
     private static class AMI_Test_knownMostDerivedAsKnownIntermediateI
-	extends AMI_Test_knownMostDerivedAsKnownIntermediate
+	extends AMI_TestIntf_knownMostDerivedAsKnownIntermediate
     {
         public void
 	ice_response()
@@ -430,7 +432,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -449,7 +451,7 @@ public class AllTests
     }
 
     private static class AMI_Test_knownMostDerivedAsKnownMostDerivedI
-	extends AMI_Test_knownMostDerivedAsKnownMostDerived
+	extends AMI_TestIntf_knownMostDerivedAsKnownMostDerived
     {
         public void
 	ice_response()
@@ -475,7 +477,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -493,7 +495,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_unknownMostDerived1AsBaseI extends AMI_Test_unknownMostDerived1AsBase
+    private static class AMI_Test_unknownMostDerived1AsBaseI extends AMI_TestIntf_unknownMostDerived1AsBase
     {
         public void
 	ice_response()
@@ -518,7 +520,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("UnknownMostDerived1.b"));
 		test(ki.ki.equals("UnknownMostDerived1.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -537,7 +539,7 @@ public class AllTests
     }
 
     private static class AMI_Test_unknownMostDerived1AsKnownIntermediateI
-	extends AMI_Test_unknownMostDerived1AsKnownIntermediate
+	extends AMI_TestIntf_unknownMostDerived1AsKnownIntermediate
     {
         public void
 	ice_response()
@@ -562,7 +564,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("UnknownMostDerived1.b"));
 		test(ki.ki.equals("UnknownMostDerived1.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -580,7 +582,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_unknownMostDerived2AsBaseI extends AMI_Test_unknownMostDerived2AsBase
+    private static class AMI_Test_unknownMostDerived2AsBaseI extends AMI_TestIntf_unknownMostDerived2AsBase
     {
         public void
 	ice_response()
@@ -604,7 +606,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownMostDerived2.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -622,7 +624,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTests(Ice.Communicator communicator, boolean collocated)
     {
         System.out.print("testing stringToProxy... ");
@@ -634,7 +636,7 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        TestPrx test = TestPrxHelper.checkedCast(base);
+        TestIntfPrx test = TestIntfPrxHelper.checkedCast(base);
         test(test != null);
         test(test.equals(base));
         System.out.println("ok");
@@ -650,7 +652,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("Base.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -681,7 +683,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownDerived.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -713,7 +715,7 @@ public class AllTests
 	    {
 		test(k.b.equals("KnownDerived.b"));
 		test(k.kd.equals("KnownDerived.kd"));
-		test(k.ice_name().equals("KnownDerived"));
+		test(k.ice_name().equals("Test::KnownDerived"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -745,7 +747,7 @@ public class AllTests
 	    {
 		test(k.b.equals("KnownDerived.b"));
 		test(k.kd.equals("KnownDerived.kd"));
-		test(k.ice_name().equals("KnownDerived"));
+		test(k.ice_name().equals("Test::KnownDerived"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -776,7 +778,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownIntermediate.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -808,7 +810,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("KnownIntermediate.b"));
 		test(ki.ki.equals("KnownIntermediate.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -841,7 +843,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -873,7 +875,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("KnownIntermediate.b"));
 		test(ki.ki.equals("KnownIntermediate.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -906,7 +908,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -939,7 +941,7 @@ public class AllTests
 		test(kmd.b.equals("KnownMostDerived.b"));
 		test(kmd.ki.equals("KnownMostDerived.ki"));
 		test(kmd.kmd.equals("KnownMostDerived.kmd"));
-		test(kmd.ice_name().equals("KnownMostDerived"));
+		test(kmd.ice_name().equals("Test::KnownMostDerived"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -971,7 +973,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("UnknownMostDerived1.b"));
 		test(ki.ki.equals("UnknownMostDerived1.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -1003,7 +1005,7 @@ public class AllTests
 	    {
 		test(ki.b.equals("UnknownMostDerived1.b"));
 		test(ki.ki.equals("UnknownMostDerived1.ki"));
-		test(ki.ice_name().equals("KnownIntermediate"));
+		test(ki.ice_name().equals("Test::KnownIntermediate"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
@@ -1035,7 +1037,7 @@ public class AllTests
 	    catch(Base b)
 	    {
 		test(b.b.equals("UnknownMostDerived2.b"));
-		test(b.ice_name().equals("Base"));
+		test(b.ice_name().equals("Test::Base"));
 		gotException = true;
 	    }
 	    catch(Exception ex)
diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java
index 85d80b81283..f86bdca4716 100644
--- a/java/test/Ice/slicing/exceptions/csrc/Client.java
+++ b/java/test/Ice/slicing/exceptions/csrc/Client.java
@@ -7,12 +7,14 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        TestPrx test = AllTests.allTests(communicator, false);
+        TestIntfPrx test = AllTests.allTests(communicator, false);
         test.shutdown();
         return 0;
     }
diff --git a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
index 7fb5f592869..49c3f3a81d0 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
+++ b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
@@ -12,6 +12,9 @@
 
 #include <Test.ice>
 
+module Test
+{
+
 exception UnknownDerived extends Base
 {
     string ud;
@@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate
    string umd2;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/exceptions/ssrc/TestI.java b/java/test/Ice/slicing/exceptions/ssrc/TestI.java
index 27d6a77a9a6..b5dc9b4e5be 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/TestI.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter)
diff --git a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
index 6d9bc64514b..c5245f6c759 100644
--- a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
+++ b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
@@ -12,6 +12,9 @@
 
 #include <TestAMD.ice>
 
+module Test
+{
+
 exception UnknownDerived extends Base
 {
     string ud;
@@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate
    string umd2;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
index 54f3dca65ec..989f71eb4b0 100644
--- a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
+++ b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_AMD_ICE
 #define TEST_AMD_ICE
 
+module Test
+{
+
 exception Base
 {
     string b;
@@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate
     string kmd;
 };
 
-["ami", "amd"] interface Test
+["ami", "amd"] interface TestIntf
 {
     void baseAsBase() throws Base;
     void unknownDerivedAsBase() throws Base;
@@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/exceptionsAMD/TestI.java b/java/test/Ice/slicing/exceptionsAMD/TestI.java
index a1d35f15963..730189d4ef4 100644
--- a/java/test/Ice/slicing/exceptionsAMD/TestI.java
+++ b/java/test/Ice/slicing/exceptionsAMD/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter)
@@ -16,14 +18,14 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    shutdown_async(AMD_Test_shutdown cb, Ice.Current current)
+    shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current)
     {
         _adapter.getCommunicator().shutdown();
 	cb.ice_response();
     }
 
     public void
-    baseAsBase_async(AMD_Test_baseAsBase cb, Ice.Current current)
+    baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current)
         throws Base
     {
         Base b = new Base();
@@ -32,7 +34,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    unknownDerivedAsBase_async(AMD_Test_unknownDerivedAsBase cb, Ice.Current current)
+    unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current)
         throws Base
     {
 	UnknownDerived d = new UnknownDerived();
@@ -42,7 +44,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownDerivedAsBase_async(AMD_Test_knownDerivedAsBase cb, Ice.Current current)
+    knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current)
         throws Base
     {
 	KnownDerived d = new KnownDerived();
@@ -52,7 +54,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownDerivedAsKnownDerived_async(AMD_Test_knownDerivedAsKnownDerived cb, Ice.Current current)
+    knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, Ice.Current current)
         throws KnownDerived
     {
 	KnownDerived d = new KnownDerived();
@@ -62,7 +64,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    unknownIntermediateAsBase_async(AMD_Test_unknownIntermediateAsBase cb, Ice.Current current)
+    unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current)
         throws Base
     {
 	UnknownIntermediate ui = new UnknownIntermediate();
@@ -72,7 +74,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownIntermediateAsBase_async(AMD_Test_knownIntermediateAsBase cb, Ice.Current current)
+    knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current)
         throws Base
     {
 	KnownIntermediate ki = new KnownIntermediate();
@@ -82,7 +84,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownMostDerivedAsBase_async(AMD_Test_knownMostDerivedAsBase cb, Ice.Current current)
+    knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current)
         throws Base
     {
 	KnownMostDerived kmd = new KnownMostDerived();
@@ -93,7 +95,8 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownIntermediateAsKnownIntermediate_async(AMD_Test_knownIntermediateAsKnownIntermediate cb, Ice.Current current)
+    knownIntermediateAsKnownIntermediate_async(AMD_TestIntf_knownIntermediateAsKnownIntermediate cb,
+    					       Ice.Current current)
         throws KnownIntermediate
     {
 	KnownIntermediate ki = new KnownIntermediate();
@@ -103,7 +106,8 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownMostDerivedAsKnownIntermediate_async(AMD_Test_knownMostDerivedAsKnownIntermediate cb, Ice.Current current)
+    knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb,
+    					      Ice.Current current)
         throws KnownIntermediate
     {
 	KnownMostDerived kmd = new KnownMostDerived();
@@ -114,7 +118,8 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    knownMostDerivedAsKnownMostDerived_async(AMD_Test_knownMostDerivedAsKnownMostDerived cb, Ice.Current current)
+    knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb,
+    					     Ice.Current current)
         throws KnownMostDerived
     {
 	KnownMostDerived kmd = new KnownMostDerived();
@@ -125,7 +130,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    unknownMostDerived1AsBase_async(AMD_Test_unknownMostDerived1AsBase cb, Ice.Current current)
+    unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current)
         throws Base
     {
 	UnknownMostDerived1 umd1 = new UnknownMostDerived1();
@@ -136,7 +141,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    unknownMostDerived1AsKnownIntermediate_async(AMD_Test_unknownMostDerived1AsKnownIntermediate cb,
+    unknownMostDerived1AsKnownIntermediate_async(AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb,
                                                  Ice.Current current)
         throws KnownIntermediate
     {
@@ -148,7 +153,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    unknownMostDerived2AsBase_async(AMD_Test_unknownMostDerived2AsBase cb, Ice.Current current)
+    unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current)
         throws Base
     {
 	UnknownMostDerived2 umd2 = new UnknownMostDerived2();
diff --git a/java/test/Ice/slicing/objects/Forward.ice b/java/test/Ice/slicing/objects/Forward.ice
index 74ae4b8c7e0..b4a01e4aab8 100644
--- a/java/test/Ice/slicing/objects/Forward.ice
+++ b/java/test/Ice/slicing/objects/Forward.ice
@@ -10,6 +10,9 @@
 #ifndef FORWARD_ICE
 #define FORWARD_ICE
 
+module Test
+{
+
 class Forward;
 
 class Hidden
@@ -22,4 +25,6 @@ class Forward
     Hidden h;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objects/Test.ice b/java/test/Ice/slicing/objects/Test.ice
index 3817f608833..93bcbf9dcd6 100644
--- a/java/test/Ice/slicing/objects/Test.ice
+++ b/java/test/Ice/slicing/objects/Test.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+module Test
+{
+
 class SBase
 {
     string sb;
@@ -66,7 +69,7 @@ exception DerivedException extends BaseException
 
 class Forward;		// Forward-declared class defined in another compilation unit
 
-["ami"] interface Test
+["ami"] interface TestIntf
 {
     Object SBaseAsObject();
     SBase SBaseAsSBase();
@@ -106,4 +109,6 @@ class Forward;		// Forward-declared class defined in another compilation unit
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java
index 4a0e6a56fe7..054c5a0fabe 100644
--- a/java/test/Ice/slicing/objects/csrc/AllTests.java
+++ b/java/test/Ice/slicing/objects/csrc/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -60,13 +62,13 @@ public class AllTests
 	private boolean _called;
     }
 
-    private static class AMI_Test_SBaseAsObjectI extends AMI_Test_SBaseAsObject
+    private static class AMI_Test_SBaseAsObjectI extends AMI_TestIntf_SBaseAsObject
     {
         public void
 	ice_response(Ice.Object o)
 	{
 	    test(o != null);
-	    test(o.ice_id().equals("::SBase"));
+	    test(o.ice_id().equals("::Test::SBase"));
 	    SBase sb = (SBase)o;
 	    test(sb != null);
 	    test(sb.sb.equals("SBase.sb"));
@@ -94,7 +96,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_SBaseAsSBaseI extends AMI_Test_SBaseAsSBase
+    private static class AMI_Test_SBaseAsSBaseI extends AMI_TestIntf_SBaseAsSBase
     {
         public void
 	ice_response(SBase sb)
@@ -124,7 +126,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_SBSKnownDerivedAsSBaseI extends AMI_Test_SBSKnownDerivedAsSBase
+    private static class AMI_Test_SBSKnownDerivedAsSBaseI extends AMI_TestIntf_SBSKnownDerivedAsSBase
     {
         public void
 	ice_response(SBase sb)
@@ -157,7 +159,8 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI extends AMI_Test_SBSKnownDerivedAsSBSKnownDerived
+    private static class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI
+	extends AMI_TestIntf_SBSKnownDerivedAsSBSKnownDerived
     {
         public void
 	ice_response(SBSKnownDerived sbskd)
@@ -187,7 +190,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_SBSUnknownDerivedAsSBaseI extends AMI_Test_SBSUnknownDerivedAsSBase
+    private static class AMI_Test_SBSUnknownDerivedAsSBaseI extends AMI_TestIntf_SBSUnknownDerivedAsSBase
     {
         public void
 	ice_response(SBase sb)
@@ -217,7 +220,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_SUnknownAsObjectI extends AMI_Test_SUnknownAsObject
+    private static class AMI_Test_SUnknownAsObjectI extends AMI_TestIntf_SUnknownAsObject
     {
         public void
 	ice_response(Ice.Object o)
@@ -247,13 +250,13 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_oneElementCycleI extends AMI_Test_oneElementCycle
+    private static class AMI_Test_oneElementCycleI extends AMI_TestIntf_oneElementCycle
     {
         public void
 	ice_response(B b)
 	{
 	    test(b != null);
-	    test(b.ice_id().equals("::B"));
+	    test(b.ice_id().equals("::Test::B"));
 	    test(b.sb.equals("B1.sb"));
 	    test(b.pb == b);
 	    callback.called();
@@ -280,18 +283,18 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_twoElementCycleI extends AMI_Test_twoElementCycle
+    private static class AMI_Test_twoElementCycleI extends AMI_TestIntf_twoElementCycle
     {
         public void
 	ice_response(B b1)
 	{
 	    test(b1 != null);
-	    test(b1.ice_id().equals("::B"));
+	    test(b1.ice_id().equals("::Test::B"));
 	    test(b1.sb.equals("B1.sb"));
 
 	    B b2 = b1.pb;
 	    test(b2 != null);
-	    test(b2.ice_id().equals("::B"));
+	    test(b2.ice_id().equals("::Test::B"));
 	    test(b2.sb.equals("B2.sb"));
 	    test(b2.pb == b1);
 	    callback.called();
@@ -318,13 +321,13 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_D1AsBI extends AMI_Test_D1AsB
+    private static class AMI_Test_D1AsBI extends AMI_TestIntf_D1AsB
     {
         public void
 	ice_response(B b1)
 	{
 	    test(b1 != null);
-	    test(b1.ice_id().equals("::D1"));
+	    test(b1.ice_id().equals("::Test::D1"));
 	    test(b1.sb.equals("D1.sb"));
 	    test(b1.pb != null);
 	    test(b1.pb != b1);
@@ -339,7 +342,7 @@ public class AllTests
 	    test(b2 != null);
 	    test(b2.pb == b1);
 	    test(b2.sb.equals("D2.sb"));
-	    test(b2.ice_id().equals("::B"));
+	    test(b2.ice_id().equals("::Test::B"));
 	    callback.called();
 	}
 
@@ -364,20 +367,20 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_D1AsD1I extends AMI_Test_D1AsD1
+    private static class AMI_Test_D1AsD1I extends AMI_TestIntf_D1AsD1
     {
         public void
 	ice_response(D1 d1)
 	{
 	    test(d1 != null);
-	    test(d1.ice_id().equals("::D1"));
+	    test(d1.ice_id().equals("::Test::D1"));
 	    test(d1.sb.equals("D1.sb"));
 	    test(d1.pb != null);
 	    test(d1.pb != d1);
 
 	    B b2 = d1.pb;
 	    test(b2 != null);
-	    test(b2.ice_id().equals("::B"));
+	    test(b2.ice_id().equals("::Test::B"));
 	    test(b2.sb.equals("D2.sb"));
 	    test(b2.pb == d1);
 	    callback.called();
@@ -404,20 +407,20 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_D2AsBI extends AMI_Test_D2AsB
+    private static class AMI_Test_D2AsBI extends AMI_TestIntf_D2AsB
     {
         public void
 	ice_response(B b2)
 	{
 	    test(b2 != null);
-	    test(b2.ice_id().equals("::B"));
+	    test(b2.ice_id().equals("::Test::B"));
 	    test(b2.sb.equals("D2.sb"));
 	    test(b2.pb != null);
 	    test(b2.pb != b2);
 
 	    B b1 = b2.pb;
 	    test(b1 != null);
-	    test(b1.ice_id().equals("::D1"));
+	    test(b1.ice_id().equals("::Test::D1"));
 	    test(b1.sb.equals("D1.sb"));
 	    test(b1.pb == b2);
 	    D1 d1 = (D1)b1;
@@ -448,13 +451,13 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_paramTest1I extends AMI_Test_paramTest1
+    private static class AMI_Test_paramTest1I extends AMI_TestIntf_paramTest1
     {
         public void
 	ice_response(B b1, B b2)
 	{
 	    test(b1 != null);
-	    test(b1.ice_id().equals("::D1"));
+	    test(b1.ice_id().equals("::Test::D1"));
 	    test(b1.sb.equals("D1.sb"));
 	    test(b1.pb == b2);
 	    D1 d1 = (D1)b1;
@@ -463,7 +466,7 @@ public class AllTests
 	    test(d1.pd1 == b2);
 
 	    test(b2 != null);
-	    test(b2.ice_id().equals("::B"));	// No factory, must be sliced
+	    test(b2.ice_id().equals("::Test::B"));	// No factory, must be sliced
 	    test(b2.sb.equals("D2.sb"));
 	    test(b2.pb == b1);
 	    callback.called();
@@ -490,13 +493,13 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_paramTest2I extends AMI_Test_paramTest2
+    private static class AMI_Test_paramTest2I extends AMI_TestIntf_paramTest2
     {
         public void
 	ice_response(B b2, B b1)
 	{
 	    test(b1 != null);
-	    test(b1.ice_id().equals("::D1"));
+	    test(b1.ice_id().equals("::Test::D1"));
 	    test(b1.sb.equals("D1.sb"));
 	    test(b1.pb == b2);
 	    D1 d1 = (D1)b1;
@@ -505,7 +508,7 @@ public class AllTests
 	    test(d1.pd1 == b2);
 
 	    test(b2 != null);
-	    test(b2.ice_id().equals("::B"));	// No factory, must be sliced
+	    test(b2.ice_id().equals("::Test::B"));	// No factory, must be sliced
 	    test(b2.sb.equals("D2.sb"));
 	    test(b2.pb == b1);
 	    callback.called();
@@ -532,7 +535,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_returnTest1I extends AMI_Test_returnTest1
+    private static class AMI_Test_returnTest1I extends AMI_TestIntf_returnTest1
     {
         public void
 	ice_response(B r, B p1, B p2)
@@ -562,7 +565,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_returnTest2I extends AMI_Test_returnTest2
+    private static class AMI_Test_returnTest2I extends AMI_TestIntf_returnTest2
     {
         public void
 	ice_response(B r, B p1, B p2)
@@ -592,7 +595,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_returnTest3I extends AMI_Test_returnTest3
+    private static class AMI_Test_returnTest3I extends AMI_TestIntf_returnTest3
     {
         public void
 	ice_response(B b)
@@ -624,7 +627,7 @@ public class AllTests
 	public B r;
     }
 
-    private static class AMI_Test_paramTest3I extends AMI_Test_paramTest3
+    private static class AMI_Test_paramTest3I extends AMI_TestIntf_paramTest3
     {
         public void
 	ice_response(B ret, B p1, B p2)
@@ -632,17 +635,17 @@ public class AllTests
 	    test(p1 != null);
 	    test(p1.sb.equals("D2.sb (p1 1)"));
 	    test(p1.pb == null);
-	    test(p1.ice_id().equals("::B"));
+	    test(p1.ice_id().equals("::Test::B"));
 
 	    test(p2 != null);
 	    test(p2.sb.equals("D2.sb (p2 1)"));
 	    test(p2.pb == null);
-	    test(p2.ice_id().equals("::B"));
+	    test(p2.ice_id().equals("::Test::B"));
 
 	    test(ret != null);
 	    test(ret.sb.equals("D1.sb (p2 2)"));
 	    test(ret.pb == null);
-	    test(ret.ice_id().equals("::D1"));
+	    test(ret.ice_id().equals("::Test::D1"));
 	    callback.called();
 	}
 
@@ -667,7 +670,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_paramTest4I extends AMI_Test_paramTest4
+    private static class AMI_Test_paramTest4I extends AMI_TestIntf_paramTest4
     {
         public void
 	ice_response(B ret, B b)
@@ -675,12 +678,12 @@ public class AllTests
 	    test(b != null);
 	    test(b.sb.equals("D4.sb (1)"));
 	    test(b.pb == null);
-	    test(b.ice_id().equals("::B"));
+	    test(b.ice_id().equals("::Test::B"));
 
 	    test(ret != null);
 	    test(ret.sb.equals("B.sb (2)"));
 	    test(ret.pb == null);
-	    test(ret.ice_id().equals("::B"));
+	    test(ret.ice_id().equals("::Test::B"));
 	    callback.called();
 	}
 
@@ -705,7 +708,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_sequenceTestI extends AMI_Test_sequenceTest
+    private static class AMI_Test_sequenceTestI extends AMI_TestIntf_sequenceTest
     {
         public void
 	ice_response(SS ss)
@@ -737,7 +740,7 @@ public class AllTests
 	public SS r;
     }
 
-    private static class AMI_Test_dictionaryTestI extends AMI_Test_dictionaryTest
+    private static class AMI_Test_dictionaryTestI extends AMI_TestIntf_dictionaryTest
     {
         public void
 	ice_response(java.util.Map r, java.util.Map bout)
@@ -771,7 +774,7 @@ public class AllTests
 	public java.util.Map bout;
     }
 
-    private static class AMI_Test_throwBaseAsBaseI extends AMI_Test_throwBaseAsBase
+    private static class AMI_Test_throwBaseAsBaseI extends AMI_TestIntf_throwBaseAsBase
     {
         public void
 	ice_response()
@@ -791,7 +794,7 @@ public class AllTests
 	    try
 	    {
 	        BaseException e = (BaseException)exc;
-		test(e.ice_name().equals("BaseException"));
+		test(e.ice_name().equals("Test::BaseException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb"));
@@ -813,7 +816,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_throwDerivedAsBaseI extends AMI_Test_throwDerivedAsBase
+    private static class AMI_Test_throwDerivedAsBaseI extends AMI_TestIntf_throwDerivedAsBase
     {
         public void
 	ice_response()
@@ -833,7 +836,7 @@ public class AllTests
 	    try
 	    {
 	        DerivedException e = (DerivedException)exc;
-		test(e.ice_name().equals("DerivedException"));
+		test(e.ice_name().equals("Test::DerivedException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb1"));
@@ -861,7 +864,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_throwDerivedAsDerivedI extends AMI_Test_throwDerivedAsDerived
+    private static class AMI_Test_throwDerivedAsDerivedI extends AMI_TestIntf_throwDerivedAsDerived
     {
         public void
 	ice_response()
@@ -881,7 +884,7 @@ public class AllTests
 	    try
 	    {
 	        DerivedException e = (DerivedException)exc;
-		test(e.ice_name().equals("DerivedException"));
+		test(e.ice_name().equals("Test::DerivedException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb1"));
@@ -909,7 +912,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_throwUnknownDerivedAsBaseI extends AMI_Test_throwUnknownDerivedAsBase
+    private static class AMI_Test_throwUnknownDerivedAsBaseI extends AMI_TestIntf_throwUnknownDerivedAsBase
     {
         public void
 	ice_response()
@@ -929,7 +932,7 @@ public class AllTests
 	    try
 	    {
 		BaseException e = (BaseException)exc;
-		test(e.ice_name().equals("BaseException"));
+		test(e.ice_name().equals("Test::BaseException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb d2"));
@@ -951,7 +954,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    private static class AMI_Test_useForwardI extends AMI_Test_useForward
+    private static class AMI_Test_useForwardI extends AMI_TestIntf_useForward
     {
         public void
 	ice_response(Forward f)
@@ -981,7 +984,7 @@ public class AllTests
 	private Callback callback = new Callback();
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTests(Ice.Communicator communicator, boolean collocated)
     {
         System.out.print("testing stringToProxy... ");
@@ -993,7 +996,7 @@ public class AllTests
 
         System.out.print("testing checked cast... ");
         System.out.flush();
-        TestPrx test = TestPrxHelper.checkedCast(base);
+        TestIntfPrx test = TestIntfPrxHelper.checkedCast(base);
         test(test != null);
         test(test.equals(base));
         System.out.println("ok");
@@ -1007,7 +1010,7 @@ public class AllTests
 	    {
 		o = test.SBaseAsObject();
 		test(o != null);
-		test(o.ice_id().equals("::SBase"));
+		test(o.ice_id().equals("::Test::SBase"));
 		sb = (SBase)o;
 	    }
 	    catch(Exception ex)
@@ -1164,7 +1167,7 @@ public class AllTests
 	    {
 		B b = test.oneElementCycle();
 		test(b != null);
-		test(b.ice_id().equals("::B"));
+		test(b.ice_id().equals("::Test::B"));
 		test(b.sb.equals("B1.sb"));
 		test(b.pb == b);
 	    }
@@ -1191,12 +1194,12 @@ public class AllTests
 	    {
 		B b1 = test.twoElementCycle();
 		test(b1 != null);
-		test(b1.ice_id().equals("::B"));
+		test(b1.ice_id().equals("::Test::B"));
 		test(b1.sb.equals("B1.sb"));
 
 		B b2 = b1.pb;
 		test(b2 != null);
-		test(b2.ice_id().equals("::B"));
+		test(b2.ice_id().equals("::Test::B"));
 		test(b2.sb.equals("B2.sb"));
 		test(b2.pb == b1);
 	    }
@@ -1224,7 +1227,7 @@ public class AllTests
 		B b1;
 		b1 = test.D1AsB();
 		test(b1 != null);
-		test(b1.ice_id().equals("::D1"));
+		test(b1.ice_id().equals("::Test::D1"));
 		test(b1.sb.equals("D1.sb"));
 		test(b1.pb != null);
 		test(b1.pb != b1);
@@ -1239,7 +1242,7 @@ public class AllTests
 		test(b2 != null);
 		test(b2.pb == b1);
 		test(b2.sb.equals("D2.sb"));
-		test(b2.ice_id().equals("::B"));
+		test(b2.ice_id().equals("::Test::B"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -1265,14 +1268,14 @@ public class AllTests
 		D1 d1;
 		d1 = test.D1AsD1();
 		test(d1 != null);
-		test(d1.ice_id().equals("::D1"));
+		test(d1.ice_id().equals("::Test::D1"));
 		test(d1.sb.equals("D1.sb"));
 		test(d1.pb != null);
 		test(d1.pb != d1);
 
 		B b2 = d1.pb;
 		test(b2 != null);
-		test(b2.ice_id().equals("::B"));
+		test(b2.ice_id().equals("::Test::B"));
 		test(b2.sb.equals("D2.sb"));
 		test(b2.pb == d1);
 	    }
@@ -1300,14 +1303,14 @@ public class AllTests
 		B b2;
 		b2 = test.D2AsB();
 		test(b2 != null);
-		test(b2.ice_id().equals("::B"));
+		test(b2.ice_id().equals("::Test::B"));
 		test(b2.sb.equals("D2.sb"));
 		test(b2.pb != null);
 		test(b2.pb != b2);
 
 		B b1 = b2.pb;
 		test(b1 != null);
-		test(b1.ice_id().equals("::D1"));
+		test(b1.ice_id().equals("::Test::D1"));
 		test(b1.sb.equals("D1.sb"));
 		test(b1.pb == b2);
 		D1 d1 = (D1)b1;
@@ -1341,7 +1344,7 @@ public class AllTests
 		test.paramTest1(b1, b2);
 
 		test(b1.value != null);
-		test(b1.value.ice_id().equals("::D1"));
+		test(b1.value.ice_id().equals("::Test::D1"));
 		test(b1.value.sb.equals("D1.sb"));
 		test(b1.value.pb == b2.value);
 		D1 d1 = (D1)b1.value;
@@ -1350,7 +1353,7 @@ public class AllTests
 		test(d1.pd1 == b2.value);
 
 		test(b2.value != null);
-		test(b2.value.ice_id().equals("::B"));	// No factory, must be sliced
+		test(b2.value.ice_id().equals("::Test::B"));	// No factory, must be sliced
 		test(b2.value.sb.equals("D2.sb"));
 		test(b2.value.pb == b1.value);
 	    }
@@ -1380,7 +1383,7 @@ public class AllTests
 		test.paramTest2(b2, b1);
 
 		test(b1.value != null);
-		test(b1.value.ice_id().equals("::D1"));
+		test(b1.value.ice_id().equals("::Test::D1"));
 		test(b1.value.sb.equals("D1.sb"));
 		test(b1.value.pb == b2.value);
 		D1 d1 = (D1)b1.value;
@@ -1389,7 +1392,7 @@ public class AllTests
 		test(d1.pd1 == b2.value);
 
 		test(b2.value != null);
-		test(b2.value.ice_id().equals("::B"));	// No factory, must be sliced
+		test(b2.value.ice_id().equals("::Test::B"));	// No factory, must be sliced
 		test(b2.value.sb.equals("D2.sb"));
 		test(b2.value.pb == b1.value);
 	    }
@@ -1481,7 +1484,7 @@ public class AllTests
 
 		test(b1 != null);
 		test(b1.sb.equals("D1.sb"));
-		test(b1.ice_id().equals("::D1"));
+		test(b1.ice_id().equals("::Test::D1"));
 		D1 p1 = (D1)b1;
 		test(p1 != null);
 		test(p1.sd1.equals("D1.sd1"));
@@ -1490,7 +1493,7 @@ public class AllTests
 		B b2 = b1.pb;
 		test(b2 != null);
 		test(b2.sb.equals("D3.sb"));
-		test(b2.ice_id().equals("::B"));	// Sliced by server
+		test(b2.ice_id().equals("::Test::B"));	// Sliced by server
 		test(b2.pb == b1);
 		boolean gotException = false;
 		try
@@ -1536,7 +1539,7 @@ public class AllTests
 
 	    test(b1 != null);
 	    test(b1.sb.equals("D1.sb"));
-	    test(b1.ice_id().equals("::D1"));
+	    test(b1.ice_id().equals("::Test::D1"));
 	    D1 p1 = (D1)b1;
 	    test(p1 != null);
 	    test(p1.sd1.equals("D1.sd1"));
@@ -1545,7 +1548,7 @@ public class AllTests
 	    B b2 = b1.pb;
 	    test(b2 != null);
 	    test(b2.sb.equals("D3.sb"));
-	    test(b2.ice_id().equals("::B"));	// Sliced by server
+	    test(b2.ice_id().equals("::Test::B"));	// Sliced by server
 	    test(b2.pb == b1);
 	    boolean gotException = false;
 	    try
@@ -1585,7 +1588,7 @@ public class AllTests
 
 		test(b1 != null);
 		test(b1.sb.equals("D3.sb"));
-		test(b1.ice_id().equals("::B"));	// Sliced by server
+		test(b1.ice_id().equals("::Test::B"));	// Sliced by server
 
 		boolean gotException = false;
 		try
@@ -1601,7 +1604,7 @@ public class AllTests
 		B b2 = b1.pb;
 		test(b2 != null);
 		test(b2.sb.equals("D1.sb"));
-		test(b2.ice_id().equals("::D1"));
+		test(b2.ice_id().equals("::Test::D1"));
 		test(b2.pb == b1);
 		D1 p3 = (D1)b2;
 		test(p3 != null);
@@ -1641,7 +1644,7 @@ public class AllTests
 
 	    test(b1 != null);
 	    test(b1.sb.equals("D3.sb"));
-	    test(b1.ice_id().equals("::B"));	// Sliced by server
+	    test(b1.ice_id().equals("::Test::B"));	// Sliced by server
 
 	    boolean gotException = false;
 	    try
@@ -1657,7 +1660,7 @@ public class AllTests
 	    B b2 = b1.pb;
 	    test(b2 != null);
 	    test(b2.sb.equals("D1.sb"));
-	    test(b2.ice_id().equals("::D1"));
+	    test(b2.ice_id().equals("::Test::D1"));
 	    test(b2.pb == b1);
 	    D1 p3 = (D1)b2;
 	    test(p3 != null);
@@ -1683,17 +1686,17 @@ public class AllTests
 		test(p1.value != null);
 		test(p1.value.sb.equals("D2.sb (p1 1)"));
 		test(p1.value.pb == null);
-		test(p1.value.ice_id().equals("::B"));
+		test(p1.value.ice_id().equals("::Test::B"));
 
 		test(p2.value != null);
 		test(p2.value.sb.equals("D2.sb (p2 1)"));
 		test(p2.value.pb == null);
-		test(p2.value.ice_id().equals("::B"));
+		test(p2.value.ice_id().equals("::Test::B"));
 
 		test(ret != null);
 		test(ret.sb.equals("D1.sb (p2 2)"));
 		test(ret.pb == null);
-		test(ret.ice_id().equals("::D1"));
+		test(ret.ice_id().equals("::Test::D1"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -1722,12 +1725,12 @@ public class AllTests
 		test(b.value != null);
 		test(b.value.sb.equals("D4.sb (1)"));
 		test(b.value.pb == null);
-		test(b.value.ice_id().equals("::B"));
+		test(b.value.ice_id().equals("::Test::B"));
 
 		test(ret != null);
 		test(ret.sb.equals("B.sb (2)"));
 		test(ret.pb == null);
-		test(ret.ice_id().equals("::B"));
+		test(ret.ice_id().equals("::Test::B"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -1767,7 +1770,7 @@ public class AllTests
 		B r = test.returnTest3(d3, b2);
 
 		test(r != null);
-		test(r.ice_id().equals("::B"));
+		test(r.ice_id().equals("::Test::B"));
 		test(r.sb.equals("D3.sb"));
 		test(r.pb == r);
 	    }
@@ -1801,7 +1804,7 @@ public class AllTests
 	    B r = cb.r;
 
 	    test(r != null);
-	    test(r.ice_id().equals("::B"));
+	    test(r.ice_id().equals("::Test::B"));
 	    test(r.sb.equals("D3.sb"));
 	    test(r.pb == r);
 	}
@@ -1831,7 +1834,7 @@ public class AllTests
 
 		B r = test.returnTest3(d3, d12);
 		test(r != null);
-		test(r.ice_id().equals("::B"));
+		test(r.ice_id().equals("::Test::B"));
 		test(r.sb.equals("D3.sb"));
 		test(r.pb == r);
 	    }
@@ -1868,7 +1871,7 @@ public class AllTests
 	    B r = cb.r;
 
 	    test(r != null);
-	    test(r.ice_id().equals("::B"));
+	    test(r.ice_id().equals("::Test::B"));
 	    test(r.sb.equals("D3.sb"));
 	    test(r.pb == r);
 	}
@@ -1949,13 +1952,13 @@ public class AllTests
 		test(ss2d1.pb == ss2b);
 		test(ss2d3.pb == ss2b);
 
-		test(ss1b.ice_id().equals("::B"));
-		test(ss1d1.ice_id().equals("::D1"));
-		test(ss1d3.ice_id().equals("::B"));
+		test(ss1b.ice_id().equals("::Test::B"));
+		test(ss1d1.ice_id().equals("::Test::D1"));
+		test(ss1d3.ice_id().equals("::Test::B"));
 
-		test(ss2b.ice_id().equals("::B"));
-		test(ss2d1.ice_id().equals("::D1"));
-		test(ss2d3.ice_id().equals("::B"));
+		test(ss2b.ice_id().equals("::Test::B"));
+		test(ss2d1.ice_id().equals("::Test::D1"));
+		test(ss2d3.ice_id().equals("::Test::B"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -2039,13 +2042,13 @@ public class AllTests
 	    test(ss2d1.pb == ss2b);
 	    test(ss2d3.pb == ss2b);
 
-	    test(ss1b.ice_id().equals("::B"));
-	    test(ss1d1.ice_id().equals("::D1"));
-	    test(ss1d3.ice_id().equals("::B"));
+	    test(ss1b.ice_id().equals("::Test::B"));
+	    test(ss1d1.ice_id().equals("::Test::D1"));
+	    test(ss1d3.ice_id().equals("::Test::B"));
 
-	    test(ss2b.ice_id().equals("::B"));
-	    test(ss2d1.ice_id().equals("::D1"));
-	    test(ss2d3.ice_id().equals("::B"));
+	    test(ss2b.ice_id().equals("::Test::B"));
+	    test(ss2d1.ice_id().equals("::Test::D1"));
+	    test(ss2d3.ice_id().equals("::Test::B"));
 	}
 	System.out.println("ok");
 
@@ -2166,7 +2169,7 @@ public class AllTests
 	    }
 	    catch(BaseException e)
 	    {
-		test(e.ice_name().equals("BaseException"));
+		test(e.ice_name().equals("Test::BaseException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb"));
@@ -2198,7 +2201,7 @@ public class AllTests
 	    }
 	    catch(DerivedException e)
 	    {
-		test(e.ice_name().equals("DerivedException"));
+		test(e.ice_name().equals("Test::DerivedException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb1"));
@@ -2236,7 +2239,7 @@ public class AllTests
 	    }
 	    catch(DerivedException e)
 	    {
-		test(e.ice_name().equals("DerivedException"));
+		test(e.ice_name().equals("Test::DerivedException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb1"));
@@ -2274,7 +2277,7 @@ public class AllTests
 	    }
 	    catch(BaseException e)
 	    {
-		test(e.ice_name().equals("BaseException"));
+		test(e.ice_name().equals("Test::BaseException"));
 		test(e.sbe.equals("sbe"));
 		test(e.pb != null);
 		test(e.pb.sb.equals("sb d2"));
diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java
index 85d80b81283..f86bdca4716 100644
--- a/java/test/Ice/slicing/objects/csrc/Client.java
+++ b/java/test/Ice/slicing/objects/csrc/Client.java
@@ -7,12 +7,14 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        TestPrx test = AllTests.allTests(communicator, false);
+        TestIntfPrx test = AllTests.allTests(communicator, false);
         test.shutdown();
         return 0;
     }
diff --git a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
index c32c2495f52..6ee187eeba5 100644
--- a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
+++ b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
@@ -12,10 +12,15 @@
 
 #include <Test.ice>
 
+module Test
+{
+
 class D3 extends B
 {
     string sd3;
     B pd3;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
index b963d10122d..ecd2228876e 100644
--- a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
+++ b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
@@ -12,6 +12,9 @@
 
 #include <Test.ice>
 
+module Test
+{
+
 class SBSUnknownDerived extends SBase
 {
     string sbsud;
@@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException
     D2 pd2;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objects/ssrc/TestI.java b/java/test/Ice/slicing/objects/ssrc/TestI.java
index 4e194bc545e..141fd3402b9 100644
--- a/java/test/Ice/slicing/objects/ssrc/TestI.java
+++ b/java/test/Ice/slicing/objects/ssrc/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter)
diff --git a/java/test/Ice/slicing/objectsAMD/Forward.ice b/java/test/Ice/slicing/objectsAMD/Forward.ice
index 74ae4b8c7e0..b4a01e4aab8 100644
--- a/java/test/Ice/slicing/objectsAMD/Forward.ice
+++ b/java/test/Ice/slicing/objectsAMD/Forward.ice
@@ -10,6 +10,9 @@
 #ifndef FORWARD_ICE
 #define FORWARD_ICE
 
+module Test
+{
+
 class Forward;
 
 class Hidden
@@ -22,4 +25,6 @@ class Forward
     Hidden h;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
index 07e05c6a76b..8c9a5ec3d13 100644
--- a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
+++ b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
@@ -12,6 +12,9 @@
 
 #include <TestAMD.ice>
 
+module Test
+{
+
 class SBSUnknownDerived extends SBase
 {
     string sbsud;
@@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException
     D2 pd2;
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objectsAMD/TestAMD.ice b/java/test/Ice/slicing/objectsAMD/TestAMD.ice
index b68706f831e..f22792c198f 100644
--- a/java/test/Ice/slicing/objectsAMD/TestAMD.ice
+++ b/java/test/Ice/slicing/objectsAMD/TestAMD.ice
@@ -10,6 +10,9 @@
 #ifndef TEST_AMD_ICE
 #define TEST_AMD_ICE
 
+module Test
+{
+
 class SBase
 {
     string sb;
@@ -66,7 +69,7 @@ exception DerivedException extends BaseException
 
 class Forward;		// Forward-declared class defined in another compilation unit
 
-["ami", "amd"] interface Test
+["ami", "amd"] interface TestIntf
 {
     Object SBaseAsObject();
     SBase SBaseAsSBase();
@@ -106,4 +109,6 @@ class Forward;		// Forward-declared class defined in another compilation unit
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/Ice/slicing/objectsAMD/TestI.java b/java/test/Ice/slicing/objectsAMD/TestI.java
index 6ee301fab6e..3559e535e9a 100644
--- a/java/test/Ice/slicing/objectsAMD/TestI.java
+++ b/java/test/Ice/slicing/objectsAMD/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class TestI extends _TestDisp
+import Test.*;
+
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter)
@@ -16,14 +18,14 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    shutdown_async(AMD_Test_shutdown cb, Ice.Current current)
+    shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current)
     {
         _adapter.getCommunicator().shutdown();
 	cb.ice_response();
     }
 
     public void
-    SBaseAsObject_async(AMD_Test_SBaseAsObject cb, Ice.Current current)
+    SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current)
     {
 	SBase sb = new SBase();
 	sb.sb = "SBase.sb";
@@ -31,7 +33,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    SBaseAsSBase_async(AMD_Test_SBaseAsSBase cb, Ice.Current current)
+    SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current)
     {
 	SBase sb = new SBase();
 	sb.sb = "SBase.sb";
@@ -39,7 +41,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    SBSKnownDerivedAsSBase_async(AMD_Test_SBSKnownDerivedAsSBase cb, Ice.Current current)
+    SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current)
     {
 	SBSKnownDerived sbskd = new SBSKnownDerived();
 	sbskd.sb = "SBSKnownDerived.sb";
@@ -48,7 +50,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    SBSKnownDerivedAsSBSKnownDerived_async(AMD_Test_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current)
+    SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current)
     {
 	SBSKnownDerived sbskd = new SBSKnownDerived();
 	sbskd.sb = "SBSKnownDerived.sb";
@@ -57,7 +59,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    SBSUnknownDerivedAsSBase_async(AMD_Test_SBSUnknownDerivedAsSBase cb, Ice.Current current)
+    SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current)
     {
 	SBSUnknownDerived sbsud = new SBSUnknownDerived();
 	sbsud.sb = "SBSUnknownDerived.sb";
@@ -66,7 +68,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    SUnknownAsObject_async(AMD_Test_SUnknownAsObject cb, Ice.Current current)
+    SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current)
     {
 	SUnknown su = new SUnknown();
 	su.su = "SUnknown.su";
@@ -74,7 +76,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    oneElementCycle_async(AMD_Test_oneElementCycle cb, Ice.Current current)
+    oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current)
     {
 	B b = new B();
 	b.sb = "B1.sb";
@@ -83,7 +85,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    twoElementCycle_async(AMD_Test_twoElementCycle cb, Ice.Current current)
+    twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current)
     {
 	B b1 = new B();
 	b1.sb = "B1.sb";
@@ -95,7 +97,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    D1AsB_async(AMD_Test_D1AsB cb, Ice.Current current)
+    D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -111,7 +113,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    D1AsD1_async(AMD_Test_D1AsD1 cb, Ice.Current current)
+    D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -127,7 +129,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    D2AsB_async(AMD_Test_D2AsB cb, Ice.Current current)
+    D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current)
     {
 	D2 d2 = new D2();
 	d2.sb = "D2.sb";
@@ -143,7 +145,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    paramTest1_async(AMD_Test_paramTest1 cb, Ice.Current current)
+    paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -159,7 +161,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    paramTest2_async(AMD_Test_paramTest2 cb, Ice.Current current)
+    paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -175,7 +177,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    paramTest3_async(AMD_Test_paramTest3 cb, Ice.Current current)
+    paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current)
     {
 	D2 d2 = new D2();
 	d2.sb = "D2.sb (p1 1)";
@@ -204,7 +206,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    paramTest4_async(AMD_Test_paramTest4 cb, Ice.Current current)
+    paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current)
     {
 	D4 d4 = new D4();
 	d4.sb = "D4.sb (1)";
@@ -217,7 +219,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    returnTest1_async(AMD_Test_returnTest1 cb, Ice.Current current)
+    returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -233,7 +235,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    returnTest2_async(AMD_Test_returnTest2 cb, Ice.Current current)
+    returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current)
     {
 	D1 d1 = new D1();
 	d1.sb = "D1.sb";
@@ -249,13 +251,13 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    returnTest3_async(AMD_Test_returnTest3 cb, B p1, B p2, Ice.Current current)
+    returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current)
     {
 	cb.ice_response(p1);
     }
 
     public void
-    sequenceTest_async(AMD_Test_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current)
+    sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current)
     {
 	SS ss = new SS();
 	ss.c1 = p1;
@@ -264,7 +266,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    dictionaryTest_async(AMD_Test_dictionaryTest cb, java.util.Map bin, Ice.Current current)
+    dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map bin, Ice.Current current)
     {
 	java.util.Map bout = new java.util.HashMap();
 	int i;
@@ -293,7 +295,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    throwBaseAsBase_async(AMD_Test_throwBaseAsBase cb, Ice.Current current)
+    throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current)
         throws BaseException
     {
 	BaseException be = new BaseException();
@@ -305,7 +307,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    throwDerivedAsBase_async(AMD_Test_throwDerivedAsBase cb, Ice.Current current)
+    throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current)
         throws BaseException
     {
 	DerivedException de = new DerivedException();
@@ -323,7 +325,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    throwDerivedAsDerived_async(AMD_Test_throwDerivedAsDerived cb, Ice.Current current)
+    throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current)
         throws DerivedException
     {
 	DerivedException de = new DerivedException();
@@ -341,7 +343,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    throwUnknownDerivedAsBase_async(AMD_Test_throwUnknownDerivedAsBase cb, Ice.Current current)
+    throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current)
     	throws BaseException
     {
 	D2 d2 = new D2();
@@ -359,7 +361,7 @@ public final class TestI extends _TestDisp
     }
 
     public void
-    useForward_async(AMD_Test_useForward cb, Ice.Current current)
+    useForward_async(AMD_TestIntf_useForward cb, Ice.Current current)
     {
 	Forward f = new Forward();
 	f = new Forward();
diff --git a/java/test/Ice/translator/NoModuleNoPackage.ice b/java/test/Ice/translator/NoModuleNoPackage.ice
deleted file mode 100644
index d39a58016f8..00000000000
--- a/java/test/Ice/translator/NoModuleNoPackage.ice
+++ /dev/null
@@ -1,58 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// nmnp = no module no package
-
-enum nmnpEnum { nmnpE1, nmnpE2 };
-
-const nmnpEnum nmnpConstant = nmnpE2;
-
-struct nmnpStruct
-{
-    nmnpEnum e;
-};
-
-sequence<nmnpStruct> nmnpStructSeq;
-
-dictionary<string, nmnpStruct> nmnpStringStructDict;
-
-interface nmnpBaseInterface
-{
-    void nmnpBaseInterfaceOp();
-};
-
-interface nmnpInterface extends nmnpBaseInterface
-{
-    void nmnpInterfaceOp();
-};
-
-class nmnpBaseClass
-{
-    nmnpEnum e;
-    nmnpStruct s;
-    nmnpStructSeq seq;
-    nmnpStringStructDict dict;
-};
-
-class nmnpClass extends nmnpBaseClass implements nmnpInterface
-{
-};
-
-exception nmnpBaseException
-{
-    nmnpEnum e;
-    nmnpStruct s;
-    nmnpStructSeq seq;
-    nmnpStringStructDict dict;
-    nmnpClass c;
-};
-
-exception nmnpException extends nmnpBaseException
-{
-};
diff --git a/java/test/Ice/translator/NoModuleWithPackage.ice b/java/test/Ice/translator/NoModuleWithPackage.ice
deleted file mode 100644
index da080b08673..00000000000
--- a/java/test/Ice/translator/NoModuleWithPackage.ice
+++ /dev/null
@@ -1,60 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// nmwp = no module with package
-
-[["java:package:nmwp"]]
-
-enum nmwpEnum { nmwpE1, nmwpE2 };
-
-const nmwpEnum nmwpConstant = nmwpE2;
-
-struct nmwpStruct
-{
-    nmwpEnum e;
-};
-
-sequence<nmwpStruct> nmwpStructSeq;
-
-dictionary<string, nmwpStruct> nmwpStringStructDict;
-
-interface nmwpBaseInterface
-{
-    void nmwpBaseInterfaceOp();
-};
-
-interface nmwpInterface extends nmwpBaseInterface
-{
-    void nmwpInterfaceOp();
-};
-
-class nmwpBaseClass
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-};
-
-class nmwpClass extends nmwpBaseClass implements nmwpInterface
-{
-};
-
-exception nmwpBaseException
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-};
-
-exception nmwpException extends nmwpBaseException
-{
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice
deleted file mode 100644
index 6b889c904fb..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleNoPackage types from top-level definitions
-
-#include <DoubleModuleNoPackage.ice>
-
-const ::M1::M2::dmnpEnum dmnpTest1Constant = ::M1::M2::dmnpE1;
-
-struct dmnpTest1Struct
-{
-    ::M1::M2::dmnpEnum e;
-    ::M1::M2::dmnpStruct s;
-    ::M1::M2::dmnpStructSeq seq;
-    ::M1::M2::dmnpStringStructDict dict;
-    ::M1::M2::dmnpClass c;
-    ::M1::M2::dmnpInterface i;
-};
-
-sequence<::M1::M2::dmnpStruct> dmnpTest1StructSeq;
-
-dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest1StructClassSeq;
-
-interface dmnpTest1Interface extends ::M1::M2::dmnpInterface {};
-
-exception dmnpTest1Exception extends ::M1::M2::dmnpException
-{
-    ::M1::M2::dmnpEnum e1;
-    ::M1::M2::dmnpStruct s1;
-    ::M1::M2::dmnpStructSeq seq1;
-    ::M1::M2::dmnpStringStructDict dict1;
-    ::M1::M2::dmnpClass c1;
-    ::M1::M2::dmnpInterface i1;
-};
-
-class dmnpTest1Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface
-{
-    ::M1::M2::dmnpStruct
-    dmnpTest1Op1(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["ami"]
-    ::M1::M2::dmnpStruct
-    dmnpTest1Op2(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["amd"]
-    ::M1::M2::dmnpStruct
-    dmnpTest1Op3(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice
deleted file mode 100644
index 66f4c4c00ac..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleNoPackage types from package definitions
-
-#include <DoubleModuleNoPackage.ice>
-
-[["java:package:dmnpTest2"]]
-
-const ::M1::M2::dmnpEnum dmnpTest2Constant = ::M1::M2::dmnpE1;
-
-struct dmnpTest2Struct
-{
-    ::M1::M2::dmnpEnum e;
-    ::M1::M2::dmnpStruct s;
-    ::M1::M2::dmnpStructSeq seq;
-    ::M1::M2::dmnpStringStructDict dict;
-    ::M1::M2::dmnpClass c;
-    ::M1::M2::dmnpInterface i;
-};
-
-sequence<::M1::M2::dmnpStruct> dmnpTest2StructSeq;
-
-dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest2StructClassSeq;
-
-interface dmnpTest2Interface extends ::M1::M2::dmnpInterface {};
-
-exception dmnpTest2Exception extends ::M1::M2::dmnpException
-{
-    ::M1::M2::dmnpEnum e1;
-    ::M1::M2::dmnpStruct s1;
-    ::M1::M2::dmnpStructSeq seq1;
-    ::M1::M2::dmnpStringStructDict dict1;
-    ::M1::M2::dmnpClass c1;
-    ::M1::M2::dmnpInterface i1;
-};
-
-class dmnpTest2Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface
-{
-    ::M1::M2::dmnpStruct
-    dmnpTest2Op1(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["ami"]
-    ::M1::M2::dmnpStruct
-    dmnpTest2Op2(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["amd"]
-    ::M1::M2::dmnpStruct
-    dmnpTest2Op3(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice
deleted file mode 100644
index dfd6295bc4f..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice
+++ /dev/null
@@ -1,95 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleNoPackage types from (different) single module definitions
-
-#include <DoubleModuleNoPackage.ice>
-
-module T1
-{
-
-const ::M1::M2::dmnpEnum dmnpTest3Constant = ::M1::M2::dmnpE1;
-
-struct dmnpTest3Struct
-{
-    ::M1::M2::dmnpEnum e;
-    ::M1::M2::dmnpStruct s;
-    ::M1::M2::dmnpStructSeq seq;
-    ::M1::M2::dmnpStringStructDict dict;
-    ::M1::M2::dmnpClass c;
-    ::M1::M2::dmnpInterface i;
-};
-
-sequence<::M1::M2::dmnpStruct> dmnpTest3StructSeq;
-
-dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest3StructClassSeq;
-
-interface dmnpTest3Interface extends ::M1::M2::dmnpInterface {};
-
-exception dmnpTest3Exception extends ::M1::M2::dmnpException
-{
-    ::M1::M2::dmnpEnum e1;
-    ::M1::M2::dmnpStruct s1;
-    ::M1::M2::dmnpStructSeq seq1;
-    ::M1::M2::dmnpStringStructDict dict1;
-    ::M1::M2::dmnpClass c1;
-    ::M1::M2::dmnpInterface i1;
-};
-
-class dmnpTest3Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface
-{
-    ::M1::M2::dmnpStruct
-    dmnpTest3Op1(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["ami"]
-    ::M1::M2::dmnpStruct
-    dmnpTest3Op2(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-
-    ["amd"]
-    ::M1::M2::dmnpStruct
-    dmnpTest3Op3(::M1::M2::dmnpEnum i1,
-                 ::M1::M2::dmnpStruct i2,
-                 ::M1::M2::dmnpStructSeq i3,
-                 ::M1::M2::dmnpStringStructDict i4,
-                 ::M1::M2::dmnpInterface i5,
-                 ::M1::M2::dmnpClass i6,
-                 out ::M1::M2::dmnpEnum o1,
-                 out ::M1::M2::dmnpStruct o2,
-                 out ::M1::M2::dmnpStructSeq o3,
-                 out ::M1::M2::dmnpStringStructDict o4,
-                 out ::M1::M2::dmnpInterface o5,
-                 out ::M1::M2::dmnpClass o6)
-        throws ::M1::M2::dmnpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice
deleted file mode 100644
index efec105c6e5..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleWithPackage types from top-level definitions
-
-#include <DoubleModuleWithPackage.ice>
-
-const ::M1::M2::dmwpEnum dmwpTest1Constant = ::M1::M2::dmwpE1;
-
-struct dmwpTest1Struct
-{
-    ::M1::M2::dmwpEnum e;
-    ::M1::M2::dmwpStruct s;
-    ::M1::M2::dmwpStructSeq seq;
-    ::M1::M2::dmwpStringStructDict dict;
-    ::M1::M2::dmwpClass c;
-    ::M1::M2::dmwpInterface i;
-};
-
-sequence<::M1::M2::dmwpStruct> dmwpTest1StructSeq;
-
-dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest1StructClassSeq;
-
-interface dmwpTest1Interface extends ::M1::M2::dmwpInterface {};
-
-exception dmwpTest1Exception extends ::M1::M2::dmwpException
-{
-    ::M1::M2::dmwpEnum e1;
-    ::M1::M2::dmwpStruct s1;
-    ::M1::M2::dmwpStructSeq seq1;
-    ::M1::M2::dmwpStringStructDict dict1;
-    ::M1::M2::dmwpClass c1;
-    ::M1::M2::dmwpInterface i1;
-};
-
-class dmwpTest1Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface
-{
-    ::M1::M2::dmwpStruct
-    dmwpTest1Op1(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["ami"]
-    ::M1::M2::dmwpStruct
-    dmwpTest1Op2(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["amd"]
-    ::M1::M2::dmwpStruct
-    dmwpTest1Op3(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice
deleted file mode 100644
index a5cd85405c2..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleWithPackage types from (different) package definitions
-
-#include <DoubleModuleWithPackage.ice>
-
-[["java:package:dmwpTest2"]]
-
-const ::M1::M2::dmwpEnum dmwpTest2Constant = ::M1::M2::dmwpE1;
-
-struct dmwpTest2Struct
-{
-    ::M1::M2::dmwpEnum e;
-    ::M1::M2::dmwpStruct s;
-    ::M1::M2::dmwpStructSeq seq;
-    ::M1::M2::dmwpStringStructDict dict;
-    ::M1::M2::dmwpClass c;
-    ::M1::M2::dmwpInterface i;
-};
-
-sequence<::M1::M2::dmwpStruct> dmwpTest2StructSeq;
-
-dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest2StructClassSeq;
-
-interface dmwpTest2Interface extends ::M1::M2::dmwpInterface {};
-
-exception dmwpTest2Exception extends ::M1::M2::dmwpException
-{
-    ::M1::M2::dmwpEnum e1;
-    ::M1::M2::dmwpStruct s1;
-    ::M1::M2::dmwpStructSeq seq1;
-    ::M1::M2::dmwpStringStructDict dict1;
-    ::M1::M2::dmwpClass c1;
-    ::M1::M2::dmwpInterface i1;
-};
-
-class dmwpTest2Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface
-{
-    ::M1::M2::dmwpStruct
-    dmwpTest2Op1(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["ami"]
-    ::M1::M2::dmwpStruct
-    dmwpTest2Op2(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["amd"]
-    ::M1::M2::dmwpStruct
-    dmwpTest2Op3(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-};
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice
deleted file mode 100644
index 1c638c54a08..00000000000
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use DoubleModuleWithPackage types from (same) package definitions
-
-#include <DoubleModuleWithPackage.ice>
-
-[["java:package:dmwp"]]
-
-const ::M1::M2::dmwpEnum dmwpTest3Constant = ::M1::M2::dmwpE1;
-
-struct dmwpTest3Struct
-{
-    ::M1::M2::dmwpEnum e;
-    ::M1::M2::dmwpStruct s;
-    ::M1::M2::dmwpStructSeq seq;
-    ::M1::M2::dmwpStringStructDict dict;
-    ::M1::M2::dmwpClass c;
-    ::M1::M2::dmwpInterface i;
-};
-
-sequence<::M1::M2::dmwpStruct> dmwpTest3StructSeq;
-
-dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest3StructClassSeq;
-
-interface dmwpTest3Interface extends ::M1::M2::dmwpInterface {};
-
-exception dmwpTest3Exception extends ::M1::M2::dmwpException
-{
-    ::M1::M2::dmwpEnum e1;
-    ::M1::M2::dmwpStruct s1;
-    ::M1::M2::dmwpStructSeq seq1;
-    ::M1::M2::dmwpStringStructDict dict1;
-    ::M1::M2::dmwpClass c1;
-    ::M1::M2::dmwpInterface i1;
-};
-
-class dmwpTest3Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface
-{
-    ::M1::M2::dmwpStruct
-    dmwpTest3Op1(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["ami"]
-    ::M1::M2::dmwpStruct
-    dmwpTest3Op2(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-
-    ["amd"]
-    ::M1::M2::dmwpStruct
-    dmwpTest3Op3(::M1::M2::dmwpEnum i1,
-                 ::M1::M2::dmwpStruct i2,
-                 ::M1::M2::dmwpStructSeq i3,
-                 ::M1::M2::dmwpStringStructDict i4,
-                 ::M1::M2::dmwpInterface i5,
-                 ::M1::M2::dmwpClass i6,
-                 out ::M1::M2::dmwpEnum o1,
-                 out ::M1::M2::dmwpStruct o2,
-                 out ::M1::M2::dmwpStructSeq o3,
-                 out ::M1::M2::dmwpStringStructDict o4,
-                 out ::M1::M2::dmwpInterface o5,
-                 out ::M1::M2::dmwpClass o6)
-        throws ::M1::M2::dmwpException;
-};
diff --git a/java/test/Ice/translator/TestNoModuleNoPackage.ice b/java/test/Ice/translator/TestNoModuleNoPackage.ice
deleted file mode 100644
index 0f4997bea02..00000000000
--- a/java/test/Ice/translator/TestNoModuleNoPackage.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleNoPackage types from top-level definitions. Note that
-// we can *only* test from top-level definitions, because it's not possible
-// to refer to top-level Java classes from within packaged types.
-
-#include <NoModuleNoPackage.ice>
-
-const nmnpEnum nmnpTestConstant = nmnpE1;
-
-struct nmnpTestStruct
-{
-    nmnpEnum e;
-    nmnpStruct s;
-    nmnpStructSeq seq;
-    nmnpStringStructDict dict;
-    nmnpClass c;
-    nmnpInterface i;
-};
-
-sequence<nmnpStruct> nmnpTestStructSeq;
-
-dictionary<nmnpStruct, nmnpBaseClass> nmnpTestStructClassSeq;
-
-interface nmnpTestInterface extends nmnpInterface {};
-
-exception nmnpTestException extends nmnpException
-{
-    nmnpEnum e1;
-    nmnpStruct s1;
-    nmnpStructSeq seq1;
-    nmnpStringStructDict dict1;
-    nmnpClass c1;
-    nmnpInterface i1;
-};
-
-class nmnpTestClass extends nmnpBaseClass implements nmnpBaseInterface
-{
-    nmnpStruct
-    nmnpTestOp1(nmnpEnum i1,
-                nmnpStruct i2,
-                nmnpStructSeq i3,
-                nmnpStringStructDict i4,
-                nmnpInterface i5,
-                nmnpClass i6,
-                out nmnpEnum o1,
-                out nmnpStruct o2,
-                out nmnpStructSeq o3,
-                out nmnpStringStructDict o4,
-                out nmnpInterface o5,
-                out nmnpClass o6)
-        throws nmnpException;
-
-    ["ami"]
-    nmnpStruct
-    nmnpTestOp2(nmnpEnum i1,
-                nmnpStruct i2,
-                nmnpStructSeq i3,
-                nmnpStringStructDict i4,
-                nmnpInterface i5,
-                nmnpClass i6,
-                out nmnpEnum o1,
-                out nmnpStruct o2,
-                out nmnpStructSeq o3,
-                out nmnpStringStructDict o4,
-                out nmnpInterface o5,
-                out nmnpClass o6)
-        throws nmnpException;
-
-    ["amd"]
-    nmnpStruct
-    nmnpTestOp3(nmnpEnum i1,
-                nmnpStruct i2,
-                nmnpStructSeq i3,
-                nmnpStringStructDict i4,
-                nmnpInterface i5,
-                nmnpClass i6,
-                out nmnpEnum o1,
-                out nmnpStruct o2,
-                out nmnpStructSeq o3,
-                out nmnpStringStructDict o4,
-                out nmnpInterface o5,
-                out nmnpClass o6)
-        throws nmnpException;
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage1.ice b/java/test/Ice/translator/TestNoModuleWithPackage1.ice
deleted file mode 100644
index c7c067b62a8..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage1.ice
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from top-level definitions
-
-#include <NoModuleWithPackage.ice>
-
-const nmwpEnum nmwpTest1Constant = nmwpE1;
-
-struct nmwpTest1Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest1StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest1StructClassSeq;
-
-interface nmwpTest1Interface extends nmwpInterface {};
-
-exception nmwpTest1Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest1Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest1Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest1Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest1Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage2.ice b/java/test/Ice/translator/TestNoModuleWithPackage2.ice
deleted file mode 100644
index c1135cd23b6..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage2.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from (different) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwpTest2"]]
-
-const nmwpEnum nmwpTest2Constant = nmwpE1;
-
-struct nmwpTest2Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest2StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest2StructClassSeq;
-
-interface nmwpTest2Interface extends nmwpInterface {};
-
-exception nmwpTest2Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest2Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest2Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest2Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest2Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage3.ice b/java/test/Ice/translator/TestNoModuleWithPackage3.ice
deleted file mode 100644
index abc14df7948..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage3.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from (same) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwp"]]
-
-const nmwpEnum nmwpTest3Constant = nmwpE1;
-
-struct nmwpTest3Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest3StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest3StructClassSeq;
-
-interface nmwpTest3Interface extends nmwpInterface {};
-
-exception nmwpTest3Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest3Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest3Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest3Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest3Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage4.ice b/java/test/Ice/translator/TestNoModuleWithPackage4.ice
deleted file mode 100644
index 3274e0ea440..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage4.ice
+++ /dev/null
@@ -1,95 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from single module definitions
-
-#include <NoModuleWithPackage.ice>
-
-module P
-{
-
-const nmwpEnum nmwpTest4Constant = nmwpE1;
-
-struct nmwpTest4Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest4StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest4StructClassSeq;
-
-interface nmwpTest4Interface extends nmwpInterface {};
-
-exception nmwpTest4Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest4Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest4Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest4Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest4Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage5.ice b/java/test/Ice/translator/TestNoModuleWithPackage5.ice
deleted file mode 100644
index 492afc92314..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage5.ice
+++ /dev/null
@@ -1,98 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from double module definitions
-
-#include <NoModuleWithPackage.ice>
-
-module P
-{
-module Q
-{
-
-const nmwpEnum nmwpTest5Constant = nmwpE1;
-
-struct nmwpTest5Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest5StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest5StructClassSeq;
-
-interface nmwpTest5Interface extends nmwpInterface {};
-
-exception nmwpTest5Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest5Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest5Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest5Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest5Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage6.ice b/java/test/Ice/translator/TestNoModuleWithPackage6.ice
deleted file mode 100644
index 7b0cdcbd463..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage6.ice
+++ /dev/null
@@ -1,97 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from single module with (different) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwpTest6"]]
-
-module P
-{
-
-const nmwpEnum nmwpTest6Constant = nmwpE1;
-
-struct nmwpTest6Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest6StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest6StructClassSeq;
-
-interface nmwpTest6Interface extends nmwpInterface {};
-
-exception nmwpTest6Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest6Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest6Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest6Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest6Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage7.ice b/java/test/Ice/translator/TestNoModuleWithPackage7.ice
deleted file mode 100644
index 397660dbf14..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage7.ice
+++ /dev/null
@@ -1,97 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from single module with (same) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwp"]]
-
-module P
-{
-
-const nmwpEnum nmwpTest7Constant = nmwpE1;
-
-struct nmwpTest7Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest7StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest7StructClassSeq;
-
-interface nmwpTest7Interface extends nmwpInterface {};
-
-exception nmwpTest7Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest7Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest7Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest7Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest7Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage8.ice b/java/test/Ice/translator/TestNoModuleWithPackage8.ice
deleted file mode 100644
index 1a76e64a223..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage8.ice
+++ /dev/null
@@ -1,100 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from double module with (different) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwpTest8"]]
-
-module P
-{
-module Q
-{
-
-const nmwpEnum nmwpTest8Constant = nmwpE1;
-
-struct nmwpTest8Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest8StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest8StructClassSeq;
-
-interface nmwpTest8Interface extends nmwpInterface {};
-
-exception nmwpTest8Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest8Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest8Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest8Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest8Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
-};
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage9.ice b/java/test/Ice/translator/TestNoModuleWithPackage9.ice
deleted file mode 100644
index feb9ad159d5..00000000000
--- a/java/test/Ice/translator/TestNoModuleWithPackage9.ice
+++ /dev/null
@@ -1,100 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use NoModuleWithPackage types from double module with (same) package definitions
-
-#include <NoModuleWithPackage.ice>
-
-[["java:package:nmwp"]]
-
-module P
-{
-module Q
-{
-
-const nmwpEnum nmwpTest9Constant = nmwpE1;
-
-struct nmwpTest9Struct
-{
-    nmwpEnum e;
-    nmwpStruct s;
-    nmwpStructSeq seq;
-    nmwpStringStructDict dict;
-    nmwpClass c;
-    nmwpInterface i;
-};
-
-sequence<nmwpStruct> nmwpTest9StructSeq;
-
-dictionary<nmwpStruct, nmwpBaseClass> nmwpTest9StructClassSeq;
-
-interface nmwpTest9Interface extends nmwpInterface {};
-
-exception nmwpTest9Exception extends nmwpException
-{
-    nmwpEnum e1;
-    nmwpStruct s1;
-    nmwpStructSeq seq1;
-    nmwpStringStructDict dict1;
-    nmwpClass c1;
-    nmwpInterface i1;
-};
-
-class nmwpTest9Class extends nmwpBaseClass implements nmwpBaseInterface
-{
-    nmwpStruct
-    nmwpTest9Op1(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["ami"]
-    nmwpStruct
-    nmwpTest9Op2(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-
-    ["amd"]
-    nmwpStruct
-    nmwpTest9Op3(nmwpEnum i1,
-                 nmwpStruct i2,
-                 nmwpStructSeq i3,
-                 nmwpStringStructDict i4,
-                 nmwpInterface i5,
-                 nmwpClass i6,
-                 out nmwpEnum o1,
-                 out nmwpStruct o2,
-                 out nmwpStructSeq o3,
-                 out nmwpStringStructDict o4,
-                 out nmwpInterface o5,
-                 out nmwpClass o6)
-        throws nmwpException;
-};
-
-};
-};
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice
deleted file mode 100644
index 92ab08d3dd5..00000000000
--- a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleNoPackage types from top-level definitions
-
-#include <SingleModuleNoPackage.ice>
-
-const M::smnpEnum smnpTest1Constant = M::smnpE1;
-
-struct smnpTest1Struct
-{
-    M::smnpEnum e;
-    M::smnpStruct s;
-    M::smnpStructSeq seq;
-    M::smnpStringStructDict dict;
-    M::smnpClass c;
-    M::smnpInterface i;
-};
-
-sequence<M::smnpStruct> smnpTest1StructSeq;
-
-dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest1StructClassSeq;
-
-interface smnpTest1Interface extends M::smnpInterface {};
-
-exception smnpTest1Exception extends M::smnpException
-{
-    M::smnpEnum e1;
-    M::smnpStruct s1;
-    M::smnpStructSeq seq1;
-    M::smnpStringStructDict dict1;
-    M::smnpClass c1;
-    M::smnpInterface i1;
-};
-
-class smnpTest1Class extends M::smnpBaseClass implements M::smnpBaseInterface
-{
-    M::smnpStruct
-    smnpTest1Op1(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["ami"]
-    M::smnpStruct
-    smnpTest1Op2(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["amd"]
-    M::smnpStruct
-    smnpTest1Op3(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-};
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice
deleted file mode 100644
index 4f7320ad228..00000000000
--- a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleNoPackage types from package definitions
-
-#include <SingleModuleNoPackage.ice>
-
-[["java:package:smnpTest2"]]
-
-const M::smnpEnum smnpTest2Constant = M::smnpE1;
-
-struct smnpTest2Struct
-{
-    M::smnpEnum e;
-    M::smnpStruct s;
-    M::smnpStructSeq seq;
-    M::smnpStringStructDict dict;
-    M::smnpClass c;
-    M::smnpInterface i;
-};
-
-sequence<M::smnpStruct> smnpTest2StructSeq;
-
-dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest2StructClassSeq;
-
-interface smnpTest2Interface extends M::smnpInterface {};
-
-exception smnpTest2Exception extends M::smnpException
-{
-    M::smnpEnum e1;
-    M::smnpStruct s1;
-    M::smnpStructSeq seq1;
-    M::smnpStringStructDict dict1;
-    M::smnpClass c1;
-    M::smnpInterface i1;
-};
-
-class smnpTest2Class extends M::smnpBaseClass implements M::smnpBaseInterface
-{
-    M::smnpStruct
-    smnpTest2Op1(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["ami"]
-    M::smnpStruct
-    smnpTest2Op2(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["amd"]
-    M::smnpStruct
-    smnpTest2Op3(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-};
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice
deleted file mode 100644
index e5cb0f8391c..00000000000
--- a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice
+++ /dev/null
@@ -1,95 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleNoPackage types from (different) single module definitions
-
-#include <SingleModuleNoPackage.ice>
-
-module T1
-{
-
-const M::smnpEnum smnpTest3Constant = M::smnpE1;
-
-struct smnpTest3Struct
-{
-    M::smnpEnum e;
-    M::smnpStruct s;
-    M::smnpStructSeq seq;
-    M::smnpStringStructDict dict;
-    M::smnpClass c;
-    M::smnpInterface i;
-};
-
-sequence<M::smnpStruct> smnpTest3StructSeq;
-
-dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest3StructClassSeq;
-
-interface smnpTest3Interface extends M::smnpInterface {};
-
-exception smnpTest3Exception extends M::smnpException
-{
-    M::smnpEnum e1;
-    M::smnpStruct s1;
-    M::smnpStructSeq seq1;
-    M::smnpStringStructDict dict1;
-    M::smnpClass c1;
-    M::smnpInterface i1;
-};
-
-class smnpTest3Class extends M::smnpBaseClass implements M::smnpBaseInterface
-{
-    M::smnpStruct
-    smnpTest3Op1(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["ami"]
-    M::smnpStruct
-    smnpTest3Op2(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-
-    ["amd"]
-    M::smnpStruct
-    smnpTest3Op3(M::smnpEnum i1,
-                 M::smnpStruct i2,
-                 M::smnpStructSeq i3,
-                 M::smnpStringStructDict i4,
-                 M::smnpInterface i5,
-                 M::smnpClass i6,
-                 out M::smnpEnum o1,
-                 out M::smnpStruct o2,
-                 out M::smnpStructSeq o3,
-                 out M::smnpStringStructDict o4,
-                 out M::smnpInterface o5,
-                 out M::smnpClass o6)
-        throws M::smnpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice
deleted file mode 100644
index ca669372c2c..00000000000
--- a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice
+++ /dev/null
@@ -1,97 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleNoPackage types from (same) single module with package definitions
-
-#include <SingleModuleNoPackage.ice>
-
-[["java:package:snmpTest5"]]
-
-module M
-{
-
-const smnpEnum smnpTest5Constant = smnpE1;
-
-struct smnpTest5Struct
-{
-    smnpEnum e;
-    smnpStruct s;
-    smnpStructSeq seq;
-    smnpStringStructDict dict;
-    smnpClass c;
-    smnpInterface i;
-};
-
-sequence<smnpStruct> smnpTest5StructSeq;
-
-dictionary<smnpStruct, smnpBaseClass> smnpTest5StructClassSeq;
-
-interface smnpTest5Interface extends smnpInterface {};
-
-exception smnpTest5Exception extends smnpException
-{
-    smnpEnum e1;
-    smnpStruct s1;
-    smnpStructSeq seq1;
-    smnpStringStructDict dict1;
-    smnpClass c1;
-    smnpInterface i1;
-};
-
-class smnpTest5Class extends smnpBaseClass implements smnpBaseInterface
-{
-    smnpStruct
-    smnpTest5Op1(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-
-    ["ami"]
-    smnpStruct
-    smnpTest5Op2(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-
-    ["amd"]
-    smnpStruct
-    smnpTest5Op3(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-};
-
-};
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice
deleted file mode 100644
index e1bbd7f9fcc..00000000000
--- a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice
+++ /dev/null
@@ -1,100 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleNoPackage types from (same) double module definitions with package
-
-#include <SingleModuleNoPackage.ice>
-
-[["java:package:smnpTest8"]]
-
-module M
-{
-module N
-{
-
-const smnpEnum smnpTest8Constant = smnpE1;
-
-struct smnpTest8Struct
-{
-    smnpEnum e;
-    smnpStruct s;
-    smnpStructSeq seq;
-    smnpStringStructDict dict;
-    smnpClass c;
-    smnpInterface i;
-};
-
-sequence<smnpStruct> smnpTest8StructSeq;
-
-dictionary<smnpStruct, smnpBaseClass> smnpTest8StructClassSeq;
-
-interface smnpTest8Interface extends smnpInterface {};
-
-exception smnpTest8Exception extends smnpException
-{
-    smnpEnum e1;
-    smnpStruct s1;
-    smnpStructSeq seq1;
-    smnpStringStructDict dict1;
-    smnpClass c1;
-    smnpInterface i1;
-};
-
-class smnpTest8Class extends smnpBaseClass implements smnpBaseInterface
-{
-    smnpStruct
-    smnpTest8Op1(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-
-    ["ami"]
-    smnpStruct
-    smnpTest8Op2(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-
-    ["amd"]
-    smnpStruct
-    smnpTest8Op3(smnpEnum i1,
-                 smnpStruct i2,
-                 smnpStructSeq i3,
-                 smnpStringStructDict i4,
-                 smnpInterface i5,
-                 smnpClass i6,
-                 out smnpEnum o1,
-                 out smnpStruct o2,
-                 out smnpStructSeq o3,
-                 out smnpStringStructDict o4,
-                 out smnpInterface o5,
-                 out smnpClass o6)
-        throws smnpException;
-};
-
-};
-};
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice
deleted file mode 100644
index 3ac1ada5a31..00000000000
--- a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleWithPackage types from top-level definitions
-
-#include <SingleModuleWithPackage.ice>
-
-const M::smwpEnum smwpTest1Constant = M::smwpE1;
-
-struct smwpTest1Struct
-{
-    M::smwpEnum e;
-    M::smwpStruct s;
-    M::smwpStructSeq seq;
-    M::smwpStringStructDict dict;
-    M::smwpClass c;
-    M::smwpInterface i;
-};
-
-sequence<M::smwpStruct> smwpTest1StructSeq;
-
-dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest1StructClassSeq;
-
-interface smwpTest1Interface extends M::smwpInterface {};
-
-exception smwpTest1Exception extends M::smwpException
-{
-    M::smwpEnum e1;
-    M::smwpStruct s1;
-    M::smwpStructSeq seq1;
-    M::smwpStringStructDict dict1;
-    M::smwpClass c1;
-    M::smwpInterface i1;
-};
-
-class smwpTest1Class extends M::smwpBaseClass implements M::smwpBaseInterface
-{
-    M::smwpStruct
-    smwpTest1Op1(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["ami"]
-    M::smwpStruct
-    smwpTest1Op2(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["amd"]
-    M::smwpStruct
-    smwpTest1Op3(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-};
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice
deleted file mode 100644
index 306825dc3a9..00000000000
--- a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleWithPackage types from (different) package definitions
-
-#include <SingleModuleWithPackage.ice>
-
-[["java:package:smwpTest2"]]
-
-const M::smwpEnum smwpTest2Constant = M::smwpE1;
-
-struct smwpTest2Struct
-{
-    M::smwpEnum e;
-    M::smwpStruct s;
-    M::smwpStructSeq seq;
-    M::smwpStringStructDict dict;
-    M::smwpClass c;
-    M::smwpInterface i;
-};
-
-sequence<M::smwpStruct> smwpTest2StructSeq;
-
-dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest2StructClassSeq;
-
-interface smwpTest2Interface extends M::smwpInterface {};
-
-exception smwpTest2Exception extends M::smwpException
-{
-    M::smwpEnum e1;
-    M::smwpStruct s1;
-    M::smwpStructSeq seq1;
-    M::smwpStringStructDict dict1;
-    M::smwpClass c1;
-    M::smwpInterface i1;
-};
-
-class smwpTest2Class extends M::smwpBaseClass implements M::smwpBaseInterface
-{
-    M::smwpStruct
-    smwpTest2Op1(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["ami"]
-    M::smwpStruct
-    smwpTest2Op2(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["amd"]
-    M::smwpStruct
-    smwpTest2Op3(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-};
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice
deleted file mode 100644
index 87b2896d526..00000000000
--- a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice
+++ /dev/null
@@ -1,92 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleWithPackage types from (same) package definitions
-
-#include <SingleModuleWithPackage.ice>
-
-[["java:package:smwp"]]
-
-const M::smwpEnum smwpTest3Constant = M::smwpE1;
-
-struct smwpTest3Struct
-{
-    M::smwpEnum e;
-    M::smwpStruct s;
-    M::smwpStructSeq seq;
-    M::smwpStringStructDict dict;
-    M::smwpClass c;
-    M::smwpInterface i;
-};
-
-sequence<M::smwpStruct> smwpTest3StructSeq;
-
-dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest3StructClassSeq;
-
-interface smwpTest3Interface extends M::smwpInterface {};
-
-exception smwpTest3Exception extends M::smwpException
-{
-    M::smwpEnum e1;
-    M::smwpStruct s1;
-    M::smwpStructSeq seq1;
-    M::smwpStringStructDict dict1;
-    M::smwpClass c1;
-    M::smwpInterface i1;
-};
-
-class smwpTest3Class extends M::smwpBaseClass implements M::smwpBaseInterface
-{
-    M::smwpStruct
-    smwpTest3Op1(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["ami"]
-    M::smwpStruct
-    smwpTest3Op2(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-
-    ["amd"]
-    M::smwpStruct
-    smwpTest3Op3(M::smwpEnum i1,
-                 M::smwpStruct i2,
-                 M::smwpStructSeq i3,
-                 M::smwpStringStructDict i4,
-                 M::smwpInterface i5,
-                 M::smwpClass i6,
-                 out M::smwpEnum o1,
-                 out M::smwpStruct o2,
-                 out M::smwpStructSeq o3,
-                 out M::smwpStringStructDict o4,
-                 out M::smwpInterface o5,
-                 out M::smwpClass o6)
-        throws M::smwpException;
-};
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice
deleted file mode 100644
index 16cc51993eb..00000000000
--- a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice
+++ /dev/null
@@ -1,97 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Test: use SingleModuleWithPackage types from (same) single module with (same) package definitions
-
-#include <SingleModuleWithPackage.ice>
-
-[["java:package:smwp"]]
-
-module M
-{
-
-const smwpEnum smwpTest8Constant = smwpE1;
-
-struct smwpTest8Struct
-{
-    smwpEnum e;
-    smwpStruct s;
-    smwpStructSeq seq;
-    smwpStringStructDict dict;
-    smwpClass c;
-    smwpInterface i;
-};
-
-sequence<smwpStruct> smwpTest8StructSeq;
-
-dictionary<smwpStruct, smwpBaseClass> smwpTest8StructClassSeq;
-
-interface smwpTest8Interface extends smwpInterface {};
-
-exception smwpTest8Exception extends smwpException
-{
-    smwpEnum e1;
-    smwpStruct s1;
-    smwpStructSeq seq1;
-    smwpStringStructDict dict1;
-    smwpClass c1;
-    smwpInterface i1;
-};
-
-class smwpTest8Class extends smwpBaseClass implements smwpBaseInterface
-{
-    smwpStruct
-    smwpTest8Op1(smwpEnum i1,
-                 smwpStruct i2,
-                 smwpStructSeq i3,
-                 smwpStringStructDict i4,
-                 smwpInterface i5,
-                 smwpClass i6,
-                 out smwpEnum o1,
-                 out smwpStruct o2,
-                 out smwpStructSeq o3,
-                 out smwpStringStructDict o4,
-                 out smwpInterface o5,
-                 out smwpClass o6)
-        throws smwpException;
-
-    ["ami"]
-    smwpStruct
-    smwpTest8Op2(smwpEnum i1,
-                 smwpStruct i2,
-                 smwpStructSeq i3,
-                 smwpStringStructDict i4,
-                 smwpInterface i5,
-                 smwpClass i6,
-                 out smwpEnum o1,
-                 out smwpStruct o2,
-                 out smwpStructSeq o3,
-                 out smwpStringStructDict o4,
-                 out smwpInterface o5,
-                 out smwpClass o6)
-        throws smwpException;
-
-    ["amd"]
-    smwpStruct
-    smwpTest8Op3(smwpEnum i1,
-                 smwpStruct i2,
-                 smwpStructSeq i3,
-                 smwpStringStructDict i4,
-                 smwpInterface i5,
-                 smwpClass i6,
-                 out smwpEnum o1,
-                 out smwpStruct o2,
-                 out smwpStructSeq o3,
-                 out smwpStringStructDict o4,
-                 out smwpInterface o5,
-                 out smwpClass o6)
-        throws smwpException;
-};
-
-};
diff --git a/java/test/Ice/translator/build.xml b/java/test/Ice/translator/build.xml
index c2dcd3a275e..0b687cc15e9 100644
--- a/java/test/Ice/translator/build.xml
+++ b/java/test/Ice/translator/build.xml
@@ -42,32 +42,13 @@
             <fileset dir="." includes="NoModuleWithPackage.ice"/>
             <fileset dir="." includes="SingleModuleNoPackage.ice"/>
             <fileset dir="." includes="SingleModuleWithPackage.ice"/>
-            <fileset dir="." includes="TestNoModuleNoPackage.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage1.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage2.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage3.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage4.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage5.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage6.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage7.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage8.ice"/>
-            <fileset dir="." includes="TestNoModuleWithPackage9.ice"/>
-            <fileset dir="." includes="TestSingleModuleNoPackage1.ice"/>
-            <fileset dir="." includes="TestSingleModuleNoPackage2.ice"/>
-            <fileset dir="." includes="TestSingleModuleNoPackage3.ice"/>
             <fileset dir="." includes="TestSingleModuleNoPackage4.ice"/>
-            <fileset dir="." includes="TestSingleModuleNoPackage5.ice"/>
             <fileset dir="." includes="TestSingleModuleNoPackage6.ice"/>
             <fileset dir="." includes="TestSingleModuleNoPackage7.ice"/>
-            <fileset dir="." includes="TestSingleModuleNoPackage8.ice"/>
-            <fileset dir="." includes="TestSingleModuleWithPackage1.ice"/>
-            <fileset dir="." includes="TestSingleModuleWithPackage2.ice"/>
-            <fileset dir="." includes="TestSingleModuleWithPackage3.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage4.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage5.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage6.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage7.ice"/>
-            <fileset dir="." includes="TestSingleModuleWithPackage8.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage9.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage10.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage11.ice"/>
@@ -79,16 +60,10 @@
             <includepath>
                 <pathelement path="." />
             </includepath>
-            <fileset dir="." includes="TestDoubleModuleNoPackage1.ice"/>
-            <fileset dir="." includes="TestDoubleModuleNoPackage2.ice"/>
-            <fileset dir="." includes="TestDoubleModuleNoPackage3.ice"/>
             <fileset dir="." includes="TestDoubleModuleNoPackage4.ice"/>
             <fileset dir="." includes="TestDoubleModuleNoPackage5.ice"/>
             <fileset dir="." includes="TestDoubleModuleNoPackage6.ice"/>
             <fileset dir="." includes="TestDoubleModuleNoPackage7.ice"/>
-            <fileset dir="." includes="TestDoubleModuleWithPackage1.ice"/>
-            <fileset dir="." includes="TestDoubleModuleWithPackage2.ice"/>
-            <fileset dir="." includes="TestDoubleModuleWithPackage3.ice"/>
             <fileset dir="." includes="TestDoubleModuleWithPackage4.ice"/>
             <fileset dir="." includes="TestDoubleModuleWithPackage5.ice"/>
             <fileset dir="." includes="TestDoubleModuleWithPackage6.ice"/>
diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java
index 9eb50fa1b0b..f974f10d11d 100644
--- a/java/test/IcePack/deployer/AllTests.java
+++ b/java/test/IcePack/deployer/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -131,21 +133,21 @@ public class AllTests
 	System.out.print("pinging server objects... ");
 	System.out.flush();
 
-	TestPrx obj;
+	TestIntfPrx obj;
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service2@IceBox1Service2Adapter"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service2@IceBox1Service2Adapter"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter"));
     
 	System.out.println("ok");
 
 	System.out.print("testing server configuration... ");
 	System.out.flush();
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
 	test(obj.getProperty("Type").equals("Server"));
 	test(obj.getProperty("Name").equals("Server1"));
 
@@ -158,13 +160,13 @@ public class AllTests
 	System.out.print("testing service configuration... ");
 	System.out.flush();
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
 	test(obj.getProperty("Service1.Type").equals("standard"));
 	test(obj.getProperty("Service1.ServiceName").equals("Service1"));
     
 	test(obj.getProperty("Service1.InheritedVariable").equals("inherited"));
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter"));
 	test(obj.getProperty("Service2.Type").equals("freeze"));
 	test(obj.getProperty("Service2.ServiceName").equals("Service2"));
 
@@ -176,7 +178,7 @@ public class AllTests
 	System.out.print("testing server options... ");
 	System.out.flush();
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
 	test(obj.getProperty("Test.Test").equals("2"));
 	test(obj.getProperty("Test.Test1").equals("0"));
 
@@ -213,10 +215,10 @@ public class AllTests
 	    test(false);
 	}
 
-	TestPrx obj;
+	TestIntfPrx obj;
 	try
 	{
-	    obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
+	    obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
 	    test(false);
 	}
 	catch(Ice.LocalException ex)
@@ -236,15 +238,15 @@ public class AllTests
 	    test(false);
 	}
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server"));
 	test(obj.getProperty("Mode").equals("manual"));
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server"));
 
 	System.out.println("ok");
 
 	System.out.print("testing service configuration... ");
 
-	obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
+	obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1"));
 	test(obj.getProperty("Service1.DebugProperty").equals("debug"));
 
 	System.out.println("ok");
diff --git a/java/test/IcePack/deployer/Test.ice b/java/test/IcePack/deployer/Test.ice
index 04841b0d1db..f2cd7f239b8 100644
--- a/java/test/IcePack/deployer/Test.ice
+++ b/java/test/IcePack/deployer/Test.ice
@@ -10,11 +10,16 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-interface Test
+module Test
+{
+
+interface TestIntf
 {
     void shutdown();
     
     string getProperty(string name);
 };
 
+};
+
 #endif
diff --git a/java/test/IcePack/deployer/TestI.java b/java/test/IcePack/deployer/TestI.java
index d5607a99684..ebeaaedd26f 100644
--- a/java/test/IcePack/deployer/TestI.java
+++ b/java/test/IcePack/deployer/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class TestI extends _TestDisp
+import Test.*;
+
+public class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter, Ice.Properties properties)
diff --git a/java/test/IcePack/simple/AllTests.java b/java/test/IcePack/simple/AllTests.java
index ddfec7a3243..efa55a44316 100644
--- a/java/test/IcePack/simple/AllTests.java
+++ b/java/test/IcePack/simple/AllTests.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class AllTests
 {
     private static void
@@ -18,7 +20,7 @@ public class AllTests
         }
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTests(Ice.Communicator communicator)
     {
 	System.out.print("testing stringToProxy... ");
@@ -30,7 +32,7 @@ public class AllTests
 
 	System.out.print("testing checked cast... ");
 	System.out.flush();
-	TestPrx obj = TestPrxHelper.checkedCast(base);
+	TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
 	test(obj != null);
 	test(obj.equals(base));
 	System.out.println("ok");
@@ -43,7 +45,7 @@ public class AllTests
 	return obj;
     }
 
-    public static TestPrx
+    public static TestIntfPrx
     allTestsWithDeploy(Ice.Communicator communicator)
     {
 	System.out.print("testing stringToProxy... ");
@@ -56,10 +58,10 @@ public class AllTests
 
 	System.out.print("testing checked cast... ");
 	System.out.flush();
-	TestPrx obj = TestPrxHelper.checkedCast(base);
+	TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
 	test(obj != null);
 	test(obj.equals(base));
-	TestPrx obj2 = TestPrxHelper.checkedCast(base2);
+	TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2);
 	test(obj2 != null);
 	test(obj2.equals(base2));
 	System.out.println("ok");
@@ -119,7 +121,7 @@ public class AllTests
 	System.out.flush();
 	try
 	{
-	    obj = TestPrxHelper.checkedCast(base);
+	    obj = TestIntfPrxHelper.checkedCast(base);
 	    test(false);
 	}
 	catch(Ice.NoEndpointException ex)
@@ -127,7 +129,7 @@ public class AllTests
 	}
 	try
 	{
-	    obj2 = TestPrxHelper.checkedCast(base2);
+	    obj2 = TestIntfPrxHelper.checkedCast(base2);
 	    test(false);
 	}
 	catch(Ice.NoEndpointException ex)
@@ -149,7 +151,7 @@ public class AllTests
 
 	try
 	{
-	    obj = TestPrxHelper.checkedCast(base);
+	    obj = TestIntfPrxHelper.checkedCast(base);
 	}
 	catch(Ice.NoEndpointException ex)
 	{
@@ -157,7 +159,7 @@ public class AllTests
 	}
 	try
 	{
-	    obj2 = TestPrxHelper.checkedCast(base2);
+	    obj2 = TestIntfPrxHelper.checkedCast(base2);
 	}
 	catch(Ice.NoEndpointException ex)
 	{
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index 9f33b45fb58..b6bdd52a316 100644
--- a/java/test/IcePack/simple/Client.java
+++ b/java/test/IcePack/simple/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Test.*;
+
 public class Client
 {
     private static int
@@ -22,7 +24,7 @@ public class Client
 	    }
 	}
 
-	TestPrx obj;
+	TestIntfPrx obj;
 
 	if(!withDeploy)
 	{
diff --git a/java/test/IcePack/simple/Test.ice b/java/test/IcePack/simple/Test.ice
index 54953223857..2553165ab21 100644
--- a/java/test/IcePack/simple/Test.ice
+++ b/java/test/IcePack/simple/Test.ice
@@ -10,9 +10,14 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-interface Test
+module Test
+{
+
+interface TestIntf
 {
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/test/IcePack/simple/TestI.java b/java/test/IcePack/simple/TestI.java
index a9b4b293dd4..fbe51b17a6f 100644
--- a/java/test/IcePack/simple/TestI.java
+++ b/java/test/IcePack/simple/TestI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class TestI extends _TestDisp
+import Test.*;
+
+public class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.ObjectAdapter adapter)