diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index 011252fe4..d65ab82fd 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -1080,7 +1080,7 @@ proc runJsonBuildInstructions*(conf: ConfigRef; projectfile: AbsoluteFile) =
 
       add(cmds, c[1].getStr)
       let (_, name, _) = splitFile(c[0].getStr)
-      add(prettyCmds, "CC: " & name)
+      add(prettyCmds, "CC: " & demanglePackageName(name))
 
     let prettyCb = proc (idx: int) =
       when declared(echo):
diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim
index 561d6dfc4..ef0d554b1 100644
--- a/compiler/packagehandling.nim
+++ b/compiler/packagehandling.nim
@@ -40,10 +40,10 @@ proc getPackageName*(conf: ConfigRef; path: string): string =
 
 proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string =
   # foo-#head/../bar becomes @foo-@hhead@s..@sbar
-  result = "@" & relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@s", "#": "@h", "@": "@@"})
+  result = "@m" & relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@s", "#": "@h", "@": "@@"})
 
 proc demanglePackageName*(path: string): string =
-  result = path[1 .. ^1].multiReplace({"@@": "@", "@h": "#", "@s": "/"})
+  result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": ""})
 
 proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
   let x = getPackageName(conf, path.string)