- renamed getType to getScalaType

3 files changed, 3 insertions, 3 deletions

diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index cb647954ec..cedd8703cd 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -379,7 +379,7 @@ public class Definitions {
 
     public Symbol SCALAOBJECT_GETTYPE() {
         if (SCALAOBJECT_GETTYPE == null)
-            SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getType);
+            SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getScalaType);
         return SCALAOBJECT_GETTYPE;
     }
 
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java
index c56e577df1..b18afe9525 100644
--- a/sources/scalac/transformer/TypesAsValuesPhase.java
+++ b/sources/scalac/transformer/TypesAsValuesPhase.java
@@ -374,7 +374,7 @@ public class TypesAsValuesPhase extends Phase {
             case DefDef(_, _, _, _, _, Tree rhs):
                 Symbol symbol = getSymbolFor(tree);
 
-                if (symbol.name == Names.getType && symbol.isSynthetic()) {
+                if (symbol.name == Names.getScalaType && symbol.isSynthetic()) {
                     // Correct the body of the getType method which,
                     // until now, was a placeholder (introduced by
                     // RefCheck).
diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java
index 16557bbaab..9875857bdd 100644
--- a/sources/scalac/util/Names.java
+++ b/sources/scalac/util/Names.java
@@ -180,7 +180,7 @@ public class Names {
     public static final Name get = Name.fromString("get");
     public static final Name getClass = Name.fromString("getClass");
     public static final Name getInstantiation = Name.fromString("getInstantiation");
-    public static final Name getType = Name.fromString("getType");
+    public static final Name getScalaType = Name.fromString("getScalaType");
     public static final Name isInstance = Name.fromString("isInstance");
     public static final Name hashCode = Name.fromString("hashCode");
     public static final Name hasNext = Name.fromString("hasNext");