diff --git a/compiler/src/dotty/tools/dotc/coverage/Location.scala b/compiler/src/dotty/tools/dotc/coverage/Location.scala
index 88893709b8bd..de1a3db710a3 100644
--- a/compiler/src/dotty/tools/dotc/coverage/Location.scala
+++ b/compiler/src/dotty/tools/dotc/coverage/Location.scala
@@ -31,9 +31,9 @@ object Location:
 
     val ownerDenot = ctx.owner.denot
     val enclosingClass = ownerDenot.enclosingClass
-    val packageName = ownerDenot.enclosingPackageClass.fullName.toSimpleName.toString
-    val className = enclosingClass.name.toSimpleName.toString
-    val methodName = ownerDenot.enclosingMethod.name.toSimpleName.toString
+    val packageName = ownerDenot.enclosingPackageClass.fullName.toSimpleName.show
+    val className = enclosingClass.name.toSimpleName.show
+    val methodName = ownerDenot.enclosingMethod.name.toSimpleName.show
 
     val classType: String =
       if enclosingClass.is(Trait) then "Trait"
diff --git a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
index 2723f726f064..eac44e982603 100644
--- a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
@@ -101,7 +101,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
         // the internal line number is 0-base https://github.com/lampepfl/dotty/blob/18ada516a85532524a39a962b2ddecb243c65376/compiler/src/dotty/tools/dotc/util/SourceFile.scala#L173-L176
         line = pos.line + 1,
         desc = sourceFile.content.slice(pos.start, pos.end).mkString,
-        symbolName = tree.symbol.name.toSimpleName.toString,
+        symbolName = tree.symbol.name.toSimpleName.show,
         treeName = tree.getClass.getSimpleName.nn,
         branch
       )
diff --git a/tests/coverage/pos/Constructor.scoverage.check b/tests/coverage/pos/Constructor.scoverage.check
index cb676686eac5..a95bb21488b8 100644
--- a/tests/coverage/pos/Constructor.scoverage.check
+++ b/tests/coverage/pos/Constructor.scoverage.check
@@ -174,9 +174,9 @@ def g
 9
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 g
 203
 208
@@ -191,9 +191,9 @@ def g
 10
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 y
 223
 228
@@ -208,9 +208,9 @@ def y
 11
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 <init>
 235
 239
@@ -225,9 +225,9 @@ g(y)
 12
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 <init>
 237
 238
diff --git a/tests/coverage/pos/Enum.scoverage.check b/tests/coverage/pos/Enum.scoverage.check
index 3baa74fc2e5e..6806934e0dec 100644
--- a/tests/coverage/pos/Enum.scoverage.check
+++ b/tests/coverage/pos/Enum.scoverage.check
@@ -72,9 +72,9 @@ def surfaceWeight
 3
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1043
 1077
@@ -89,9 +89,9 @@ println("Example 1: \\n"+emptyList)
 4
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1051
 1076
@@ -106,9 +106,9 @@ false
 5
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1082
 1103
@@ -123,9 +123,9 @@ println(s"${list}\\n")
 6
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1090
 1102
@@ -140,9 +140,9 @@ s"${list}\\n"
 7
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1195
 1222
@@ -157,9 +157,9 @@ Planet.Earth.surfaceGravity
 8
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1229
 1320
