diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
index d152d38cd2c..729f2270587 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
@@ -321,7 +321,7 @@ public class NamespaceCodegen extends MemberCodegen {
         String fileName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(file.getName()));
 
         // path hashCode to prevent same name / different path collision
-        String srcName = facadeFqName.shortName().asString() + "$src$" + replaceSpecialSymbols(fileName) + "$" + Integer.toHexString(
+        String srcName = facadeFqName.shortName().asString() + "-" + replaceSpecialSymbols(fileName) + "-" + Integer.toHexString(
                 CodegenUtil.getPathHashCode(file));
 
         FqName srcFqName = facadeFqName.parent().child(Name.identifier(srcName));
diff --git a/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt b/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt
index daa98f7c949..f8d70b00bd0 100644
--- a/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt
+++ b/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt
@@ -1,4 +1,4 @@
 fun foo(a: Int = 1) {}
 
 //0 _DefaultPackage.foo
-//3 INVOKESTATIC _DefaultPackage\$src\$
\ No newline at end of file
+//3 INVOKESTATIC _DefaultPackage-
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
index d9de048329c..d5b86d680c7 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
@@ -4,5 +4,5 @@ fun test2() {
     1.test1()
 }
 
-// 2 INVOKESTATIC _DefaultPackage\$src\$1\$[0-9a-f]+\.test1 \(I\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$1\$[0-9a-f]+\.test2 \(\)V
\ No newline at end of file
+// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(I\)V
+// 1 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
index 3112e3b54c5..748a324778a 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
@@ -2,5 +2,5 @@ package a
 
 fun test1() {}
 
-// 2 INVOKESTATIC a/APackage\$src\$1\$[0-9a-f]+\.test1 \(\)V
-// 1 INVOKESTATIC b/BPackage\$src\$2\$[0-9a-f]+\.test2 \(\)V
\ No newline at end of file
+// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.test1 \(\)V
+// 1 INVOKESTATIC b/BPackage-2-[0-9a-f]+\.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt
index 411d63895e8..42283b72038 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt
@@ -1,4 +1,4 @@
 fun test1() {}
 
-// 2 INVOKESTATIC _DefaultPackage\$src\$1\$[0-9a-f]+\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$2\$[0-9a-f]+\.test2 \(\)V
\ No newline at end of file
+// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(\)V
+// 1 INVOKESTATIC _DefaultPackage-2-[0-9a-f]+\.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
index febbd8f35ff..1c152f19a23 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
@@ -4,5 +4,5 @@ fun test2() {
     test1()
 }
 
-// 2 INVOKESTATIC _DefaultPackage\$src\$1\$[0-9a-f]+\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$1\$[0-9a-f]+\.test2 \(\)V
\ No newline at end of file
+// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(\)V
+// 1 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
index b8e7ff8e1ff..279ac944cd4 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
@@ -2,5 +2,5 @@ package a
 
 val prop = 1
 
-// 2 INVOKESTATIC a/APackage\$src\$1\$[0-9a-f]+\.getProp \(\)I
-// 1 GETSTATIC a/APackage\$src\$1\$[0-9a-f]+\.prop \: I
\ No newline at end of file
+// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.getProp \(\)I
+// 1 GETSTATIC a/APackage-1-[0-9a-f]+\.prop \: I
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
index 9fbe6945525..812d59fb320 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
@@ -5,5 +5,5 @@ val prop: Int = 0
         return $prop + 1
     }
 
-// 2 INVOKESTATIC a/APackage\$src\$1\$[0-9a-f]+\.getProp \(\)I
-// 1 GETSTATIC a/APackage\$src\$1\$[0-9a-f]+\.prop \: I
\ No newline at end of file
+// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.getProp \(\)I
+// 1 GETSTATIC a/APackage-1-[0-9a-f]+\.prop \: I
diff --git a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
index 80f0c9c3329..9fd83efd517 100644
--- a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
+++ b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
@@ -1,6 +1,6 @@
 deprecated("") val test: Int = 0
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: _DefaultPackage$src$topLevelProperty$, test
+// TESTED_OBJECTS: _DefaultPackage-topLevelProperty-, test
 // IS_FULL_CONTAINING_CLASS_NAME: false
 // FLAGS: ACC_DEPRECATED, ACC_FINAL, ACC_STATIC
