1 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
index 0082f97835..1f54edbdc5 100644
--- a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
+++ b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
@@ -192,7 +192,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
         val name  = readNameRef()
         val owner = if (atEnd) definitions.RootClass else readSymbolRef()
 
-        def fromName(name: Name) = mkTermName(name) match {
+        def fromName(name: Name) = name.toTermName match {
           case nme.ROOT     => definitions.RootClass
           case nme.ROOTPKG  => definitions.RootPackage
           case _            =>
@@ -276,14 +276,14 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
       }
 
       finishSym(tag match {
-        case TYPEsym  => owner.newAbstractType(mkTypeName(name))
-        case ALIASsym => owner.newAliasType(mkTypeName(name))
+        case TYPEsym  => owner.newAbstractType(name.toTypeName)
+        case ALIASsym => owner.newAliasType(name.toTypeName)
         case CLASSsym =>
           val sym = (isClassRoot, isModuleFlag) match {
             case (true, true)   => moduleRoot.moduleClass
             case (true, false)  => classRoot
-            case (false, true)  => owner.newModuleClass(mkTypeName(name))
-            case (false, false) => owner.newClass(mkTypeName(name))
+            case (false, true)  => owner.newModuleClass(name.toTypeName)
+            case (false, false) => owner.newClass(name.toTypeName)
           }
           if (!atEnd)
             sym.typeOfThis = newLazyTypeRef(readNat())
@@ -542,7 +542,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
           setSymModsName()
           val impl = readTemplateRef()
           val tparams = until(end, readTypeDefRef)
-          ClassDef(mods, mkTypeName(name), tparams, impl)
+          ClassDef(mods, name.toTypeName, tparams, impl)
 
         case MODULEtree =>
           setSymModsName()
@@ -566,7 +566,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
           setSymModsName()
           val rhs = readTreeRef()
           val tparams = until(end, readTypeDefRef)
-          TypeDef(mods, mkTypeName(name), tparams, rhs)
+          TypeDef(mods, name.toTypeName, tparams, rhs)
 
         case LABELtree =>
           setSymName()
@@ -777,8 +777,8 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
     protected def readModifiersRef(): Modifiers       = at(readNat(), readModifiers)
     protected def readTreeRef(): Tree                 = at(readNat(), readTree)
 
-    protected def readTypeNameRef(): TypeName         = mkTypeName(readNameRef())
-    protected def readTermNameRef(): TermName         = mkTermName(readNameRef())
+    protected def readTypeNameRef(): TypeName         = readNameRef().toTypeName
+    protected def readTermNameRef(): TermName         = readNameRef().toTermName
 
     protected def readTemplateRef(): Template =
       readTreeRef() match {