@@ -174,9 +174,9 @@ for p <- Planet.values do\n        println(s"Your weight on $p is ${p.surfaceWei
 9
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1238
 1251
@@ -191,9 +191,9 @@ Planet.values
 10
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1263
 1320
@@ -208,9 +208,9 @@ println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 11
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1271
 1319
@@ -225,9 +225,9 @@ s"Your weight on $p is ${p.surfaceWeight(mass)}"
 12
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1296
 1317
@@ -242,9 +242,9 @@ p.surfaceWeight(mass)
 13
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1109
 1142
@@ -259,9 +259,9 @@ def calculateEarthWeightOnPlanets
 14
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1326
 1347
@@ -276,9 +276,9 @@ println("Example 2:")
 15
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1352
 1385
@@ -293,9 +293,9 @@ calculateEarthWeightOnPlanets(80)
 16
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 901
 909
diff --git a/tests/coverage/pos/For.scoverage.check b/tests/coverage/pos/For.scoverage.check
index 10f65ff99c80..7370a3909c54 100644
--- a/tests/coverage/pos/For.scoverage.check
+++ b/tests/coverage/pos/For.scoverage.check
@@ -21,9 +21,9 @@
 0
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForLoop
 43
 77
@@ -38,9 +38,9 @@ for i <- 1 to 10 do\n    println(i)
 1
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForLoop
 52
 59
@@ -55,9 +55,9 @@ false
 2
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForLoop
 52
 53
@@ -72,9 +72,9 @@ false
 3
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 $anonfun
 67
 77
@@ -89,9 +89,9 @@ println(i)
 4
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForLoop
 17
 32
@@ -106,9 +106,9 @@ def testForLoop
 5
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 f
 109
 114
@@ -123,9 +123,9 @@ def f
 6
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForAdvanced
 141
 183
@@ -140,9 +140,9 @@ for j <- 1 to 10 if f(j) do\n    println(j)
 7
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForAdvanced
 145
 165
@@ -157,9 +157,9 @@ j <- 1 to 10 if f(j)
 8
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForAdvanced
 150
 157
@@ -174,9 +174,9 @@ false
 9
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForAdvanced
 150
 151
@@ -191,9 +191,9 @@ false
 10
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 $anonfun
 161
 165
@@ -208,9 +208,9 @@ f(j)
 11
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 $anonfun
 173
 183
@@ -225,9 +225,9 @@ println(j)
 12
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForAdvanced
 79
 98
@@ -242,9 +242,9 @@ def testForAdvanced
 13
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForeach
 301
 344
@@ -259,9 +259,9 @@ Nil.foreach(_ => println("user code here"))
 14
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForeach
 301
 304
@@ -276,9 +276,9 @@ Nil
 15
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 $anonfun
 318
 343
@@ -293,9 +293,9 @@ println("user code here")
 16
 For.scala
 covtest
-For$package$
+For$package
 Object
-covtest.For$package$
+covtest.For$package
 testForeach
 185
 200
diff --git a/tests/coverage/pos/Inlined.scoverage.check b/tests/coverage/pos/Inlined.scoverage.check
index 392c52141687..53008bd727c5 100644
--- a/tests/coverage/pos/Inlined.scoverage.check
+++ b/tests/coverage/pos/Inlined.scoverage.check
@@ -21,9 +21,9 @@
 0
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -38,9 +38,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 1
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -55,9 +55,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 2
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 330
 330
@@ -72,9 +72,9 @@ false
 3
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 155
 162
@@ -89,9 +89,9 @@ List(l)
 4
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 155
 159
@@ -106,9 +106,9 @@ List
 5
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 155
 169
@@ -123,9 +123,9 @@ List(l).length
 6
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -140,9 +140,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 7
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -157,9 +157,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 8
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 330
 330
@@ -174,9 +174,9 @@ false
 9
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 180
 187
@@ -191,9 +191,9 @@ List(l)
 10
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 180
 184
@@ -208,9 +208,9 @@ List
 11
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 180
 194
@@ -225,9 +225,9 @@ List(l).length
 12
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -242,9 +242,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 13
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 288
 330
@@ -259,9 +259,9 @@ scala.runtime.Scala3RunTime.assertFailed()
 14
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 330
 330
@@ -276,9 +276,9 @@ false
 15
 Inlined.scala
 covtest
-Inlined$package$
+Inlined$package
 Object
-covtest.Inlined$package$
+covtest.Inlined$package
 testInlined
 86
 101
diff --git a/tests/coverage/pos/InlinedFromLib.scoverage.check b/tests/coverage/pos/InlinedFromLib.scoverage.check
index 534ee4288dd0..005ce981aa1a 100644
--- a/tests/coverage/pos/InlinedFromLib.scoverage.check
+++ b/tests/coverage/pos/InlinedFromLib.scoverage.check
@@ -21,9 +21,9 @@
 0
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 169
 183
@@ -38,9 +38,9 @@ assert(l == 1)
 1
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 169
 183
@@ -55,9 +55,9 @@ assert(l == 1)
 2
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 169
 183
@@ -72,9 +72,9 @@ assert(l == 1)
 3
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 198
 205
@@ -89,9 +89,9 @@ List(l)
 4
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 198
 202
@@ -106,9 +106,9 @@ List
 5
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 198
 212
@@ -123,9 +123,9 @@ List(l).length
 6
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 186
 213
@@ -140,9 +140,9 @@ assert(l == List(l).length)
 7
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 186
 213
@@ -157,9 +157,9 @@ assert(l == List(l).length)
 8
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 186
 213
@@ -174,9 +174,9 @@ assert(l == List(l).length)
 9
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 223
 230
@@ -191,9 +191,9 @@ List(l)
 10
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 223
 227
@@ -208,9 +208,9 @@ List
 11
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 223
 237
@@ -225,9 +225,9 @@ List(l).length
 12
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 216
 243
@@ -242,9 +242,9 @@ assert(List(l).length == 1)
 13
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 216
 243
@@ -259,9 +259,9 @@ assert(List(l).length == 1)
 14
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 216
 243
@@ -276,9 +276,9 @@ assert(List(l).length == 1)
 15
 InlinedFromLib.scala
 covtest
-InlinedFromLib$package$
+InlinedFromLib$package
 Object
-covtest.InlinedFromLib$package$
+covtest.InlinedFromLib$package
 testInlined
 129
 144
diff --git a/tests/coverage/pos/Literals.scoverage.check b/tests/coverage/pos/Literals.scoverage.check
index f23c481c1145..cd58a841d5b6 100644
--- a/tests/coverage/pos/Literals.scoverage.check
+++ b/tests/coverage/pos/Literals.scoverage.check
@@ -21,9 +21,9 @@
 0
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 block
 31
 50
@@ -38,9 +38,9 @@ println("not this")
 1
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 block
 17
 26
@@ -55,9 +55,9 @@ def block
 2
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 f
 177
 180
@@ -72,9 +72,9 @@ false
 3
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 f
 137
 142
@@ -89,9 +89,9 @@ def f
 4
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 main
 201
 212
@@ -106,9 +106,9 @@ f(0,1,2)(3)
 5
 Literals.scala
 covtest
-Literals$package$
+Literals$package
 Object
-covtest.Literals$package$
+covtest.Literals$package
 main
 182
 190
diff --git a/tests/coverage/pos/MatchCaseClasses.scoverage.check b/tests/coverage/pos/MatchCaseClasses.scoverage.check
index 0911532b1977..16574b6c770e 100644
--- a/tests/coverage/pos/MatchCaseClasses.scoverage.check
+++ b/tests/coverage/pos/MatchCaseClasses.scoverage.check
@@ -21,9 +21,9 @@
 0
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 151
 163
@@ -38,9 +38,9 @@ println("a")
 1
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 148
 163
@@ -55,9 +55,9 @@ false
 2
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 184
 196
@@ -72,9 +72,9 @@ println("b")
 3
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 181
 196
@@ -89,9 +89,9 @@ false
 4
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 225
 237
@@ -106,9 +106,9 @@ println("c")
 5
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 222
 237
@@ -123,9 +123,9 @@ false
 6
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 275
 285
@@ -140,9 +140,9 @@ println(y)
 7
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 292
 304
@@ -157,9 +157,9 @@ println("d")
 8
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 275
 304
@@ -174,9 +174,9 @@ println(y)\n      println("d")
 9
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 325
 337
@@ -191,9 +191,9 @@ println("e")
 10
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 322
 337
@@ -208,9 +208,9 @@ false
 11
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 352
 368
@@ -225,9 +225,9 @@ println("other")
 12
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 349
 368
@@ -242,9 +242,9 @@ false
 13
 MatchCaseClasses.scala
 covtest
-MatchCaseClasses$
+MatchCaseClasses
 Object
-covtest.MatchCaseClasses$
+covtest.MatchCaseClasses
 f
 101
 106
diff --git a/tests/coverage/pos/MatchNumbers.scoverage.check b/tests/coverage/pos/MatchNumbers.scoverage.check
index ccb8a627f46e..43e01018f0ac 100644
--- a/tests/coverage/pos/MatchNumbers.scoverage.check
+++ b/tests/coverage/pos/MatchNumbers.scoverage.check
@@ -21,9 +21,9 @@
 0
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 f
 127
 132
@@ -38,9 +38,9 @@ false
 1
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 f
 149
 153
@@ -55,9 +55,9 @@ false
 2
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 f
 171
 181
@@ -72,9 +72,9 @@ false
 3
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 f
 69
 74
@@ -89,9 +89,9 @@ def f
 4
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 <init>
 185
 189
@@ -106,9 +106,9 @@ f(0)
 5
 MatchNumbers.scala
 covtest
-MatchNumbers$
+MatchNumbers
 Object
-covtest.MatchNumbers$
+covtest.MatchNumbers
 <init>
 192
 197
diff --git a/tests/coverage/pos/PolymorphicExtensions.scoverage.check b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
index 33be52244cdf..64795070b34f 100644
--- a/tests/coverage/pos/PolymorphicExtensions.scoverage.check
+++ b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
@@ -21,9 +21,9 @@
 0
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 foo
 61
 68
@@ -38,9 +38,9 @@ def foo
 1
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 get
 114
 121
@@ -55,9 +55,9 @@ def get
 2
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 tap
 170
 173
@@ -72,9 +72,9 @@ false
 3
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 tap
 139
 146
@@ -89,9 +89,9 @@ def tap
 4
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 <init>
 177
 189
@@ -106,9 +106,9 @@ false
 5
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 <init>
 177
 186
@@ -123,9 +123,9 @@ false
 6
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 <init>
 277
 287
@@ -140,9 +140,9 @@ false
 7
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 foo
 370
 377
@@ -157,9 +157,9 @@ def foo
 8
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 bar
 405
 421
@@ -174,9 +174,9 @@ foo.tap(println)
 9
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 bar
 405
 412
@@ -191,9 +191,9 @@ foo.tap
 10
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 bar
 405
 408
@@ -208,9 +208,9 @@ foo
 11
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 $anonfun
 413
 420
@@ -225,9 +225,9 @@ println
 12
 PolymorphicExtensions.scala
 covtest
-PolyExt$
+PolyExt
 Object
-covtest.PolyExt$
+covtest.PolyExt
 bar
 390
 397
diff --git a/tests/coverage/pos/PolymorphicMethods.scoverage.check b/tests/coverage/pos/PolymorphicMethods.scoverage.check
index ae6413869f06..b66aaeb92661 100644
--- a/tests/coverage/pos/PolymorphicMethods.scoverage.check
+++ b/tests/coverage/pos/PolymorphicMethods.scoverage.check
@@ -21,9 +21,9 @@
 0
 PolymorphicMethods.scala
 covtest
-PolyMeth$
+PolyMeth
 Object
-covtest.PolyMeth$
+covtest.PolyMeth
 f
 36
 41
@@ -38,9 +38,9 @@ def f
 1
 PolymorphicMethods.scala
 covtest
-PolyMeth$
+PolyMeth
 Object
-covtest.PolyMeth$
+covtest.PolyMeth
 <init>
 60
 69
@@ -55,9 +55,9 @@ this.f(0)
 2
 PolymorphicMethods.scala
 covtest
-PolyMeth$
+PolyMeth
 Object
-covtest.PolyMeth$
+covtest.PolyMeth
 <init>
 147
 170
@@ -72,9 +72,9 @@ C[String]().f("str", 0)
 3
 PolymorphicMethods.scala
 covtest
-PolyMeth$
+PolyMeth
 Object
-covtest.PolyMeth$
+covtest.PolyMeth
 <init>
 147
 158
diff --git a/tests/coverage/pos/Select.scoverage.check b/tests/coverage/pos/Select.scoverage.check
index 5300716cae90..cfe719552e44 100644
--- a/tests/coverage/pos/Select.scoverage.check
+++ b/tests/coverage/pos/Select.scoverage.check
@@ -140,9 +140,9 @@ override def print
 7
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 237
 240
@@ -157,9 +157,9 @@ A()
 8
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 254
 259
@@ -174,9 +174,9 @@ new A
 9
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 263
 281
@@ -191,9 +191,9 @@ a.instance.print()
 10
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 263
 273
@@ -208,9 +208,9 @@ a.instance
 11
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 345
 354
@@ -225,9 +225,9 @@ a.print()
 12
 Select.scala
 covtest
-Select$package$
+Select$package
 Object
-covtest.Select$package$
+covtest.Select$package
 test
 208
 216
diff --git a/tests/coverage/pos/StructuralTypes.scoverage.check b/tests/coverage/pos/StructuralTypes.scoverage.check
index 8653b1a68235..91bb60f9f293 100644
--- a/tests/coverage/pos/StructuralTypes.scoverage.check
+++ b/tests/coverage/pos/StructuralTypes.scoverage.check
@@ -106,9 +106,9 @@ def selectDynamic
 5
 StructuralTypes.scala
 covtest
-StructuralTypes$
+StructuralTypes
 Object
-covtest.StructuralTypes$
+covtest.StructuralTypes
 test
 277
 293
@@ -123,9 +123,9 @@ false
 6
 StructuralTypes.scala
 covtest
-StructuralTypes$
+StructuralTypes
 Object
-covtest.StructuralTypes$
+covtest.StructuralTypes
 test
 295
 306
@@ -140,9 +140,9 @@ false
 7
 StructuralTypes.scala
 covtest
-StructuralTypes$
+StructuralTypes
 Object
-covtest.StructuralTypes$
+covtest.StructuralTypes
 test
 333
 344
@@ -157,9 +157,9 @@ person.name
 8
 StructuralTypes.scala
 covtest
-StructuralTypes$
+StructuralTypes
 Object
-covtest.StructuralTypes$
+covtest.StructuralTypes
 test
 234
 242
diff --git a/tests/coverage/pos/TypeLambdas.scoverage.check b/tests/coverage/pos/TypeLambdas.scoverage.check
index a5a18baf6096..46c84036a2ff 100644
--- a/tests/coverage/pos/TypeLambdas.scoverage.check
+++ b/tests/coverage/pos/TypeLambdas.scoverage.check
@@ -21,9 +21,9 @@
 0
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 306
 319
@@ -38,9 +38,9 @@ Map(1 -> "1")
 1
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 306
 309
@@ -55,9 +55,9 @@ Map
 2
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 310
 318
@@ -72,9 +72,9 @@ false
 3
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 324
 334
@@ -89,9 +89,9 @@ println(m)
 4
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 382
 396
@@ -106,9 +106,9 @@ println(tuple)
 5
 TypeLambdas.scala
 covtest
-TypeLambdas$
+TypeLambdas
 Object
-covtest.TypeLambdas$
+covtest.TypeLambdas
 test
 259
 267
diff --git a/tests/coverage/pos/i16502.scoverage.check b/tests/coverage/pos/i16502.scoverage.check
index 4bc50c0f91c3..127c68063f73 100644
--- a/tests/coverage/pos/i16502.scoverage.check
+++ b/tests/coverage/pos/i16502.scoverage.check
@@ -21,9 +21,9 @@
 0
 i16502.scala
 <empty>
-i16502$package$
+i16502$package
 Object
-<empty>.i16502$package$
+<empty>.i16502$package
 $anonfun
 76
 85
@@ -38,9 +38,9 @@ Future(1)
 1
 i16502.scala
 <empty>
-i16502$package$
+i16502$package
 Object
-<empty>.i16502$package$
+<empty>.i16502$package
 asyncSum
 27
 39
@@ -55,9 +55,9 @@ def asyncSum
 2
 i16502.scala
 <empty>
-i16502$package$
+i16502$package
 Object
-<empty>.i16502$package$
+<empty>.i16502$package
 Test
 174
 182
@@ -72,9 +72,9 @@ asyncSum
 3
 i16502.scala
 <empty>
-i16502$package$
+i16502$package
 Object
-<empty>.i16502$package$
+<empty>.i16502$package
 Test
 87
 101
diff --git a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
index d44faf848942..f9bb9e0cd6a3 100644
--- a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
+++ b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
@@ -191,9 +191,9 @@ def !
 10
 scoverage-samples-implicit-class.scala
 org.scoverage.samples
-scoverage-samples-implicit-class$package$
+scoverage-samples-implicit-class$package
 Object
-org.scoverage.samples.scoverage-samples-implicit-class$package$
+org.scoverage.samples.scoverage-samples-implicit-class$package
 StringOpssssss
 79
 108
diff --git a/tests/coverage/run/currying/test.scoverage.check b/tests/coverage/run/currying/test.scoverage.check
index 183e42fba2d5..abc1876942db 100644
--- a/tests/coverage/run/currying/test.scoverage.check
+++ b/tests/coverage/run/currying/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 f1
 15
 21
@@ -38,9 +38,9 @@ def f1
 1
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 f2
 56
 62
@@ -55,9 +55,9 @@ def f2
 2
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 g1
 114
 120
@@ -72,9 +72,9 @@ def g1
 3
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 g2
 175
 181
@@ -89,9 +89,9 @@ def g2
 4
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 277
 297
@@ -106,9 +106,9 @@ println(f1(0)(1)(2))
 5
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 285
 296
@@ -123,9 +123,9 @@ f1(0)(1)(2)
 6
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 302
 322
@@ -140,9 +140,9 @@ println(f2(0)(1)(2))
 7
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 310
 321
@@ -157,9 +157,9 @@ f2(0)(1)(2)
 8
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 310
 318
@@ -174,9 +174,9 @@ f2(0)(1)
 9
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 310
 315
@@ -191,9 +191,9 @@ f2(0)
 10
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 310
 312
@@ -208,9 +208,9 @@ f2
 11
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 327
 365
@@ -225,9 +225,9 @@ println(g1(using 0)(using 1)(using 2))
 12
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 335
 364
@@ -242,9 +242,9 @@ g1(using 0)(using 1)(using 2)
 13
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 370
 408
@@ -259,9 +259,9 @@ println(g2(using 0)(using 1)(using 2))
 14
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 378
 407
@@ -276,9 +276,9 @@ g2(using 0)(using 1)(using 2)
 15
 currying/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 235
 243
diff --git a/tests/coverage/run/erased/test.scoverage.check b/tests/coverage/run/erased/test.scoverage.check
index 979d88ecd78f..dedf5689c490 100644
--- a/tests/coverage/run/erased/test.scoverage.check
+++ b/tests/coverage/run/erased/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 foo
 181
 203
@@ -38,9 +38,9 @@ println(s"foo(a)($b)")
 1
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 foo
 189
 202
@@ -55,9 +55,9 @@ s"foo(a)($b)"
 2
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 foo
 132
 139
@@ -72,9 +72,9 @@ def foo
 3
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 identity
 245
 269
@@ -89,9 +89,9 @@ println(s"identity($s)")
 4
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 identity
 253
 268
@@ -106,9 +106,9 @@ s"identity($s)"
 5
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 identity
 209
 221
@@ -123,9 +123,9 @@ def identity
 6
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 300
 323
@@ -140,9 +140,9 @@ foo(parameterless)("b")
 7
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 326
 342
@@ -157,9 +157,9 @@ foo(e("a"))("b")
 8
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 345
 374
@@ -174,9 +174,9 @@ foo(e("a"))(identity("idem"))
 9
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 357
 373
@@ -191,9 +191,9 @@ identity("idem")
 10
 erased/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 275
 289
diff --git a/tests/coverage/run/extend-case-class/test.scoverage.check b/tests/coverage/run/extend-case-class/test.scoverage.check
index 891f4ac198ca..b355140d2520 100644
--- a/tests/coverage/run/extend-case-class/test.scoverage.check
+++ b/tests/coverage/run/extend-case-class/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 extend-case-class/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 282
 303
@@ -38,9 +38,9 @@ println(c.scaleLimit)
 1
 extend-case-class/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 306
 337
@@ -55,9 +55,9 @@ println(DecimalConf.scaleLimit)
 2
 extend-case-class/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 206
 220
diff --git a/tests/coverage/run/i16940/i16940.scoverage.check b/tests/coverage/run/i16940/i16940.scoverage.check
index 90832b08783d..9354a4e67b29 100644
--- a/tests/coverage/run/i16940/i16940.scoverage.check
+++ b/tests/coverage/run/i16940/i16940.scoverage.check
@@ -21,9 +21,9 @@
 0
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 353
 552
@@ -38,9 +38,9 @@ Await.result(\n    Future.sequence(Seq(brokenSynchronizedBlock(false), brokenSyn
 1
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 371
 533
@@ -55,9 +55,9 @@ Future.sequence(Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true
 2
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 371
 454
@@ -72,9 +72,9 @@ Future.sequence(Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true
 3
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 387
 453
@@ -89,9 +89,9 @@ Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true))
 4
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 387
 390
@@ -106,9 +106,9 @@ Seq
 5
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 391
 421
@@ -123,9 +123,9 @@ brokenSynchronizedBlock(false)
 6
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 423
 452
@@ -140,9 +140,9 @@ brokenSynchronizedBlock(true)
 7
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 486
 499
@@ -157,9 +157,9 @@ println(test)
 8
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 508
 525
@@ -174,9 +174,9 @@ assert(test == 2)
 9
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 508
 525
@@ -191,9 +191,9 @@ assert(test == 2)
 10
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 508
 525
@@ -208,9 +208,9 @@ assert(test == 2)
 11
 i16940/i16940.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 539
 548
@@ -225,9 +225,9 @@ false
 12
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 189
 323
@@ -242,9 +242,9 @@ Future {\n  if (option) {\n    Thread.sleep(500)\n  }\n  synchronized {\n    val
 13
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 218
 235
@@ -259,9 +259,9 @@ Thread.sleep(500)
 14
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 212
 239
@@ -276,9 +276,9 @@ false
 15
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 239
 239
@@ -293,9 +293,9 @@ false
 16
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 242
 321
@@ -310,9 +310,9 @@ synchronized {\n    val tmp = test\n    Thread.sleep(1000)\n    test = tmp + 1\n
 17
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 280
 298
@@ -327,9 +327,9 @@ Thread.sleep(1000)
 18
 i16940/i16940.scala
 <empty>
-i16940$package$
+i16940$package
 Object
-<empty>.i16940$package$
+<empty>.i16940$package
 brokenSynchronizedBlock
 128
 155
diff --git a/tests/coverage/run/i18233-min/i18233-min.scoverage.check b/tests/coverage/run/i18233-min/i18233-min.scoverage.check
index 53f838f8fa0f..108887701017 100644
--- a/tests/coverage/run/i18233-min/i18233-min.scoverage.check
+++ b/tests/coverage/run/i18233-min/i18233-min.scoverage.check
@@ -21,9 +21,9 @@
 0
 i18233-min/i18233-min.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 131
 145
@@ -38,9 +38,9 @@ println(aList)
 1
 i18233-min/i18233-min.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 139
 144
@@ -55,9 +55,9 @@ aList
 2
 i18233-min/i18233-min.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 148
 168
@@ -72,9 +72,9 @@ println(anotherList)
 3
 i18233-min/i18233-min.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 156
 167
@@ -89,9 +89,9 @@ anotherList
 4
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 aList
 14
 36
@@ -106,9 +106,9 @@ List(Array[String]()*)
 5
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 aList
 14
 18
@@ -123,9 +123,9 @@ List
 6
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 aList
 19
 34
@@ -140,9 +140,9 @@ Array[String]()
 7
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 aList
 0
 9
@@ -157,9 +157,9 @@ def aList
 8
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 arr
 50
 69
@@ -174,9 +174,9 @@ Array("abc", "def")
 9
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 arr
 38
 45
@@ -191,9 +191,9 @@ def arr
 10
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 anotherList
 91
 101
@@ -208,9 +208,9 @@ List(arr*)
 11
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 anotherList
 91
 95
@@ -225,9 +225,9 @@ List
 12
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 anotherList
 96
 99
@@ -242,9 +242,9 @@ arr
 13
 i18233-min/i18233-min.scala
 <empty>
-i18233-min$package$
+i18233-min$package
 Object
-<empty>.i18233-min$package$
+<empty>.i18233-min$package
 anotherList
 71
 86
diff --git a/tests/coverage/run/i18233/i18233.scoverage.check b/tests/coverage/run/i18233/i18233.scoverage.check
index f7d8f3813183..97e16be7839f 100644
--- a/tests/coverage/run/i18233/i18233.scoverage.check
+++ b/tests/coverage/run/i18233/i18233.scoverage.check
@@ -21,9 +21,9 @@
 0
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 54
 72
@@ -38,9 +38,9 @@ List(values.tail*)
 1
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 54
 58
@@ -55,9 +55,9 @@ List
 2
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 59
 65
@@ -72,9 +72,9 @@ values
 3
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 59
 70
@@ -89,9 +89,9 @@ values.tail
 4
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 54
 81
@@ -106,9 +106,9 @@ List(values.tail*).mkString
 5
 i18233/i18233.scala
 <empty>
-Foo$
+Foo
 Object
-<empty>.Foo$
+<empty>.Foo
 render
 41
 51
@@ -123,9 +123,9 @@ def render
 6
 i18233/i18233.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 111
 130
@@ -140,9 +140,9 @@ println(Foo.render)
 7
 i18233/i18233.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 <init>
 119
 129
diff --git a/tests/coverage/run/inheritance/test.scoverage.check b/tests/coverage/run/inheritance/test.scoverage.check
index d4ca12879ea3..387a080463e2 100644
--- a/tests/coverage/run/inheritance/test.scoverage.check
+++ b/tests/coverage/run/inheritance/test.scoverage.check
@@ -55,9 +55,9 @@ A(2,2)
 2
 inheritance/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 161
 176
@@ -72,9 +72,9 @@ println(C1().x)
 3
 inheritance/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 169
 173
@@ -89,9 +89,9 @@ C1()
 4
 inheritance/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 211
 226
@@ -106,9 +106,9 @@ println(C2().x)
 5
 inheritance/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 219
 223
@@ -123,9 +123,9 @@ C2()
 6
 inheritance/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 136
 150
diff --git a/tests/coverage/run/inline-def/test.scoverage.check b/tests/coverage/run/inline-def/test.scoverage.check
index f8a852707146..17fa7c049107 100644
--- a/tests/coverage/run/inline-def/test.scoverage.check
+++ b/tests/coverage/run/inline-def/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 225
 228
@@ -38,9 +38,9 @@ A()
 1
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 231
 243
@@ -55,9 +55,9 @@ println(a.x)
 2
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 246
 260
@@ -72,9 +72,9 @@ println(a.foo)
 3
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 134
 148
@@ -89,9 +89,9 @@ false
 4
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 263
 277
@@ -106,9 +106,9 @@ println(a.bar)
 5
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 176
 190
@@ -123,9 +123,9 @@ false
 6
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 295
 309
@@ -140,9 +140,9 @@ println(b.foo)
 7
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 303
 308
@@ -157,9 +157,9 @@ b.foo
 8
 inline-def/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 192
 206
diff --git a/tests/coverage/run/interpolation/test.scoverage.check b/tests/coverage/run/interpolation/test.scoverage.check
index 6613f859ac36..92877b704324 100644
--- a/tests/coverage/run/interpolation/test.scoverage.check
+++ b/tests/coverage/run/interpolation/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 simple
 60
 78
@@ -38,9 +38,9 @@ s"$a, ${b.length}"
 1
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 simple
 68
 76
@@ -55,9 +55,9 @@ b.length
 2
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 simple
 16
 26
@@ -72,9 +72,9 @@ def simple
 3
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 hexa
 113
 126
@@ -89,9 +89,9 @@ f"0x${i}%04x"
 4
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 hexa
 82
 90
@@ -106,9 +106,9 @@ def hexa
 5
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 195
 224
@@ -123,9 +123,9 @@ List("d", "o", "t", "t", "y")
 6
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 195
 199
@@ -140,9 +140,9 @@ List
 7
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 229
 278
@@ -157,9 +157,9 @@ xs.zipWithIndex.map((s, i) => println(s"$i: $s"))
 8
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 229
 244
@@ -174,9 +174,9 @@ xs.zipWithIndex
 9
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 259
 277
@@ -191,9 +191,9 @@ println(s"$i: $s")
 10
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 $anonfun
 267
 276
@@ -208,9 +208,9 @@ s"$i: $s"
 11
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 284
 309
@@ -225,9 +225,9 @@ println(simple(1, "abc"))
 12
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 292
 308
@@ -242,9 +242,9 @@ simple(1, "abc")
 13
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 314
 332
@@ -259,9 +259,9 @@ println(hexa(127))
 14
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 322
 331
@@ -276,9 +276,9 @@ hexa(127)
 15
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 337
 355
@@ -293,9 +293,9 @@ println(raw"a\\nb")
 16
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 345
 354
@@ -310,9 +310,9 @@ raw"a\\nb"
 17
 interpolation/test.scala
 <empty>
-Test$
+Test
 Object
-<empty>.Test$
+<empty>.Test
 main
 130
 138
diff --git a/tests/coverage/run/java-methods/test.scoverage.check b/tests/coverage/run/java-methods/test.scoverage.check
index e39efe8f3aa8..891af1804831 100644
--- a/tests/coverage/run/java-methods/test.scoverage.check
+++ b/tests/coverage/run/java-methods/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 61
 83
@@ -38,9 +38,9 @@ StaticMethods.simple()
 1
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 86
 127
@@ -55,9 +55,9 @@ StaticMethods.withTypeParam[Any](a => ())
 2
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 140
 152
@@ -72,9 +72,9 @@ JavaObject()
 3
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 155
 162
@@ -89,9 +89,9 @@ obj.f()
 4
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 165
 194
@@ -106,9 +106,9 @@ println(obj.identity[Int](0))
 5
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 173
 193
@@ -123,9 +123,9 @@ obj.identity[Int](0)
 6
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 197
 211
@@ -140,9 +140,9 @@ println("ok!")
 7
 java-methods/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 36
 50
diff --git a/tests/coverage/run/lifting-bool/test.scoverage.check b/tests/coverage/run/lifting-bool/test.scoverage.check
index 80d0bfad9c59..5eb3d864939f 100644
--- a/tests/coverage/run/lifting-bool/test.scoverage.check
+++ b/tests/coverage/run/lifting-bool/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 notCalled
 19
 22
@@ -38,9 +38,9 @@ false
 1
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 notCalled
 1
 14
@@ -55,9 +55,9 @@ def notCalled
 2
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 f
 24
 29
@@ -72,9 +72,9 @@ def f
 3
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 109
 120
@@ -89,9 +89,9 @@ notCalled()
 4
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 159
 170
@@ -106,9 +106,9 @@ notCalled()
 5
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 219
 230
@@ -123,9 +123,9 @@ notCalled()
 6
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 267
 278
@@ -140,9 +140,9 @@ notCalled()
 7
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 318
 329
@@ -157,9 +157,9 @@ notCalled()
 8
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 341
 367
@@ -174,9 +174,9 @@ println(s"$a $b $c $d $e")
 9
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 349
 366
@@ -191,9 +191,9 @@ s"$a $b $c $d $e"
 10
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 379
 393
@@ -208,9 +208,9 @@ f(true, false)
 11
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 396
 406
@@ -225,9 +225,9 @@ println(x)
 12
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 422
 466
@@ -242,9 +242,9 @@ f(true || notCalled(), false && notCalled())
 13
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 432
 443
@@ -259,9 +259,9 @@ notCalled()
 14
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 454
 465
@@ -276,9 +276,9 @@ notCalled()
 15
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 469
 479
@@ -293,9 +293,9 @@ println(x)
 16
 lifting-bool/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 68
 82
diff --git a/tests/coverage/run/lifting/test.scoverage.check b/tests/coverage/run/lifting/test.scoverage.check
index a6eb2954a64c..206fc7dfadda 100644
--- a/tests/coverage/run/lifting/test.scoverage.check
+++ b/tests/coverage/run/lifting/test.scoverage.check
@@ -242,9 +242,9 @@ def ex
 13
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 221
 224
@@ -259,9 +259,9 @@ A()
 14
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 f
 241
 246
@@ -276,9 +276,9 @@ def f
 15
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 264
 286
@@ -293,9 +293,9 @@ a.msg(i, 0, a.integer)
 16
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 276
 285
@@ -310,9 +310,9 @@ a.integer
 17
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 289
 299
@@ -327,9 +327,9 @@ println(x)
 18
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 306
 334
@@ -344,9 +344,9 @@ a.ex.msg(i, 0, a.ex.integer)
 19
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 306
 310
@@ -361,9 +361,9 @@ a.ex
 20
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 321
 325
@@ -378,9 +378,9 @@ a.ex
 21
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 321
 333
@@ -395,9 +395,9 @@ a.ex.integer
 22
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 337
 347
@@ -412,9 +412,9 @@ println(x)
 23
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 354
 370
@@ -429,9 +429,9 @@ a.msg(f(), 0, i)
 24
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 360
 363
@@ -446,9 +446,9 @@ f()
 25
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 373
 383
@@ -463,9 +463,9 @@ println(x)
 26
 lifting/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 188
 202
diff --git a/tests/coverage/run/parameterless/test.scoverage.check b/tests/coverage/run/parameterless/test.scoverage.check
index 6f15f3a5e93f..5050180e7886 100644
--- a/tests/coverage/run/parameterless/test.scoverage.check
+++ b/tests/coverage/run/parameterless/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 parameterless/test.scala
 <empty>
-O$
+O
 Object
-<empty>.O$
+<empty>.O
 f
 32
 46
@@ -38,9 +38,9 @@ println("O.f")
 1
 parameterless/test.scala
 <empty>
-O$
+O
 Object
-<empty>.O$
+<empty>.O
 f
 12
 17
@@ -55,9 +55,9 @@ def f
 2
 parameterless/test.scala
 <empty>
-O$
+O
 Object
-<empty>.O$
+<empty>.O
 g
 87
 101
@@ -72,9 +72,9 @@ println("O.g")
 3
 parameterless/test.scala
 <empty>
-O$
+O
 Object
-<empty>.O$
+<empty>.O
 g
 64
 69
@@ -89,9 +89,9 @@ def g
 4
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 f
 162
 174
@@ -106,9 +106,9 @@ println("f")
 5
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 f
 142
 147
@@ -123,9 +123,9 @@ def f
 6
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 g
 213
 225
@@ -140,9 +140,9 @@ println("g")
 7
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 g
 190
 195
@@ -157,9 +157,9 @@ def g
 8
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 249
 250
@@ -174,9 +174,9 @@ f
 9
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 261
 262
@@ -191,9 +191,9 @@ g
 10
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 265
 275
@@ -208,9 +208,9 @@ println(f)
 11
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 273
 274
@@ -225,9 +225,9 @@ f
 12
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 278
 288
@@ -242,9 +242,9 @@ println(g)
 13
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 286
 287
@@ -259,9 +259,9 @@ g
 14
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 291
 303
@@ -276,9 +276,9 @@ println(O.f)
 15
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 299
 302
@@ -293,9 +293,9 @@ O.f
 16
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 306
 318
@@ -310,9 +310,9 @@ println(O.g)
 17
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 314
 317
@@ -327,9 +327,9 @@ O.g
 18
 parameterless/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 117
 131
diff --git a/tests/coverage/run/trait/test.scoverage.check b/tests/coverage/run/trait/test.scoverage.check
index c5b6123e7e2b..19a88ebc7f6f 100644
--- a/tests/coverage/run/trait/test.scoverage.check
+++ b/tests/coverage/run/trait/test.scoverage.check
@@ -55,9 +55,9 @@ Impl2()
 2
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 170
 188
@@ -72,9 +72,9 @@ println(Impl1().x)
 3
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 178
 185
@@ -89,9 +89,9 @@ Impl1()
 4
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 178
 187
@@ -106,9 +106,9 @@ Impl1().x
 5
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 196
 214
@@ -123,9 +123,9 @@ println(Impl2().p)
 6
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 204
 211
@@ -140,9 +140,9 @@ Impl2()
 7
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 225
 243
@@ -157,9 +157,9 @@ println(Impl3().p)
 8
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 233
 240
@@ -174,9 +174,9 @@ Impl3()
 9
 trait/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 145
 159
diff --git a/tests/coverage/run/type-apply/test.scoverage.check b/tests/coverage/run/type-apply/test.scoverage.check
index 514e2b1bd0e9..3ad1944563a3 100644
--- a/tests/coverage/run/type-apply/test.scoverage.check
+++ b/tests/coverage/run/type-apply/test.scoverage.check
@@ -21,9 +21,9 @@
 0
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 163
 201
@@ -38,9 +38,9 @@ println(List(1,2,3).map(a => List(a)))
 1
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 171
 200
@@ -55,9 +55,9 @@ List(1,2,3).map(a => List(a))
 2
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 171
 182
@@ -72,9 +72,9 @@ List(1,2,3)
 3
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 171
 175
@@ -89,9 +89,9 @@ List
 4
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 $anonfun
 192
 199
@@ -106,9 +106,9 @@ List(a)
 5
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 $anonfun
 192
 196
@@ -123,9 +123,9 @@ List
 6
 type-apply/test.scala
 <empty>
-test$package$
+test$package
 Object
-<empty>.test$package$
+<empty>.test$package
 Test
 0
 14
diff --git a/tests/coverage/run/varargs/test_1.scoverage.check b/tests/coverage/run/varargs/test_1.scoverage.check
index 5b287586a540..3c31f9388409 100644
--- a/tests/coverage/run/varargs/test_1.scoverage.check
+++ b/tests/coverage/run/varargs/test_1.scoverage.check
@@ -21,9 +21,9 @@
 0
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 repeated
 48
 60
@@ -38,9 +38,9 @@ def repeated
 1
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 f
 79
 84
@@ -55,9 +55,9 @@ def f
 2
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 120
 130
@@ -72,9 +72,9 @@ repeated()
 3
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 133
 153
@@ -89,9 +89,9 @@ repeated(f(""), "b")
 4
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 142
 147
@@ -106,9 +106,9 @@ f("")
 5
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 156
 178
@@ -123,9 +123,9 @@ JavaVarargs_1.method()
 6
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 181
 205
@@ -140,9 +140,9 @@ JavaVarargs_1.method("")
 7
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 217
 248
@@ -157,9 +157,9 @@ JavaVarargs_1.multiple("first")
 8
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 251
 261
@@ -174,9 +174,9 @@ println(m)
 9
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 268
 302
@@ -191,9 +191,9 @@ JavaVarargs_1.multiple(f("first"))
 10
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 291
 301
@@ -208,9 +208,9 @@ f("first")
 11
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 305
 315
@@ -225,9 +225,9 @@ println(m)
 12
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 322
 371
@@ -242,9 +242,9 @@ JavaVarargs_1.multiple(f("first"), "a", "b", "c")
 13
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 345
 355
@@ -259,9 +259,9 @@ f("first")
 14
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 374
 384
@@ -276,9 +276,9 @@ println(m)
 15
 varargs/test_1.scala
 <empty>
-test_1$package$
+test_1$package
 Object
-<empty>.test_1$package$
+<empty>.test_1$package
 Test
 101
 115