diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
index 2a47158c56b..5240f42a922 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
@@ -277,7 +277,7 @@ public class NamespaceCodegen extends MemberCodegen {
             substringTo = name.length();
         }
 
-        int pathHashCode = FileUtil.toSystemDependentName(file.getVirtualFile().getCanonicalPath()).hashCode();
+        String pathHashCode = Integer.toHexString(FileUtil.toSystemDependentName(file.getVirtualFile().getPath()).hashCode());
 
         // dollar sign in the end is to prevent synthetic class from having "Test" or other parseable suffix
         // path hashCode to prevent same name / different path collision
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
index f57bee466e0..d9de048329c 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-9]*\.test1 \(I\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$1\$[\-]*[0-9]*\.test2 \(\)V
\ No newline at end of file
+// 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
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
index 43df2e3d042..3112e3b54c5 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-9]*\.test1 \(\)V
-// 1 INVOKESTATIC b/BPackage\$src\$2\$[\-]*[0-9]*\.test2 \(\)V
\ No newline at end of file
+// 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
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace/1.kt
index 01364d196e6..411d63895e8 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-9]*\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$2\$[\-]*[0-9]*\.test2 \(\)V
\ No newline at end of file
+// 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
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
index 26e8ae92fb0..febbd8f35ff 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-9]*\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage\$src\$1\$[\-]*[0-9]*\.test2 \(\)V
\ No newline at end of file
+// 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
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
index ca7b4efb10d..b8e7ff8e1ff 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-9]*\.getProp \(\)I
-// 1 GETSTATIC a/APackage\$src\$1\$[\-]*[0-9]*\.prop \: I
\ No newline at end of file
+// 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
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
index a60672a7b5c..9fbe6945525 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-9]*\.getProp \(\)I
-// 1 GETSTATIC a/APackage\$src\$1\$[\-]*[0-9]*\.prop \: I
\ No newline at end of file
+// 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