diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
index 5c3e07a8c5c..c57b8d537a4 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
@@ -303,7 +303,7 @@ public class JetTypeMapper {
             return getFQName(descriptor.getContainingDeclaration());
         }
 
-        if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor) {
+        if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor || descriptor instanceof ScriptDescriptor) {
             return "";
         }
 
@@ -341,11 +341,11 @@ public class JetTypeMapper {
         if (container != null) {
             String baseName = getFQName(container);
             if (!baseName.isEmpty()) { 
-                return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name;
+                return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name.getIdentifier();
             }
         }
 
-        return name.getName();
+        return name.getIdentifier();
     }
 
     private static ClassDescriptor getContainingClass(DeclarationDescriptor descriptor) {