- Removed alias scala.String

- Renamed in Definitions: OBJECT_CLASS into SCALAOBJECT_CLASS
- Renamed in Definitions: JAVA_<X> into <X> Renamed in Definitions:
- ANYREF_SYNCHRONIZED into OBJECT_SYNCHRONIZED

16 files changed, 90 insertions, 102 deletions

diff --git a/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml b/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml
index cbb9a3639c..6caeebd54b 100644
--- a/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml
+++ b/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml
@@ -91,7 +91,7 @@
         }
 
         val g = { 
-          val res = new scala.collection.mutable.HashMap[scala.String, boolean] ;
+          val res = new scala.collection.mutable.HashMap[String, boolean] ;
           <elementBinding>
           res.update( &qElementName;, <string ref="elementContainsText"/>);</elementBinding>
           res;
diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala
index 893da08591..420e2d25df 100644
--- a/sources/scala/tools/scalac/typechecker/Analyzer.scala
+++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala
@@ -2263,8 +2263,8 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
 
 	case Tree$Throw(expr) =>
 	  val expr1: Tree = transform(
-	    expr, EXPRmode, definitions.JAVA_THROWABLE_TYPE());
-	  gen.Select(tree.pos, expr1, definitions.JAVA_THROWABLE_THROW);
+	    expr, EXPRmode, definitions.THROWABLE_TYPE());
+	  gen.Select(tree.pos, expr1, definitions.THROWABLE_THROW);
 
 	case Tree$Return(expr) =>
 	  if (!context.owner.isInitialized()) {
diff --git a/sources/scala/tools/scalai/Compiler.java b/sources/scala/tools/scalai/Compiler.java
index 66fdfea75a..9479724a24 100644
--- a/sources/scala/tools/scalai/Compiler.java
+++ b/sources/scala/tools/scalai/Compiler.java
@@ -65,10 +65,10 @@ public class Compiler {
 
         SourceFile compiled = new SourceFile("<<compiled code>>", new byte[0]);
 
-        environment.insertFunction(definitions.JAVA_STRING_PLUS, Function.StringPlus); // !!!
+        environment.insertFunction(definitions.STRING_PLUS, Function.StringPlus); // !!!
         // !!! ANY_PLUS_STRING is commented out in definitions
         // !!! environment.insertFunction(definitions.ANY_PLUS_STRING, Function.StringPlus); // !!!
-        environment.insertFunction(definitions.JAVA_THROWABLE_THROW, Function.Throw);
+        environment.insertFunction(definitions.THROWABLE_THROW, Function.Throw);
         // !!! environment.insertFunction(definitions.MATCH, ...);
         // !!! environment.insertFunction(definitions.IS, ...);
         // !!! environment.insertFunction(definitions.AS, ...);
@@ -93,7 +93,7 @@ public class Compiler {
         }
         // !!! should we have a symbol Any.equals as for hashcode and toString?
         Symbol equals_symbol =
-            definitions.JAVA_OBJECT_CLASS.lookup(Names.equals);
+            definitions.OBJECT_CLASS.lookup(Names.equals);
         assert equals_symbol != Symbol.NONE;
         CodePromise equals_code = new CodePromise(
             new CodeContainer(
diff --git a/sources/scala/tools/scalai/ExpressionCompiler.java b/sources/scala/tools/scalai/ExpressionCompiler.java
index 3f88b6d128..95967bc386 100644
--- a/sources/scala/tools/scalai/ExpressionCompiler.java
+++ b/sources/scala/tools/scalai/ExpressionCompiler.java
@@ -261,7 +261,7 @@ public class ExpressionCompiler {
         if (symbol == definitions.BOOLEAN_AND()) {
             return Code.And(object, compute(trees[0]));
         }
-        if (symbol == definitions.ANYREF_SYNCHRONIZED) {
+        if (symbol == definitions.OBJECT_SYNCHRONIZED) {
             return Code.Synchronized(object, compute(trees[0]));
         }
         // !!! System.out.println("!!! method: " + Debug.show(symbol));
diff --git a/sources/scala/tools/scalai/Interpreter.java b/sources/scala/tools/scalai/Interpreter.java
index 5ab5cdc4b9..9588fb9461 100644
--- a/sources/scala/tools/scalai/Interpreter.java
+++ b/sources/scala/tools/scalai/Interpreter.java
@@ -150,7 +150,7 @@ public class Interpreter {
         Phase current = global.currentPhase;
         if (!erased) global.currentPhase = global.PHASE.ANALYZER.phase();
         Definitions definitions = global.definitions;
-        Type argument = definitions.ARRAY_TYPE(definitions.JAVA_STRING_TYPE());
+        Type argument = definitions.ARRAY_TYPE(definitions.STRING_TYPE());
         Type result = definitions.UNIT_TYPE();
         Symbol formal = new TermSymbol(0, ARGS_N, Symbol.NONE,Modifiers.PARAM);
         formal.setInfo(argument);
diff --git a/sources/scalac/atree/ATreeFromSTree.java b/sources/scalac/atree/ATreeFromSTree.java
index e5eccc8fe8..6c83e5e6a8 100644
--- a/sources/scalac/atree/ATreeFromSTree.java
+++ b/sources/scalac/atree/ATreeFromSTree.java
@@ -53,9 +53,9 @@ public class ATreeFromSTree {
         this.generators = new HashMap();
         Symbol[] classes = {
             definitions.ANY_CLASS,
-            definitions.JAVA_OBJECT_CLASS,
-            definitions.JAVA_STRING_CLASS,
-            definitions.JAVA_THROWABLE_CLASS,
+            definitions.OBJECT_CLASS,
+            definitions.STRING_CLASS,
+            definitions.THROWABLE_CLASS,
             definitions.ARRAY_CLASS,
             definitions.UNIT_CLASS,
             definitions.BOOLEAN_CLASS,
@@ -469,7 +469,7 @@ public class ATreeFromSTree {
             if (clasz == definitions.LONG_CLASS) return ATypeKind.I8;
             if (clasz == definitions.FLOAT_CLASS) return ATypeKind.R4;
             if (clasz == definitions.DOUBLE_CLASS) return ATypeKind.R8;
-            if (clasz == definitions.JAVA_STRING_CLASS) return ATypeKind.STR;
+            if (clasz == definitions.STRING_CLASS) return ATypeKind.STR;
             return ATypeKind.REF;
         default:
             return ATypeKind.REF;
@@ -488,14 +488,14 @@ public class ATreeFromSTree {
             addGenerator(definitions.ANY_IS, Generator.ISAS(false));
             addGenerator(definitions.ANY_AS, Generator.ISAS(true));
         }
-        if (clasz == definitions.JAVA_OBJECT_CLASS) {
-            addGenerator(definitions.ANYREF_SYNCHRONIZED, Generator.SYNCHRONIZED);
+        if (clasz == definitions.OBJECT_CLASS) {
+            addGenerator(definitions.OBJECT_SYNCHRONIZED, Generator.SYNCHRONIZED);
         }
-        if (clasz == definitions.JAVA_STRING_CLASS) {
-            addGenerator(definitions.JAVA_STRING_PLUS, Generator.CONCAT(ATypeKind.STR));
+        if (clasz == definitions.STRING_CLASS) {
+            addGenerator(definitions.STRING_PLUS, Generator.CONCAT(ATypeKind.STR));
         }
-        if (clasz == definitions.JAVA_THROWABLE_CLASS) {
-            addGenerator(definitions.JAVA_THROWABLE_THROW, Generator.THROW);
+        if (clasz == definitions.THROWABLE_CLASS) {
+            addGenerator(definitions.THROWABLE_THROW, Generator.THROW);
         }
         if (clasz == definitions.ARRAY_CLASS) {
             // !!! addAll(defs.ARRAY_CLASS, Names.length, Primitive.LENGTH, 1);
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java
index 66e29dda0b..60e3cf55e6 100644
--- a/sources/scalac/backend/Primitives.java
+++ b/sources/scalac/backend/Primitives.java
@@ -476,9 +476,6 @@ public class Primitives {
         addPrimitive(defs.ANY_HASHCODE, Primitive.HASHCODE);
         addPrimitive(defs.ANY_TOSTRING, Primitive.TOSTRING);
 
-        // scala.AnyRef
-        addPrimitive(defs.ANYREF_SYNCHRONIZED, Primitive.SYNCHRONIZED);
-
         // scala.Unit
         addAll(defs.UNIT_CLASS, Names.EQ, Primitive.EQ, 1);
         addAll(defs.UNIT_CLASS, Names.NE, Primitive.NE, 1);
@@ -654,6 +651,15 @@ public class Primitives {
         addAll(defs.DOUBLE_CLASS, Names.GT, Primitive.GT, 1);
         addAll(defs.DOUBLE_CLASS, Names.GE, Primitive.GE, 1);
 
+        // scala.Object
+        addPrimitive(defs.OBJECT_SYNCHRONIZED, Primitive.SYNCHRONIZED);
+
+        // scala.String
+        addPrimitive(defs.STRING_PLUS, Primitive.CONCAT);
+
+        // scala.Throwable
+        addPrimitive(defs.THROWABLE_THROW, Primitive.THROW);
+
         // scala.Array
         // !!! addAll(defs.ARRAY_CLASS, defs.EQEQ_N, Primitive.EQ, 1);
         // !!! addAll(defs.ARRAY_CLASS, defs.BANGEQ_N, Primitive.NE, 1);
@@ -664,12 +670,6 @@ public class Primitives {
         addAll(defs.ARRAY_CLASS, Names.apply, Primitive.APPLY, 2);
         addAll(defs.ARRAY_CLASS, Names.update, Primitive.UPDATE, 1);
 
-        // scala.String
-        addPrimitive(defs.JAVA_STRING_PLUS, Primitive.CONCAT);
-
-        // java.lang.Throwable
-        addPrimitive(defs.JAVA_THROWABLE_THROW, Primitive.THROW);
-
         // scala.runtime.RunTime
         addPrimitive(BOX_UVALUE, Primitive.BOX);
         addPrimitive(BOX_ZVALUE, Primitive.BOX);
@@ -811,7 +811,7 @@ public class Primitives {
                     // !!! System.out.println("!!! Ignoring pico bridge method " + Debug.show(clasz) + "." + name);
                     break;
                 }
-                if (vparams[0].type().equals(definitions.JAVA_STRING_TYPE())) {
+                if (vparams[0].type().equals(definitions.STRING_TYPE())) {
                     addPrimitive(alts[i], Primitive.CONCAT);
                     assert !concat;
                     concat = true;
@@ -1258,7 +1258,7 @@ public class Primitives {
         assert clasz.isClassType(): Debug.show(clasz);
         if (clasz == definitions.ANY_CLASS ||
             clasz == definitions.ANYREF_CLASS)
-            return getJREClassName(definitions.JAVA_OBJECT_CLASS);
+            return getJREClassName(definitions.OBJECT_CLASS);
         String suffix = clasz.isModuleClass() && !clasz.isJava() ? "$" : "";
         String name = jreNameWriter.appendSymbol(clasz, suffix).toString();
         jreNameWriter.setStringBuffer(null);
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java
index 4dc64783fd..3fbe0e91f9 100644
--- a/sources/scalac/backend/msil/TypeCreator.java
+++ b/sources/scalac/backend/msil/TypeCreator.java
@@ -161,8 +161,8 @@ final class TypeCreator {
 	if (initialized)
 	    return;
 
-	final Symbol JOBJECT = defs.JAVA_OBJECT_CLASS;
-	final Symbol JSTRING = defs.JAVA_STRING_CLASS;
+	final Symbol JOBJECT = defs.OBJECT_CLASS;
+	final Symbol JSTRING = defs.STRING_CLASS;
 
 	SCALA_BYTE    = getType("scala.Byte");
 	SCALA_SHORT   = getType("scala.Short");
diff --git a/sources/scalac/checkers/TreeChecker.java b/sources/scalac/checkers/TreeChecker.java
index 9351110558..9f48678cda 100644
--- a/sources/scalac/checkers/TreeChecker.java
+++ b/sources/scalac/checkers/TreeChecker.java
@@ -261,7 +261,7 @@ public class TreeChecker {
             return expression(value, currentMember().resultType());
 
         case Throw(Tree value):
-            return expression(value, definitions.JAVA_THROWABLE_TYPE());
+            return expression(value, definitions.THROWABLE_TYPE());
 
         case New(Template(Tree[] bases, Tree[] body)):
             assert bases.length == 1 && body.length == 0: show(tree);
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index 505c6b14f2..b418116b6b 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -64,16 +64,16 @@ public class Definitions {
     // Public Fields & Methods - Java classes
 
     /** The java.lang.Object class */
-    public final Symbol JAVA_OBJECT_CLASS;
-    public final Type   JAVA_OBJECT_TYPE() {return JAVA_OBJECT_CLASS.type();}
+    public final Symbol OBJECT_CLASS;
+    public final Type   OBJECT_TYPE() {return OBJECT_CLASS.type();}
 
     /** The java.lang.String class */
-    public final Symbol JAVA_STRING_CLASS;
-    public final Type   JAVA_STRING_TYPE() {return JAVA_STRING_CLASS.type();}
+    public final Symbol STRING_CLASS;
+    public final Type   STRING_TYPE() {return STRING_CLASS.type();}
 
     /** The java.lang.Throwable class */
-    public final Symbol JAVA_THROWABLE_CLASS;
-    public final Type   JAVA_THROWABLE_TYPE() {return JAVA_THROWABLE_CLASS.type();}
+    public final Symbol THROWABLE_CLASS;
+    public final Type   THROWABLE_TYPE() {return THROWABLE_CLASS.type();}
 
     //########################################################################
     // Public Fields & Methods - Scala value classes
@@ -135,13 +135,9 @@ public class Definitions {
     //########################################################################
     // Public Fields & Methods - Scala reference classes
 
-    /** The scala.Object class */
-    public final Symbol OBJECT_CLASS;
-    public final Type   OBJECT_TYPE() {return OBJECT_CLASS.type();}
-
-    /** The scala.String class */
-    public final Symbol STRING_CLASS;
-    public final Type   STRING_TYPE() {return STRING_CLASS.type();}
+    /** The scala.ScalaObject class */
+    public final Symbol SCALAOBJECT_CLASS;
+    public final Type   SCALAOBJECT_TYPE() {return SCALAOBJECT_CLASS.type();}
 
     /** The scala.Ref class */
     public final Symbol REF_CLASS;
@@ -246,17 +242,17 @@ public class Definitions {
     public final Symbol ANY_AS;
     public final Symbol ANY_MATCH;
 
-    /** Some scala.AnyRef methods */
-    public final Symbol ANYREF_SYNCHRONIZED;
-
     //########################################################################
     // Public Fields & Methods - Java class methods
 
+    /** Some java.lang.Object methods */
+    public final Symbol OBJECT_SYNCHRONIZED;
+
     /** Some java.lang.String methods */
-    public final Symbol JAVA_STRING_PLUS;
+    public final Symbol STRING_PLUS;
 
     /** Some java.lang.Throwable methods */
-    public final Symbol JAVA_THROWABLE_THROW;
+    public final Symbol THROWABLE_THROW;
 
     //########################################################################
     // Public Fields & Methods - Scala value class methods
@@ -285,13 +281,13 @@ public class Definitions {
     //########################################################################
     // Public Fields & Methods - Scala reference class methods
 
-    /** Some scala.Object methods */
-    private Symbol OBJECT_TAG;
+    /** Some scala.ScalaObject methods */
+    private Symbol SCALAOBJECT_TAG;
 
-    public Symbol OBJECT_TAG() {
-        if (OBJECT_TAG == null)
-            OBJECT_TAG = loadTerm(OBJECT_CLASS, Names.tag);
-        return OBJECT_TAG;
+    public Symbol SCALAOBJECT_TAG() {
+        if (SCALAOBJECT_TAG == null)
+            SCALAOBJECT_TAG = loadTerm(SCALAOBJECT_CLASS, Names.tag);
+        return SCALAOBJECT_TAG;
     }
 
     /** Some scala.Ref methods */
@@ -482,9 +478,9 @@ public class Definitions {
         ALL_CLASS = newClass(SCALA_CLASS, Names.All, 0);
 
         // the java classes
-        JAVA_OBJECT_CLASS = getClass(Names.java_lang_Object);
-        JAVA_THROWABLE_CLASS = getClass(Names.java_lang_Throwable);
-        JAVA_STRING_CLASS = getClass(Names.java_lang_String);
+        OBJECT_CLASS = getClass(Names.java_lang_Object);
+        THROWABLE_CLASS = getClass(Names.java_lang_Throwable);
+        STRING_CLASS = getClass(Names.java_lang_String);
 
         // the scala value classes
         UNIT_CLASS = getClass(Names.scala_Unit);
@@ -498,8 +494,7 @@ public class Definitions {
         DOUBLE_CLASS = getClass(Names.scala_Double);
 
         // the scala reference classes
-        OBJECT_CLASS = getClass(Names.scala_ScalaObject);
-        STRING_CLASS = newAlias(SCALA_CLASS, Names.String, 0);
+        SCALAOBJECT_CLASS = getClass(Names.scala_ScalaObject);
         REF_CLASS = getClass(Names.scala_Ref);
         for (int i = 1; i < TUPLE_COUNT; i++) {
             TUPLE_CLASS[i] = getClass(Names.scala_Tuple(i));
@@ -521,7 +516,7 @@ public class Definitions {
 
         // initialize generated classes and aliases
         initClass(ANY_CLASS, Type.EMPTY_ARRAY);
-        initAlias(ANYREF_CLASS, JAVA_OBJECT_TYPE());
+        initAlias(ANYREF_CLASS, OBJECT_TYPE());
         initClass(ALLREF_CLASS, new Type[]{ANYREF_TYPE()});
         initClass(ALL_CLASS, new Type[]{ANY_TYPE()});
 
@@ -538,9 +533,6 @@ public class Definitions {
         ARRAY_TYPE   = newTypeSymbol(Names.Array  ,
             Type.appliedType(ARRAY_CLASS.type(), new Type[]{ANYREF_TYPE()}));
 
-        // initialize generated classes and aliases
-        initAlias(STRING_CLASS, JAVA_STRING_TYPE());
-
         // add members to scala.Any
         ANY_EQ       = newTerm(ANY_CLASS, Names.eq          , 0);
         ANY_EQEQ     = newTerm(ANY_CLASS, Names.EQEQ        , Modifiers.FINAL);
@@ -581,31 +573,28 @@ public class Definitions {
                     ANY_MATCH_VPARAMS,
                     ANY_MATCH_TPARAMS[1].type())));
 
-        // add members to scala.AnyREF
-        ANYREF_SYNCHRONIZED =
-            newTerm(ANYREF_CLASS, Names.synchronized_, Modifiers.FINAL);
+        // add members to java.lang.Object
+        OBJECT_SYNCHRONIZED =
+            newTerm(OBJECT_CLASS, Names.synchronized_, Modifiers.FINAL);
 
-        Symbol ANYREF_SYNCHRONIZED_TPARAM =
-            newTParam(ANYREF_SYNCHRONIZED,0,ANY_TYPE());
-        Symbol ANYREF_SYNCHRONIZED_VPARAM =
-            newVParam(ANYREF_SYNCHRONIZED,0,ANYREF_SYNCHRONIZED_TPARAM.type());
-        ANYREF_SYNCHRONIZED.setInfo(
+        Symbol OBJECT_SYNCHRONIZED_TPARAM =
+            newTParam(OBJECT_SYNCHRONIZED,0,ANY_TYPE());
+        Symbol OBJECT_SYNCHRONIZED_VPARAM =
+            newVParam(OBJECT_SYNCHRONIZED,0,OBJECT_SYNCHRONIZED_TPARAM.type());
+        OBJECT_SYNCHRONIZED.setInfo(
             Type.PolyType(
-                new Symbol[] {ANYREF_SYNCHRONIZED_TPARAM},
+                new Symbol[] {OBJECT_SYNCHRONIZED_TPARAM},
                 Type.MethodType(
-                    new Symbol[] {ANYREF_SYNCHRONIZED_VPARAM},
-                    ANYREF_SYNCHRONIZED_TPARAM.type())));
+                    new Symbol[] {OBJECT_SYNCHRONIZED_VPARAM},
+                    OBJECT_SYNCHRONIZED_TPARAM.type())));
 
         // add members to java.lang.String
-        JAVA_STRING_PLUS =
-            newTerm(JAVA_STRING_CLASS, Names.PLUS, Modifiers.FINAL);
-        initMethod(JAVA_STRING_PLUS, new Type[]{ANY_TYPE()}, STRING_TYPE());
+        STRING_PLUS = newTerm(STRING_CLASS, Names.PLUS, Modifiers.FINAL);
+        initMethod(STRING_PLUS, new Type[]{ANY_TYPE()}, STRING_TYPE());
 
         // add members to java.lang.Throwable
-        JAVA_THROWABLE_THROW =
-            newTerm(JAVA_THROWABLE_CLASS, Names.throw_, Modifiers.FINAL);
-        JAVA_THROWABLE_THROW.setInfo(
-            Type.PolyType(Symbol.EMPTY_ARRAY, ALL_TYPE()));
+        THROWABLE_THROW =newTerm(THROWABLE_CLASS,Names.throw_,Modifiers.FINAL);
+        THROWABLE_THROW.setInfo(Type.PolyType(Symbol.EMPTY_ARRAY, ALL_TYPE()));
 
         // create global values
         PATTERN_WILDCARD = new TermSymbol(
@@ -688,7 +677,6 @@ public class Definitions {
 
     /** Creates a new term */
     private Symbol newTerm(Symbol owner, Name name, int flags) {
-        if (owner.isTypeAlias()) owner = owner.type().unalias().symbol();
         assert owner.isClassType(): Debug.show(owner) + " -- " + name;
         Symbol term = new TermSymbol(Position.NOPOS, name, owner, flags);
         owner.members().enterOrOverload(term);
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java
index 6e89ef88d8..d1df9d6e35 100644
--- a/sources/scalac/symtab/Type.java
+++ b/sources/scalac/symtab/Type.java
@@ -719,7 +719,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
             Definitions definitions = Global.instance.definitions;
             return members.isEmpty() &&
                 parents.length == 2 &&
-                (parents[0].symbol() == definitions.JAVA_OBJECT_CLASS ||
+                (parents[0].symbol() == definitions.OBJECT_CLASS ||
 		 parents[0].symbol() == definitions.ANYREF_CLASS) &&
                 parents[1].isFunctionType();
         }
@@ -914,7 +914,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
     }
     static private Map objToAnyMap = new Map() {
 	public Type apply(Type t) {
-	    if (t.symbol() == Global.instance.definitions.JAVA_OBJECT_CLASS)
+	    if (t.symbol() == Global.instance.definitions.OBJECT_CLASS)
 		return Global.instance.definitions.ANY_TYPE();
 	    else return t;
 	}
@@ -2005,7 +2005,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
             break;
 
         case UnboxedArrayType(_):
-            if (Global.instance.definitions.JAVA_OBJECT_TYPE().isSubType(that))
+            if (Global.instance.definitions.OBJECT_TYPE().isSubType(that))
                 return true;
             // !!! we should probably also test for Clonable, Serializable, ...
         }
@@ -3082,7 +3082,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
             case CLASS:
                 Definitions definitions = Global.instance.definitions;
                 if (sym == definitions.UNIT_CLASS) return this;
-                if (sym == definitions.JAVA_OBJECT_CLASS ||
+                if (sym == definitions.OBJECT_CLASS ||
                     sym == definitions.ALL_CLASS ||
                     sym == definitions.ALLREF_CLASS)
                     return Type.typeRef(NoPrefix, definitions.ANY_CLASS, EMPTY_ARRAY);
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index 1190da66c5..fb472ad9fd 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -286,9 +286,9 @@ public class CLRClassParser extends ClassParser {
 
     protected scalac.symtab.Type getCLRType(Type type) {
 	if (type == importer.OBJECT)
-	    return global.definitions.JAVA_OBJECT_TYPE();
+	    return global.definitions.OBJECT_TYPE();
 	if (type == importer.STRING)
-	    return global.definitions.JAVA_STRING_TYPE();
+	    return global.definitions.STRING_TYPE();
 	if (type == importer.VOID)
 	    return make.voidType();
 	if (type == importer.BOOLEAN)
diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java
index 57ba860698..1c0036ad1c 100644
--- a/sources/scalac/symtab/classfile/JavaTypeCreator.java
+++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java
@@ -30,8 +30,8 @@ public class JavaTypeCreator implements JavaTypeFactory {
     protected final Type BYTE_TYPE;
     protected final Type BOOLEAN_TYPE;
     protected final Type UNIT_TYPE;
+    protected final Type OBJECT_TYPE;
     protected final Type ARRAY_TYPE;
-    protected final Type JAVA_OBJECT_TYPE;
 
     public JavaTypeCreator(Definitions definitions) {
         this.definitions = definitions;
@@ -45,8 +45,8 @@ public class JavaTypeCreator implements JavaTypeFactory {
         this.BYTE_TYPE = definitions.BYTE_CLASS.typeConstructor();
         this.BOOLEAN_TYPE = definitions.BOOLEAN_CLASS.typeConstructor();
         this.UNIT_TYPE = definitions.UNIT_CLASS.typeConstructor();
+        this.OBJECT_TYPE = definitions.OBJECT_CLASS.typeConstructor();
         this.ARRAY_TYPE = definitions.ARRAY_CLASS.typeConstructor();
-        this.JAVA_OBJECT_TYPE =definitions.JAVA_OBJECT_CLASS.typeConstructor();
     }
 
     public Type anyType() {
@@ -111,7 +111,7 @@ public class JavaTypeCreator implements JavaTypeFactory {
         return new MethodType(args, restpe);
     }
     private Type objToAny(Type tp) {
-	if (tp.isSameAs(JAVA_OBJECT_TYPE))
+	if (tp.isSameAs(OBJECT_TYPE))
 	    return ANY_TYPE;
 	else
 	    return tp;
@@ -144,7 +144,7 @@ public class JavaTypeCreator implements JavaTypeFactory {
             return AConstant.FLOAT(((Number)value).floatValue());
         if (base.symbol() == definitions.DOUBLE_CLASS)
             return AConstant.DOUBLE(((Number)value).doubleValue());
-        if (base.symbol() == definitions.JAVA_STRING_CLASS)
+        if (base.symbol() == definitions.STRING_CLASS)
             return AConstant.STRING((String)value);
     	throw Debug.abort("illegal value", value + " - " + base);
     }
@@ -163,7 +163,7 @@ public class JavaTypeCreator implements JavaTypeFactory {
         else if (value instanceof Double)
             return doubleType();
         else if (value instanceof String)
-            return definitions.JAVA_STRING_CLASS.typeConstructor();
+            return definitions.STRING_CLASS.typeConstructor();
         else if (value instanceof Boolean)
             return booleanType();
         else
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index 53365bbb38..935a3ac93e 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -815,7 +815,7 @@ public class PatternMatcher extends PatternTool {
     }
 
     protected boolean optimize(Type selType, PatternNode alternatives) {
-        if (!optimize || !selType.isSubType(defs.OBJECT_TYPE()))
+        if (!optimize || !selType.isSubType(defs.SCALAOBJECT_TYPE()))
             return false;
         int cases = 0;
         while (alternatives != null) {
@@ -898,7 +898,7 @@ public class PatternMatcher extends PatternTool {
             cases = cases.next;
         }
         return gen.Switch(
-                          gen.mkApply__(gen.Select(selector.duplicate(), defs.OBJECT_TAG())),
+                          gen.mkApply__(gen.Select(selector.duplicate(), defs.SCALAOBJECT_TAG())),
                           tags,
                           bodies,
                           (defaultCase == null) ? gen.mkBooleanLit(selector.pos, false)
diff --git a/sources/scalac/typechecker/ConstantFolder.java b/sources/scalac/typechecker/ConstantFolder.java
index 20b37323eb..04d788d7f5 100644
--- a/sources/scalac/typechecker/ConstantFolder.java
+++ b/sources/scalac/typechecker/ConstantFolder.java
@@ -285,7 +285,7 @@ public class ConstantFolder {
                 return AConstant.DOUBLE(value.doubleValue());
             return null;
         case STR:
-            if (type.isSameAs(definitions.JAVA_STRING_TYPE()))
+            if (type.isSameAs(definitions.STRING_TYPE()))
                 return value;
             return null;
         default:
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index 4beeabe7e5..961776b7cd 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -574,7 +574,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Symbol sym = clazz.info().lookupNonPrivate(name);
 	return sym.kind == VAL &&
 	    (sym.owner() == clazz ||
-	     !defs.JAVA_OBJECT_CLASS.isSubClass(sym.owner()) &&
+	     !defs.OBJECT_CLASS.isSubClass(sym.owner()) &&
 	     (sym.flags & DEFERRED) == 0);
     }
 
@@ -644,10 +644,10 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	    for (int i = 0; i < fields.length; i++) {
 		String str = (i == fields.length - 1) ? ")" : ",";
 		body = gen.Apply(
-		    gen.Select(body, defs.JAVA_STRING_PLUS),
+		    gen.Select(body, defs.STRING_PLUS),
 		    new Tree[]{fields[i]});
 		body = gen.Apply(
-		    gen.Select(body, defs.JAVA_STRING_PLUS),
+		    gen.Select(body, defs.STRING_PLUS),
 		    new Tree[]{gen.mkStringLit(clazz.pos, str)});
 	    }
 	}
@@ -723,7 +723,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	private Tree tagMethod(ClassSymbol clazz) {
 	    Symbol tagSym = new TermSymbol(
 		clazz.pos, Names.tag, clazz,
-		clazz.isSubClass(defs.OBJECT_CLASS) ? OVERRIDE : 0)
+		clazz.isSubClass(defs.SCALAOBJECT_CLASS) ? OVERRIDE : 0)
 		.setInfo(Type.MethodType(Symbol.EMPTY_ARRAY, defs.INT_TYPE()));
 	    clazz.info().members().enter(tagSym);
 	    return gen.DefDef(