diff --git a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
index be89f5953f2..dd5cac7d845 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
@@ -64,17 +64,17 @@ public class OuterClassGenTest extends CodegenTestCase {
     }
 
     public void testObjectLiteralInPackageClass() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$src$outerClassInfo$", null, null);
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", null, null);
         doCustomTest("foo.FooPackage$packageObjectLiteral$1", expectedInfo);
     }
 
     public void testLocalClassInTopLevelFunction() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$src$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V");
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", "packageMethod", "(Lfoo/Foo;)V");
         doCustomTest("foo.FooPackage$packageMethod$PackageLocalClass", expectedInfo);
     }
 
     public void testLocalObjectInTopLevelFunction() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$src$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V");
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", "packageMethod", "(Lfoo/Foo;)V");
         doCustomTest("foo.FooPackage$packageMethod$PackageLocalObject", expectedInfo);
     }
 
diff --git a/idea/testData/debugger/_DefaultPackage.kt b/idea/testData/debugger/_DefaultPackage.kt
index ecdb62b424c..427238f6ce1 100644
--- a/idea/testData/debugger/_DefaultPackage.kt
+++ b/idea/testData/debugger/_DefaultPackage.kt
@@ -1,3 +1,3 @@
 fun foo() {
-    ""   // _DefaultPackage$src$_DefaultPackage$
+    ""   // _DefaultPackage-_DefaultPackage-
 }
diff --git a/idea/testData/debugger/extensionFunction.kt b/idea/testData/debugger/extensionFunction.kt
index f204b55cccc..b1990db8939 100644
--- a/idea/testData/debugger/extensionFunction.kt
+++ b/idea/testData/debugger/extensionFunction.kt
@@ -4,5 +4,5 @@ class A {
 }
 
 fun A.foo() {
-    ""   // a/APackage$src$extensionFunction$
+    ""   // a/APackage-extensionFunction-
 }
diff --git a/idea/testData/debugger/multiFileNamespace/a.kt b/idea/testData/debugger/multiFileNamespace/a.kt
index 221bcec7c9e..d03c5a7c981 100644
--- a/idea/testData/debugger/multiFileNamespace/a.kt
+++ b/idea/testData/debugger/multiFileNamespace/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    ""   // test/TestPackage$src$a$
+    ""   // test/TestPackage-a-
 }
diff --git a/idea/testData/debugger/multiFileNamespace/b.kt b/idea/testData/debugger/multiFileNamespace/b.kt
index c75df1f9eb3..f983f0f96f8 100644
--- a/idea/testData/debugger/multiFileNamespace/b.kt
+++ b/idea/testData/debugger/multiFileNamespace/b.kt
@@ -1,5 +1,5 @@
 package test
 
 fun bar() {
-    foo();   // test/TestPackage$src$b$
+    foo();   // test/TestPackage-b-
 }
diff --git a/idea/testData/debugger/multiFileSameName/1/a.kt b/idea/testData/debugger/multiFileSameName/1/a.kt
index f4f9168d559..2ce00cc8896 100644
--- a/idea/testData/debugger/multiFileSameName/1/a.kt
+++ b/idea/testData/debugger/multiFileSameName/1/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    "" // test/TestPackage$src$a$
+    "" // test/TestPackage-a-
 }
diff --git a/idea/testData/debugger/multiFileSameName/2/a.kt b/idea/testData/debugger/multiFileSameName/2/a.kt
index a5e446890a0..6273f85834b 100644
--- a/idea/testData/debugger/multiFileSameName/2/a.kt
+++ b/idea/testData/debugger/multiFileSameName/2/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun bar() {
-    "" // test/TestPackage$src$a$
+    "" // test/TestPackage-a-
 }
diff --git a/idea/testData/debugger/multiFileSameName/3/a.kt b/idea/testData/debugger/multiFileSameName/3/a.kt
index cd9fc9de04c..5c853affc77 100644
--- a/idea/testData/debugger/multiFileSameName/3/a.kt
+++ b/idea/testData/debugger/multiFileSameName/3/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun baz() {
-    "" // test/TestPackage$src$a$
+    "" // test/TestPackage-a-
 }
diff --git a/idea/testData/debugger/multiFileSameName/4/a.kt b/idea/testData/debugger/multiFileSameName/4/a.kt
index a2f60a7c415..2fb6ce684b3 100644
--- a/idea/testData/debugger/multiFileSameName/4/a.kt
+++ b/idea/testData/debugger/multiFileSameName/4/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun quux() {
-    "" // test/TestPackage$src$a$
+    "" // test/TestPackage-a-
 }
diff --git a/idea/testData/debugger/namespaceOfPackage.kt b/idea/testData/debugger/namespaceOfPackage.kt
index 48911664dc6..8cf5e0c6fcf 100644
--- a/idea/testData/debugger/namespaceOfPackage.kt
+++ b/idea/testData/debugger/namespaceOfPackage.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    ""   // test/TestPackage$src$namespaceOfPackage
+    ""   // test/TestPackage-namespaceOfPackage
 }