907 files changed, 562 insertions, 480 deletions

diff --git a/test/disabled/pos/bug2919.scala b/test/disabled/pos/t2919.scala
index 5e51cf9de7..5e51cf9de7 100644
--- a/test/disabled/pos/bug2919.scala
+++ b/test/disabled/pos/t2919.scala
diff --git a/test/disabled/pos/bug531.scala b/test/disabled/pos/t531.scala
index 02763e08f1..02763e08f1 100644
--- a/test/disabled/pos/bug531.scala
+++ b/test/disabled/pos/t531.scala
diff --git a/test/disabled/pos/bug532.scala b/test/disabled/pos/t532.scala
index 32649b1629..32649b1629 100644
--- a/test/disabled/pos/bug532.scala
+++ b/test/disabled/pos/t532.scala
diff --git a/test/disabled/run/bug4279.scala b/test/disabled/run/t4279.scala
index d0afc3a032..d0afc3a032 100644
--- a/test/disabled/run/bug4279.scala
+++ b/test/disabled/run/t4279.scala
diff --git a/test/files/jvm/t2104.scala b/test/files/jvm/t2104.scala
index e672f02578..655d74cee5 100644
--- a/test/files/jvm/t2104.scala
+++ b/test/files/jvm/t2104.scala
@@ -28,7 +28,7 @@ object Test
     tp
   }
 
-  implicit val name="bug2104"
+  implicit val name="t2104"
   val chars=List('\n','\r','a')
 
   type Cs = List[Char]
diff --git a/test/files/jvm/bug560bis.check b/test/files/jvm/t560bis.check
index 91eb4c19a2..91eb4c19a2 100644
--- a/test/files/jvm/bug560bis.check
+++ b/test/files/jvm/t560bis.check
diff --git a/test/files/jvm/bug560bis.scala b/test/files/jvm/t560bis.scala
index 13bf4b1ae0..13bf4b1ae0 100644
--- a/test/files/jvm/bug560bis.scala
+++ b/test/files/jvm/t560bis.scala
diff --git a/test/files/jvm/bug676.check b/test/files/jvm/t676.check
index 5d1c9925f9..5d1c9925f9 100644
--- a/test/files/jvm/bug676.check
+++ b/test/files/jvm/t676.check
diff --git a/test/files/jvm/bug676.scala b/test/files/jvm/t676.scala
index bcd27e4e21..bcd27e4e21 100644
--- a/test/files/jvm/bug676.scala
+++ b/test/files/jvm/t676.scala
diff --git a/test/files/jvm/bug680.check b/test/files/jvm/t680.check
index e69de29bb2..e69de29bb2 100644
--- a/test/files/jvm/bug680.check
+++ b/test/files/jvm/t680.check
diff --git a/test/files/jvm/bug680.scala b/test/files/jvm/t680.scala
index b0b0c9f7c0..b0b0c9f7c0 100644
--- a/test/files/jvm/bug680.scala
+++ b/test/files/jvm/t680.scala
diff --git a/test/files/neg/bug1106.check b/test/files/neg/bug1106.check
deleted file mode 100644
index 3fa595abf1..0000000000
--- a/test/files/neg/bug1106.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug1106.scala:2: error: expected class or object definition
-val p = new Par[String]
-^
-bug1106.scala:5: error: expected class or object definition
-new Foo[p.type](p) // crashes compiler
-^
-two errors found
diff --git a/test/files/neg/bug1112.check b/test/files/neg/bug1112.check
deleted file mode 100644
index d94dba9448..0000000000
--- a/test/files/neg/bug1112.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1112.scala:12: error: too many arguments for method call: (p: Int)(f: => () => Unit)Unit
-    call(0,() => System.out.println("here we are"))
-        ^
-one error found
diff --git a/test/files/neg/bug1224.check b/test/files/neg/bug1224.check
deleted file mode 100644
index 515f823e50..0000000000
--- a/test/files/neg/bug1224.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1224.scala:4: error: illegal cyclic reference involving type T
- type T >: C[T] <: C[C[T]]
-      ^
-one error found
diff --git a/test/files/neg/bug1364.check b/test/files/neg/bug1364.check
deleted file mode 100644
index bb5ca90699..0000000000
--- a/test/files/neg/bug1364.check
+++ /dev/null
@@ -1,5 +0,0 @@
-bug1364.scala:9: error: overriding type T in trait A with bounds >: Nothing <: AnyRef{type S[-U]};
- type T has incompatible type
- type T = { type S[U] = U }
-      ^
-one error found
diff --git a/test/files/neg/bug1623.check b/test/files/neg/bug1623.check
deleted file mode 100644
index cfc2b533d4..0000000000
--- a/test/files/neg/bug1623.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1623.scala:11: error: class BImpl cannot be instantiated because it does not conform to its self-type test.BImpl with test.A
-  val b = new BImpl
-          ^
-one error found
diff --git a/test/files/neg/bug1838.check b/test/files/neg/bug1838.check
deleted file mode 100644
index 0c08bfe283..0000000000
--- a/test/files/neg/bug1838.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug1838.scala:6: error: `sealed' modifier can be used only for classes
-  sealed val v = 0
-             ^
-bug1838.scala:5: error: `sealed' modifier can be used only for classes
-  sealed def f = 0
-             ^
-two errors found
diff --git a/test/files/neg/bug1845.check b/test/files/neg/bug1845.check
deleted file mode 100644
index 164f3f60c1..0000000000
--- a/test/files/neg/bug1845.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1845.scala:9: error: illegal cyclic reference involving value <import>
-  val lexical = new StdLexical
-                    ^
-one error found
diff --git a/test/files/neg/bug1909b.check b/test/files/neg/bug1909b.check
deleted file mode 100644
index e5de5fefe9..0000000000
--- a/test/files/neg/bug1909b.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1909b.scala:4: error: this can be used only in a class, object, or template
-    def bar() = this.z + 5
-                ^
-one error found
diff --git a/test/files/neg/bug200.check b/test/files/neg/bug200.check
deleted file mode 100644
index d3670060cd..0000000000
--- a/test/files/neg/bug200.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug200.scala:7: error: method foo is defined twice
-  def foo: Int;
-      ^
-one error found
diff --git a/test/files/neg/bug2144.check b/test/files/neg/bug2144.check
deleted file mode 100644
index 989bddc21e..0000000000
--- a/test/files/neg/bug2144.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug2144.scala:2: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement
-  def foo[A](a: A) = new { def bar(x: A): A = x }
-                               ^
-one error found
diff --git a/test/files/neg/bug2275a.check b/test/files/neg/bug2275a.check
deleted file mode 100644
index 892a903948..0000000000
--- a/test/files/neg/bug2275a.check
+++ /dev/null
@@ -1,13 +0,0 @@
-bug2275a.scala:4: error: in XML literal: in XML content, please use '}}' to express '}'
-  }else{
-  ^
-bug2275a.scala:3: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
-    <br>
-     ^
-bug2275a.scala:4: error: ';' expected but 'else' found.
-  }else{
-   ^
-bug2275a.scala:7: error: '}' expected but eof found.
-}
- ^
-four errors found
diff --git a/test/files/neg/bug2275b.check b/test/files/neg/bug2275b.check
deleted file mode 100644
index 0db3eb8ff1..0000000000
--- a/test/files/neg/bug2275b.check
+++ /dev/null
@@ -1,10 +0,0 @@
-bug2275b.scala:2: error: in XML literal: in XML content, please use '}}' to express '}'
-  {<br>}xx
-       ^
-bug2275b.scala:2: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
-  {<br>}xx
-    ^
-bug2275b.scala:3: error: '}' expected but eof found.
-}
- ^
-three errors found
diff --git a/test/files/neg/bug2441.check b/test/files/neg/bug2441.check
deleted file mode 100644
index 2c82e6a9f8..0000000000
--- a/test/files/neg/bug2441.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug2441.scala:12: error: private class Y escapes its defining scope as part of type Some[B.Y]
-  override def f = Some(new B.Y)
-               ^
-one error found
diff --git a/test/files/neg/bug284.check b/test/files/neg/bug284.check
deleted file mode 100644
index 821727b96a..0000000000
--- a/test/files/neg/bug284.check
+++ /dev/null
@@ -1,8 +0,0 @@
-bug284.scala:2: warning: Detected apparent refinement of Unit; are you missing an '=' sign?
-    def f1(a: T): Unit { }
-                       ^
-bug284.scala:5: error: Unmatched closing brace '}' ignored here
-  }
-  ^
-one warning found
-one error found
diff --git a/test/files/neg/bug3209.check b/test/files/neg/bug3209.check
deleted file mode 100644
index fa50f4ce1d..0000000000
--- a/test/files/neg/bug3209.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug3209.scala:2: error: expected start of definition
-package test
-^
-one error found
diff --git a/test/files/neg/bug3240.check b/test/files/neg/bug3240.check
deleted file mode 100644
index 4f751d6f00..0000000000
--- a/test/files/neg/bug3240.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug3240.scala:3: error: only classes can have declared but undefined members
-  type t
-       ^
-bug3240.scala:5: error: type arguments [this.t] do not conform to method asInstanceOf's type parameter bounds [T0]
-       a.getOrElse(defVal).asInstanceOf[t]
-                                       ^
-two errors found
diff --git a/test/files/neg/bug343.check b/test/files/neg/bug343.check
deleted file mode 100644
index 9b6af98be3..0000000000
--- a/test/files/neg/bug343.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug343.scala:5: error: private class Foo escapes its defining scope as part of type C.this.Foo
-  def get:Foo = new Foo();
-          ^
-one error found
diff --git a/test/files/neg/bug3736.check b/test/files/neg/bug3736.check
deleted file mode 100644
index cc222d1221..0000000000
--- a/test/files/neg/bug3736.check
+++ /dev/null
@@ -1,16 +0,0 @@
-bug3736.scala:4: error: super not allowed here: use this.isInstanceOf instead
-    def f2 = super.isInstanceOf[String]
-                   ^
-bug3736.scala:5: error: super not allowed here: use this.asInstanceOf instead
-    def f3 = super.asInstanceOf[AnyRef]
-                   ^
-bug3736.scala:6: error: super not allowed here: use this.== instead
-    def f4 = super.==(new AnyRef)
-                   ^
-bug3736.scala:7: error: super not allowed here: use this.!= instead
-    def f5 = super.!=(new AnyRef)
-                   ^
-bug3736.scala:8: error: super not allowed here: use this.## instead
-    def f6 = super.##
-                   ^
-5 errors found
diff --git a/test/files/neg/bug3909.check b/test/files/neg/bug3909.check
deleted file mode 100644
index af79579d82..0000000000
--- a/test/files/neg/bug3909.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug3909.scala:1: error: in object DO, multiple overloaded alternatives of m1 define default arguments
-object DO {
-       ^
-one error found
diff --git a/test/files/neg/bug3913.check b/test/files/neg/bug3913.check
deleted file mode 100644
index e6df31fb23..0000000000
--- a/test/files/neg/bug3913.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug3913.scala:2: error: super constructor cannot be passed a self reference unless parameter is declared by-name
-object LimboStage  extends Stage( Set( LimboStage ))
-                                       ^
-one error found
diff --git a/test/files/neg/bug4069.check b/test/files/neg/bug4069.check
deleted file mode 100644
index d3aa8f3992..0000000000
--- a/test/files/neg/bug4069.check
+++ /dev/null
@@ -1,16 +0,0 @@
-bug4069.scala:7: error: unexpected end of input: possible missing '}' in XML block
-          case 2 =>
-          ^
-bug4069.scala:6: error: Missing closing brace `}' assumed here
-            </div>
-            ^
-bug4069.scala:9: error: in XML literal: in XML content, please use '}}' to express '}'
-        }
-        ^
-bug4069.scala:4: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <div>
-            <div>
-             ^
-bug4069.scala:10: error: '}' expected but eof found.
-}
-^
-5 errors found
diff --git a/test/files/neg/bug4217.check b/test/files/neg/bug4217.check
deleted file mode 100644
index 4de9201da8..0000000000
--- a/test/files/neg/bug4217.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug4217.scala:2: error: 'case' expected but '}' found.
-  42 match { } 
-             ^
-one error found
diff --git a/test/files/neg/bug4419.check b/test/files/neg/bug4419.check
deleted file mode 100644
index 488be9a591..0000000000
--- a/test/files/neg/bug4419.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug4419.scala:2: error: forward reference extends over definition of value b
-  { val b = a; val a = 1 }
-            ^
-one error found
diff --git a/test/files/neg/bug464-neg.check b/test/files/neg/bug464-neg.check
deleted file mode 100644
index 7921c5a4f8..0000000000
--- a/test/files/neg/bug464-neg.check
+++ /dev/null
@@ -1,16 +0,0 @@
-bug464-neg.scala:7: error: not found: value f1
-  f1()
-  ^
-bug464-neg.scala:8: error: method f1 in class A cannot be accessed in A with ScalaObject
-  super.f1()
-        ^
-bug464-neg.scala:9: error: value f2 is not a member of B
-  def otherb(b2: B) = b2.f2()
-                         ^
-bug464-neg.scala:10: error: method f3 in class A cannot be accessed in B
-  f3()
-  ^
-bug464-neg.scala:11: error: method f3 in class A cannot be accessed in A with ScalaObject
-  super.f3()
-        ^
-5 errors found
diff --git a/test/files/neg/bug473.check b/test/files/neg/bug473.check
deleted file mode 100644
index 7e3c4a4ed5..0000000000
--- a/test/files/neg/bug473.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug473.scala:3: error: super constructor cannot be passed a self reference unless parameter is declared by-name
-case object Voop extends Foo(Voop)
-                             ^
-one error found
diff --git a/test/files/neg/bug500.check b/test/files/neg/bug500.check
deleted file mode 100644
index ff4443caee..0000000000
--- a/test/files/neg/bug500.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug500.scala:3: error: lower bound X does not conform to upper bound Y
-    type T >: X <: Y;
-         ^
-one error found
diff --git a/test/files/neg/bug510.check b/test/files/neg/bug510.check
deleted file mode 100644
index 14b715ea68..0000000000
--- a/test/files/neg/bug510.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug510.scala:19: error: cyclic aliasing or subtyping involving type T
-    def g(t: e.T): Unit = {
-          ^
-one error found
diff --git a/test/files/neg/bug521.check b/test/files/neg/bug521.check
deleted file mode 100644
index d8e92688dd..0000000000
--- a/test/files/neg/bug521.check
+++ /dev/null
@@ -1,15 +0,0 @@
-bug521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => String is not defined
-class PlainFile(val file : File) extends AbstractFile {}
-      ^
-bug521.scala:13: error: overriding value file in class PlainFile of type java.io.File;
- value file needs `override' modifier
-final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
-                           ^
-bug521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => String is not defined
-final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
-            ^
-bug521.scala:15: error: overriding value path in class VirtualFile of type String;
- method path needs to be a stable, immutable value
-    override def path = "";
-                 ^
-four errors found
diff --git a/test/files/neg/bug545.check b/test/files/neg/bug545.check
deleted file mode 100644
index d184f90e85..0000000000
--- a/test/files/neg/bug545.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug545.scala:4: error: value blah is not a member of Test.Foo
-  val x = foo.blah match {
-              ^
-bug545.scala:5: error: recursive value x needs type
-    case List(x) => x
-                    ^
-two errors found
diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check
deleted file mode 100644
index e1650b7ab1..0000000000
--- a/test/files/neg/bug550.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug550.scala:6: error: type List takes type parameters
-  def sum[a](xs: List)(implicit m: Monoid[a]): a =
-                 ^
-bug550.scala:8: error: could not find implicit value for parameter m: Monoid[a]
-  sum(List(1,2,3))
-     ^
-two errors found
diff --git a/test/files/neg/bug585.check b/test/files/neg/bug585.check
deleted file mode 100644
index 4f4c5bf31d..0000000000
--- a/test/files/neg/bug585.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug585.scala:1: error: unclosed comment
-/*
-^
-one error found
diff --git a/test/files/neg/bug593.check b/test/files/neg/bug593.check
deleted file mode 100644
index f71affec5a..0000000000
--- a/test/files/neg/bug593.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug593.scala:1: error: traits or objects may not have parameters
-trait Wrapper[T](x : T) {
-                ^
-one error found
diff --git a/test/files/neg/bug631.check b/test/files/neg/bug631.check
deleted file mode 100644
index 0650c701d9..0000000000
--- a/test/files/neg/bug631.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug631.scala:1: error: `implicit' modifier cannot be used for top-level objects
-implicit object Test {
-                ^
-one error found
diff --git a/test/files/neg/bug639.check b/test/files/neg/bug639.check
deleted file mode 100644
index 30a93518a9..0000000000
--- a/test/files/neg/bug639.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug639.scala:3: error: not found: object a
-import a._
-       ^
-one error found
diff --git a/test/files/neg/bug649.check b/test/files/neg/bug649.check
deleted file mode 100644
index 2a1533d2dc..0000000000
--- a/test/files/neg/bug649.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug649.scala:3: error: overloaded method foo needs result type
-  def foo[A] = foo[A]
-                  ^
-one error found
diff --git a/test/files/neg/bug664.check b/test/files/neg/bug664.check
deleted file mode 100644
index c29f9b6c7c..0000000000
--- a/test/files/neg/bug664.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug664.scala:4: error: type Foo is not a member of test.Test with ScalaObject
-  trait Foo extends super.Foo {
-                          ^
-bug664.scala:5: error: type Bar is not a member of AnyRef with ScalaObject
-    trait Bar extends super.Bar;
-                            ^
-two errors found
diff --git a/test/files/neg/bug693.check b/test/files/neg/bug693.check
deleted file mode 100644
index d341d025e2..0000000000
--- a/test/files/neg/bug693.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug693.scala:4: error: x is already defined as value x
-  val x : Int = 10; 
-      ^
-one error found
diff --git a/test/files/neg/bug700.check b/test/files/neg/bug700.check
deleted file mode 100644
index 5c2854069c..0000000000
--- a/test/files/neg/bug700.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug700.scala:6: error: method foobar in trait Foo is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override'
-  def foobar: Unit = super.foobar
-                           ^
-one error found
diff --git a/test/files/neg/bug715.check b/test/files/neg/bug715.check
deleted file mode 100644
index 8ea1ddb0eb..0000000000
--- a/test/files/neg/bug715.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug715.scala:12: error: method chilren in trait NodeImpl is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override'
-    override def children = super.chilren;
-                                  ^
-one error found
diff --git a/test/files/neg/bug798.check b/test/files/neg/bug798.check
deleted file mode 100644
index 5859e1e769..0000000000
--- a/test/files/neg/bug798.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug798.scala:2: error: cyclic aliasing or subtyping involving type Bracks
-trait Test[Bracks <: Bracks] {
-           ^
-one error found
diff --git a/test/files/neg/bug800.check b/test/files/neg/bug800.check
deleted file mode 100644
index 00ca02070e..0000000000
--- a/test/files/neg/bug800.check
+++ /dev/null
@@ -1,13 +0,0 @@
-bug800.scala:4: error: qualification is already defined as value qualification
-  val qualification = false;
-      ^
-bug800.scala:8: error: method qualification is defined twice
-  val qualification = false;
-      ^
-bug800.scala:12: error: value qualification is defined twice
-  var qualification = false;
-      ^
-bug800.scala:16: error: method qualification is defined twice
-  var qualification = false;
-      ^
-four errors found
diff --git a/test/files/neg/bug845.check b/test/files/neg/bug845.check
deleted file mode 100644
index a5b92e2aee..0000000000
--- a/test/files/neg/bug845.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug845.scala:4: error: only classes can have declared but undefined members
-  type Bar;
-       ^
-one error found
diff --git a/test/files/neg/bug882.check b/test/files/neg/bug882.check
deleted file mode 100644
index 4e3e6d0860..0000000000
--- a/test/files/neg/bug882.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug882.scala:2: error: traits cannot have type parameters with context bounds `: ...' nor view bounds `<% ...'
-trait SortedSet[A <% Ordered[A]] {
-                                 ^
-one error found
diff --git a/test/files/neg/bug908.check b/test/files/neg/bug908.check
deleted file mode 100644
index c73f1d7857..0000000000
--- a/test/files/neg/bug908.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug908.scala:8: error: not found: value makeA
-    this(makeA)
-         ^
-one error found
diff --git a/test/files/neg/bug935.check b/test/files/neg/bug935.check
deleted file mode 100644
index 6a4129eee3..0000000000
--- a/test/files/neg/bug935.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug935.scala:7: error: type arguments [Test3.B] do not conform to class E's type parameter bounds [T <: String]
-  @E[B](new B) val b = "hi"
-                   ^
-bug935.scala:13: error: type arguments [Test4.B] do not conform to class E's type parameter bounds [T <: String]
-  val b: String @E[B](new B) = "hi"
-                 ^
-two errors found
diff --git a/test/files/neg/bug944.check b/test/files/neg/bug944.check
deleted file mode 100644
index d45b968e9e..0000000000
--- a/test/files/neg/bug944.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug944.scala:5: error: implementation restricts functions to 22 parameters
-           a23:Int) => 1
-                    ^
-one error found
diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check
deleted file mode 100644
index 0231a3ea66..0000000000
--- a/test/files/neg/bug961.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug961.scala:11: error: object Temp.B does not take parameters
-  B() match {
-   ^
-one error found
diff --git a/test/files/neg/bug418.check b/test/files/neg/t0418.check
index e7580beaf4..4e9ad2f9ae 100644
--- a/test/files/neg/bug418.check
+++ b/test/files/neg/t0418.check
@@ -1,7 +1,7 @@
-bug418.scala:2: error: not found: value Foo12340771
+t0418.scala:2: error: not found: value Foo12340771
   null match { case Foo12340771.Bar(x) => x }
                     ^
-bug418.scala:2: error: not found: value x
+t0418.scala:2: error: not found: value x
   null match { case Foo12340771.Bar(x) => x }
                                           ^
 two errors found
diff --git a/test/files/neg/bug0418.scala b/test/files/neg/t0418.scala
index 67007010d4..67007010d4 100644
--- a/test/files/neg/bug0418.scala
+++ b/test/files/neg/t0418.scala
diff --git a/test/files/neg/bug1010.check b/test/files/neg/t1010.check
index 3cf9738eaa..2cc8f9d986 100644
--- a/test/files/neg/bug1010.check
+++ b/test/files/neg/t1010.check
@@ -1,4 +1,4 @@
-bug1010.scala:14: error: type mismatch;
+t1010.scala:14: error: type mismatch;
  found   : MailBox#Message
  required: _3.in.Message where val _3: Actor
    unstable.send(msg) // in.Message becomes unstable.Message, but that's ok since Message is a concrete type member
diff --git a/test/files/neg/bug1010.scala b/test/files/neg/t1010.scala
index 7a1e6615e5..7a1e6615e5 100644
--- a/test/files/neg/bug1010.scala
+++ b/test/files/neg/t1010.scala
diff --git a/test/files/neg/bug1011.check b/test/files/neg/t1011.check
index 7de677639a..d9c8123549 100644
--- a/test/files/neg/bug1011.check
+++ b/test/files/neg/t1011.check
@@ -1,4 +1,4 @@
-bug1011.scala:8: error: not found: value entity
+t1011.scala:8: error: not found: value entity
        <dl><code>{Text(entity)}</code>
                        ^
 one error found
diff --git a/test/files/neg/bug1011.scala b/test/files/neg/t1011.scala
index 7dc3f49469..7dc3f49469 100644
--- a/test/files/neg/bug1011.scala
+++ b/test/files/neg/t1011.scala
diff --git a/test/files/neg/bug1017.check b/test/files/neg/t1017.check
index ad88a10401..52101c7f6e 100644
--- a/test/files/neg/bug1017.check
+++ b/test/files/neg/t1017.check
@@ -1,4 +1,4 @@
-bug1017.scala:3: error: not found: value foo
+t1017.scala:3: error: not found: value foo
 <x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x>{ foo }</x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x>
                                                         ^
 one error found
diff --git a/test/files/neg/bug1017.scala b/test/files/neg/t1017.scala
index e389f308c3..e389f308c3 100644
--- a/test/files/neg/bug1017.scala
+++ b/test/files/neg/t1017.scala
diff --git a/test/files/neg/bug1038.check b/test/files/neg/t1038.check
index e09cbbc510..b191b89ad1 100644
--- a/test/files/neg/bug1038.check
+++ b/test/files/neg/t1038.check
@@ -1,4 +1,4 @@
-bug1038.scala:4: error: not enough arguments for constructor X: (x: Int)X.
+t1038.scala:4: error: not enough arguments for constructor X: (x: Int)X.
 Unspecified value parameter x.
   val a = new X
           ^
diff --git a/test/files/neg/bug1038.scala b/test/files/neg/t1038.scala
index 9fdcae207f..9fdcae207f 100644
--- a/test/files/neg/bug1038.scala
+++ b/test/files/neg/t1038.scala
diff --git a/test/files/neg/bug1041.check b/test/files/neg/t1041.check
index c366364241..d82f3a8586 100644
--- a/test/files/neg/bug1041.check
+++ b/test/files/neg/t1041.check
@@ -1,4 +1,4 @@
-bug1041.scala:3: error: type mismatch;
+t1041.scala:3: error: type mismatch;
  found   : Int(1)
  required: List[Int]
     case 1 => 4
diff --git a/test/files/neg/bug1041.scala b/test/files/neg/t1041.scala
index a5895c68a9..a5895c68a9 100644
--- a/test/files/neg/bug1041.scala
+++ b/test/files/neg/t1041.scala
diff --git a/test/files/neg/t1106.check b/test/files/neg/t1106.check
new file mode 100644
index 0000000000..f81d0c6025
--- /dev/null
+++ b/test/files/neg/t1106.check
@@ -0,0 +1,7 @@
+t1106.scala:2: error: expected class or object definition
+val p = new Par[String]
+^
+t1106.scala:5: error: expected class or object definition
+new Foo[p.type](p) // crashes compiler
+^
+two errors found
diff --git a/test/files/neg/bug1106.scala b/test/files/neg/t1106.scala
index a218eee7a1..a218eee7a1 100644
--- a/test/files/neg/bug1106.scala
+++ b/test/files/neg/t1106.scala
diff --git a/test/files/neg/t1112.check b/test/files/neg/t1112.check
new file mode 100644
index 0000000000..e69be3ef2c
--- /dev/null
+++ b/test/files/neg/t1112.check
@@ -0,0 +1,4 @@
+t1112.scala:12: error: too many arguments for method call: (p: Int)(f: => () => Unit)Unit
+    call(0,() => System.out.println("here we are"))
+        ^
+one error found
diff --git a/test/files/neg/bug1112.scala b/test/files/neg/t1112.scala
index 1a88629faf..1a88629faf 100644
--- a/test/files/neg/bug1112.scala
+++ b/test/files/neg/t1112.scala
diff --git a/test/files/neg/bug112706A.check b/test/files/neg/t112706A.check
index 8fb5bfc390..42584b9707 100644
--- a/test/files/neg/bug112706A.check
+++ b/test/files/neg/t112706A.check
@@ -1,4 +1,4 @@
-bug112706A.scala:5: error: constructor cannot be instantiated to expected type;
+t112706A.scala:5: error: constructor cannot be instantiated to expected type;
  found   : (T1, T2)
  required: java.lang.String
     case Tuple2(node,_) =>   
diff --git a/test/files/neg/bug112706A.scala b/test/files/neg/t112706A.scala
index 11304720bc..11304720bc 100644
--- a/test/files/neg/bug112706A.scala
+++ b/test/files/neg/t112706A.scala
diff --git a/test/files/neg/bug1181.check b/test/files/neg/t1181.check
index a196a702ab..2d7205c61f 100644
--- a/test/files/neg/bug1181.check
+++ b/test/files/neg/t1181.check
@@ -1,4 +1,4 @@
-bug1181.scala:9: error: missing parameter type
+t1181.scala:9: error: missing parameter type
      _ => buildMap(map.updated(keyList.head, valueList.head), keyList.tail, valueList.tail)
      ^
 one error found
diff --git a/test/files/neg/bug1181.scala b/test/files/neg/t1181.scala
index 5e5fceacc8..5e5fceacc8 100644
--- a/test/files/neg/bug1181.scala
+++ b/test/files/neg/t1181.scala
diff --git a/test/files/neg/bug1183.check b/test/files/neg/t1183.check
index 9e20592d08..c402829c70 100644
--- a/test/files/neg/bug1183.check
+++ b/test/files/neg/t1183.check
@@ -1,16 +1,16 @@
-bug1183.scala:6: error: name clash: class Foo defines object Baz
+t1183.scala:6: error: name clash: class Foo defines object Baz
 and its companion object Foo also defines class Baz
     object Baz
            ^
-bug1183.scala:7: error: name clash: class Foo defines class Bam
+t1183.scala:7: error: name clash: class Foo defines class Bam
 and its companion object Foo also defines object Bam
     class Bam
           ^
-bug1183.scala:8: error: name clash: class Foo defines object Bar
+t1183.scala:8: error: name clash: class Foo defines object Bar
 and its companion object Foo also defines class Bar
     object Bar
            ^
-bug1183.scala:9: error: name clash: class Foo defines class Bar
+t1183.scala:9: error: name clash: class Foo defines class Bar
 and its companion object Foo also defines class Bar
     case class Bar(i:Int)
                ^
diff --git a/test/files/neg/bug1183.scala b/test/files/neg/t1183.scala
index 23868ab401..23868ab401 100644
--- a/test/files/neg/bug1183.scala
+++ b/test/files/neg/t1183.scala
diff --git a/test/files/neg/t1224.check b/test/files/neg/t1224.check
new file mode 100644
index 0000000000..fb61275911
--- /dev/null
+++ b/test/files/neg/t1224.check
@@ -0,0 +1,4 @@
+t1224.scala:4: error: illegal cyclic reference involving type T
+ type T >: C[T] <: C[C[T]]
+      ^
+one error found
diff --git a/test/files/neg/bug1224.scala b/test/files/neg/t1224.scala
index 35e01fa379..35e01fa379 100644
--- a/test/files/neg/bug1224.scala
+++ b/test/files/neg/t1224.scala
diff --git a/test/files/neg/bug1241.check b/test/files/neg/t1241.check
index 48c86cabb7..e1ccf4172f 100644
--- a/test/files/neg/bug1241.check
+++ b/test/files/neg/t1241.check
@@ -1,4 +1,4 @@
-bug1241.scala:5: error: class type required but AnyRef{def hello(): Unit} found
+t1241.scala:5: error: class type required but AnyRef{def hello(): Unit} found
   val x4 = new T { def hello() { println("4") } }        // error!
                ^
 one error found
diff --git a/test/files/neg/bug1241.scala b/test/files/neg/t1241.scala
index e115917136..e115917136 100644
--- a/test/files/neg/bug1241.scala
+++ b/test/files/neg/t1241.scala
diff --git a/test/files/neg/bug1275.check b/test/files/neg/t1275.check
index 6ee8365796..a930e25ab3 100644
--- a/test/files/neg/bug1275.check
+++ b/test/files/neg/t1275.check
@@ -1,4 +1,4 @@
-bug1275.scala:11: error: type mismatch;
+t1275.scala:11: error: type mismatch;
  found   : xs.MyType[a]
  required: s
      = xs f
diff --git a/test/files/neg/bug1275.scala b/test/files/neg/t1275.scala
index 1175b30763..1175b30763 100644
--- a/test/files/neg/bug1275.scala
+++ b/test/files/neg/t1275.scala
diff --git a/test/files/neg/bug1286.check b/test/files/neg/t1286.check
index 734964e9cf..734964e9cf 100644
--- a/test/files/neg/bug1286.check
+++ b/test/files/neg/t1286.check
diff --git a/test/files/neg/bug1286/a.scala b/test/files/neg/t1286/a.scala
index 85ffe3bb58..85ffe3bb58 100644
--- a/test/files/neg/bug1286/a.scala
+++ b/test/files/neg/t1286/a.scala
diff --git a/test/files/neg/bug1286/b.scala b/test/files/neg/t1286/b.scala
index 48f3b440c2..48f3b440c2 100644
--- a/test/files/neg/bug1286/b.scala
+++ b/test/files/neg/t1286/b.scala
diff --git a/test/files/neg/t1364.check b/test/files/neg/t1364.check
new file mode 100644
index 0000000000..78375333c2
--- /dev/null
+++ b/test/files/neg/t1364.check
@@ -0,0 +1,5 @@
+t1364.scala:9: error: overriding type T in trait A with bounds >: Nothing <: AnyRef{type S[-U]};
+ type T has incompatible type
+ type T = { type S[U] = U }
+      ^
+one error found
diff --git a/test/files/neg/bug1364.scala b/test/files/neg/t1364.scala
index 6b02580fa5..6b02580fa5 100644
--- a/test/files/neg/bug1364.scala
+++ b/test/files/neg/t1364.scala
diff --git a/test/files/neg/bug1431.check b/test/files/neg/t1431.check
index 0ae28eea9d..a17ba73243 100644
--- a/test/files/neg/bug1431.check
+++ b/test/files/neg/t1431.check
@@ -1,4 +1,4 @@
-bug1431.scala:8: error: class type required but X#Factory found
+t1431.scala:8: error: class type required but X#Factory found
   def fun[X<:MyTrait with Singleton]() = new X#Factory().value
                                                ^
 one error found
diff --git a/test/files/neg/bug1431.scala b/test/files/neg/t1431.scala
index aff1dbc014..aff1dbc014 100644
--- a/test/files/neg/bug1431.scala
+++ b/test/files/neg/t1431.scala
diff --git a/test/files/neg/bug1432.check b/test/files/neg/t1432.check
index 90bba0bf13..180cb05e67 100644
--- a/test/files/neg/bug1432.check
+++ b/test/files/neg/t1432.check
@@ -1,4 +1,4 @@
-bug1432.scala:10: error: type mismatch;
+t1432.scala:10: error: type mismatch;
  found   : (Int, Bug_NoUnique.Wrap[Bug_NoUnique.Wrap[Unit]] => Double)
  required: (Int, Unit => Double)
   def test(x : TypeCon[Wrap[Unit]]) : TypeCon[Unit] = wrap(x)
diff --git a/test/files/neg/bug1432.scala b/test/files/neg/t1432.scala
index 638f36554f..638f36554f 100644
--- a/test/files/neg/bug1432.scala
+++ b/test/files/neg/t1432.scala
diff --git a/test/files/neg/bug1523.check b/test/files/neg/t1523.check
index 96d052fa4c..d2489f2602 100644
--- a/test/files/neg/bug1523.check
+++ b/test/files/neg/t1523.check
@@ -1,4 +1,4 @@
-bug1523.scala:4: error: too many arguments for method bug: (x: Any)Any
+t1523.scala:4: error: too many arguments for method bug: (x: Any)Any
   def go() = bug("a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a")
                 ^
 one error found
diff --git a/test/files/neg/bug1523.scala b/test/files/neg/t1523.scala
index 219fb0c060..219fb0c060 100644
--- a/test/files/neg/bug1523.scala
+++ b/test/files/neg/t1523.scala
diff --git a/test/files/neg/bug1548.check b/test/files/neg/t1548.check
index 7f5a3f44e2..7f5a3f44e2 100644
--- a/test/files/neg/bug1548.check
+++ b/test/files/neg/t1548.check
diff --git a/test/files/neg/bug1548/J.java b/test/files/neg/t1548/J.java
index 01dd56d348..01dd56d348 100644
--- a/test/files/neg/bug1548/J.java
+++ b/test/files/neg/t1548/J.java
diff --git a/test/files/neg/bug1548/S.scala b/test/files/neg/t1548/S.scala
index 086b78029d..086b78029d 100644
--- a/test/files/neg/bug1548/S.scala
+++ b/test/files/neg/t1548/S.scala
diff --git a/test/files/neg/t1623.check b/test/files/neg/t1623.check
new file mode 100644
index 0000000000..251039ad30
--- /dev/null
+++ b/test/files/neg/t1623.check
@@ -0,0 +1,4 @@
+t1623.scala:11: error: class BImpl cannot be instantiated because it does not conform to its self-type test.BImpl with test.A
+  val b = new BImpl
+          ^
+one error found
diff --git a/test/files/neg/bug1623.scala b/test/files/neg/t1623.scala
index f5189aa4ca..f5189aa4ca 100644
--- a/test/files/neg/bug1623.scala
+++ b/test/files/neg/t1623.scala
diff --git a/test/files/neg/t1838.check b/test/files/neg/t1838.check
new file mode 100644
index 0000000000..a476158c7b
--- /dev/null
+++ b/test/files/neg/t1838.check
@@ -0,0 +1,7 @@
+t1838.scala:6: error: `sealed' modifier can be used only for classes
+  sealed val v = 0
+             ^
+t1838.scala:5: error: `sealed' modifier can be used only for classes
+  sealed def f = 0
+             ^
+two errors found
diff --git a/test/files/neg/bug1838.scala b/test/files/neg/t1838.scala
index 36eeb4050a..36eeb4050a 100644
--- a/test/files/neg/bug1838.scala
+++ b/test/files/neg/t1838.scala
diff --git a/test/files/neg/t1845.check b/test/files/neg/t1845.check
new file mode 100644
index 0000000000..7c0bddbc20
--- /dev/null
+++ b/test/files/neg/t1845.check
@@ -0,0 +1,4 @@
+t1845.scala:9: error: illegal cyclic reference involving value <import>
+  val lexical = new StdLexical
+                    ^
+one error found
diff --git a/test/files/neg/bug1845.scala b/test/files/neg/t1845.scala
index dab448b7dd..dab448b7dd 100644
--- a/test/files/neg/bug1845.scala
+++ b/test/files/neg/t1845.scala
diff --git a/test/files/neg/bug1872.check b/test/files/neg/t1872.check
index 9f1af33056..ef84ef79e0 100644
--- a/test/files/neg/bug1872.check
+++ b/test/files/neg/t1872.check
@@ -1,4 +1,4 @@
-bug1872.scala:3: error: isInstanceOf cannot test if value types are references.
+t1872.scala:3: error: isInstanceOf cannot test if value types are references.
   def f(x: Int) = x.isInstanceOf[util.Random]
                     ^
 one error found
diff --git a/test/files/neg/bug1872.scala b/test/files/neg/t1872.scala
index 0ebee0b32d..0ebee0b32d 100644
--- a/test/files/neg/bug1872.scala
+++ b/test/files/neg/t1872.scala
diff --git a/test/files/neg/bug1878.check b/test/files/neg/t1878.check
index f760781fa0..4b9cfebde1 100644
--- a/test/files/neg/bug1878.check
+++ b/test/files/neg/t1878.check
@@ -1,15 +1,15 @@
-bug1878.scala:3: error: _* may only come last
+t1878.scala:3: error: _* may only come last
   val err1 = "" match { case Seq(f @ _*, ',') => f }
                                  ^
-bug1878.scala:3: error: scrutinee is incompatible with pattern type;
+t1878.scala:3: error: scrutinee is incompatible with pattern type;
  found   : Seq[A]
  required: java.lang.String
   val err1 = "" match { case Seq(f @ _*, ',') => f }
                                 ^
-bug1878.scala:9: error: _* may only come last
+t1878.scala:9: error: _* may only come last
   val List(List(_*, arg2), _) = List(List(1,2,3), List(4,5,6))
                  ^
-bug1878.scala:13: error: _* may only come last
+t1878.scala:13: error: _* may only come last
     case <p> { _* } </p> =>
                 ^
 four errors found
diff --git a/test/files/neg/bug1878.scala b/test/files/neg/t1878.scala
index 683dcb6b41..683dcb6b41 100644
--- a/test/files/neg/bug1878.scala
+++ b/test/files/neg/t1878.scala
diff --git a/test/files/neg/t1909b.check b/test/files/neg/t1909b.check
new file mode 100644
index 0000000000..9a683643ae
--- /dev/null
+++ b/test/files/neg/t1909b.check
@@ -0,0 +1,4 @@
+t1909b.scala:4: error: this can be used only in a class, object, or template
+    def bar() = this.z + 5
+                ^
+one error found
diff --git a/test/files/neg/bug1909b.scala b/test/files/neg/t1909b.scala
index 6aa7870478..6aa7870478 100644
--- a/test/files/neg/bug1909b.scala
+++ b/test/files/neg/t1909b.scala
diff --git a/test/files/neg/bug1960.check b/test/files/neg/t1960.check
index 8e19f31ef5..dabf53f126 100644
--- a/test/files/neg/bug1960.check
+++ b/test/files/neg/t1960.check
@@ -1,4 +1,4 @@
-bug1960.scala:5: error: parameter 'p' requires field but conflicts with p in 'TBase'
+t1960.scala:5: error: parameter 'p' requires field but conflicts with p in 'TBase'
 class Aclass (p: Int) extends TBase { def g() { f(p) } }
               ^
 one error found
diff --git a/test/files/neg/bug1960.scala b/test/files/neg/t1960.scala
index 5311940b5a..5311940b5a 100644
--- a/test/files/neg/bug1960.scala
+++ b/test/files/neg/t1960.scala
diff --git a/test/files/neg/t200.check b/test/files/neg/t200.check
new file mode 100644
index 0000000000..78701f8533
--- /dev/null
+++ b/test/files/neg/t200.check
@@ -0,0 +1,4 @@
+t200.scala:7: error: method foo is defined twice
+  def foo: Int;
+      ^
+one error found
diff --git a/test/files/neg/bug200.scala b/test/files/neg/t200.scala
index 692fe368e2..692fe368e2 100644
--- a/test/files/neg/bug200.scala
+++ b/test/files/neg/t200.scala
diff --git a/test/files/neg/bug2102.check b/test/files/neg/t2102.check
index 7478fcfcea..b4f91a5319 100644
--- a/test/files/neg/bug2102.check
+++ b/test/files/neg/t2102.check
@@ -1,4 +1,4 @@
-bug2102.scala:2: error: type mismatch;
+t2102.scala:2: error: type mismatch;
  found   : java.util.Iterator[Int]
  required: scala.collection.Iterator[_]
   val x: Iterator[_] = new java.util.ArrayList[Int]().iterator
diff --git a/test/files/neg/bug2102.scala b/test/files/neg/t2102.scala
index 9c37039039..9c37039039 100644
--- a/test/files/neg/bug2102.scala
+++ b/test/files/neg/t2102.scala
diff --git a/test/files/neg/t2144.check b/test/files/neg/t2144.check
new file mode 100644
index 0000000000..7239f4406e
--- /dev/null
+++ b/test/files/neg/t2144.check
@@ -0,0 +1,4 @@
+t2144.scala:2: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement
+  def foo[A](a: A) = new { def bar(x: A): A = x }
+                               ^
+one error found
diff --git a/test/files/neg/bug2144.scala b/test/files/neg/t2144.scala
index af9a5e166e..af9a5e166e 100644
--- a/test/files/neg/bug2144.scala
+++ b/test/files/neg/t2144.scala
diff --git a/test/files/neg/bug2148.check b/test/files/neg/t2148.check
index 22be424c39..5113b48e51 100644
--- a/test/files/neg/bug2148.check
+++ b/test/files/neg/t2148.check
@@ -1,4 +1,4 @@
-bug2148.scala:9: error: type A is not a stable prefix
+t2148.scala:9: error: type A is not a stable prefix
   val b = new A with A#A1
                        ^
 one error found
diff --git a/test/files/neg/bug2148.scala b/test/files/neg/t2148.scala
index 25788be84a..25788be84a 100644
--- a/test/files/neg/bug2148.scala
+++ b/test/files/neg/t2148.scala
diff --git a/test/files/neg/bug2206.check b/test/files/neg/t2206.check
index 3deb4d99ef..766f35d93a 100644
--- a/test/files/neg/bug2206.check
+++ b/test/files/neg/t2206.check
@@ -1,4 +1,4 @@
-bug2206.scala:10: error: value f is not a member of o.A
+t2206.scala:10: error: value f is not a member of o.A
  Note: implicit method ax is not applicable here because it comes after the application point and it lacks an explicit result type
   a.f()
     ^
diff --git a/test/files/neg/bug2206.scala b/test/files/neg/t2206.scala
index cd2ec225e9..cd2ec225e9 100644
--- a/test/files/neg/bug2206.scala
+++ b/test/files/neg/t2206.scala
diff --git a/test/files/neg/bug2213.check b/test/files/neg/t2213.check
index b24f7dc554..f59503ee2a 100644
--- a/test/files/neg/bug2213.check
+++ b/test/files/neg/t2213.check
@@ -1,11 +1,11 @@
-bug2213.scala:9: error: class C needs to be abstract, since:
+t2213.scala:9: error: class C needs to be abstract, since:
 value y in class A of type Int is not defined
 value x in class A of type Int is not defined
 method g in class A of type => Int is not defined
 method f in class A of type => Int is not defined
 class C extends A {}
       ^
-bug2213.scala:11: error: object creation impossible, since:
+t2213.scala:11: error: object creation impossible, since:
 value y in class A of type Int is not defined
 value x in class A of type Int is not defined
 method g in class A of type => Int is not defined
diff --git a/test/files/neg/bug2213.scala b/test/files/neg/t2213.scala
index af1df3ccfe..af1df3ccfe 100644
--- a/test/files/neg/bug2213.scala
+++ b/test/files/neg/t2213.scala
diff --git a/test/files/neg/t2275a.check b/test/files/neg/t2275a.check
new file mode 100644
index 0000000000..cd3c868e76
--- /dev/null
+++ b/test/files/neg/t2275a.check
@@ -0,0 +1,13 @@
+t2275a.scala:4: error: in XML literal: in XML content, please use '}}' to express '}'
+  }else{
+  ^
+t2275a.scala:3: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
+    <br>
+     ^
+t2275a.scala:4: error: ';' expected but 'else' found.
+  }else{
+   ^
+t2275a.scala:7: error: '}' expected but eof found.
+}
+ ^
+four errors found
diff --git a/test/files/neg/bug2275a.scala b/test/files/neg/t2275a.scala
index 7f2b803daa..7f2b803daa 100644
--- a/test/files/neg/bug2275a.scala
+++ b/test/files/neg/t2275a.scala
diff --git a/test/files/neg/t2275b.check b/test/files/neg/t2275b.check
new file mode 100644
index 0000000000..43e34cc4d3
--- /dev/null
+++ b/test/files/neg/t2275b.check
@@ -0,0 +1,10 @@
+t2275b.scala:2: error: in XML literal: in XML content, please use '}}' to express '}'
+  {<br>}xx
+       ^
+t2275b.scala:2: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
+  {<br>}xx
+    ^
+t2275b.scala:3: error: '}' expected but eof found.
+}
+ ^
+three errors found
diff --git a/test/files/neg/bug2275b.scala b/test/files/neg/t2275b.scala
index 312cba8d6d..312cba8d6d 100644
--- a/test/files/neg/bug2275b.scala
+++ b/test/files/neg/t2275b.scala
diff --git a/test/files/neg/bug2388.check b/test/files/neg/t2388.check
index f96cb594d1..3f97608a4d 100644
--- a/test/files/neg/bug2388.check
+++ b/test/files/neg/t2388.check
@@ -1,4 +1,4 @@
-bug2388.scala:2: error: recursive method search needs result type
+t2388.scala:2: error: recursive method search needs result type
   val searchField = new AnyRef { search() }
                                  ^
 one error found
diff --git a/test/files/neg/bug2388.scala b/test/files/neg/t2388.scala
index 3634f346f8..3634f346f8 100644
--- a/test/files/neg/bug2388.scala
+++ b/test/files/neg/t2388.scala
diff --git a/test/files/neg/t2441.check b/test/files/neg/t2441.check
new file mode 100644
index 0000000000..6eaacd8fd1
--- /dev/null
+++ b/test/files/neg/t2441.check
@@ -0,0 +1,4 @@
+t2441.scala:12: error: private class Y escapes its defining scope as part of type Some[B.Y]
+  override def f = Some(new B.Y)
+               ^
+one error found
diff --git a/test/files/neg/bug2441.scala b/test/files/neg/t2441.scala
index 6784ebb333..6784ebb333 100644
--- a/test/files/neg/bug2441.scala
+++ b/test/files/neg/t2441.scala
diff --git a/test/files/neg/bug276.check b/test/files/neg/t276.check
index edc4ec568f..7d37f5cfa1 100644
--- a/test/files/neg/bug276.check
+++ b/test/files/neg/t276.check
@@ -1,4 +1,4 @@
-bug276.scala:6: error: overriding type Bar in class Foo, which equals (Int, Int);
+t276.scala:6: error: overriding type Bar in class Foo, which equals (Int, Int);
  class Bar cannot be used here - classes and objects can only override abstract types
   class Bar
         ^
diff --git a/test/files/neg/bug276.scala b/test/files/neg/t276.scala
index dfc8b468df..dfc8b468df 100644
--- a/test/files/neg/bug276.scala
+++ b/test/files/neg/t276.scala
diff --git a/test/files/neg/bug278.check b/test/files/neg/t278.check
index b1041b7895..ad1078f897 100644
--- a/test/files/neg/bug278.check
+++ b/test/files/neg/t278.check
@@ -1,10 +1,10 @@
-bug278.scala:5: error: overloaded method value a with alternatives:
+t278.scala:5: error: overloaded method value a with alternatives:
   => C.this.A => Unit <and>
   => () => Unit
  does not take type parameters
   a[A]
   ^
-bug278.scala:4: error: method a is defined twice
+t278.scala:4: error: method a is defined twice
   def a = (p:A) => ()
       ^
 two errors found
diff --git a/test/files/neg/bug278.scala b/test/files/neg/t278.scala
index 16ffe10595..16ffe10595 100644
--- a/test/files/neg/bug278.scala
+++ b/test/files/neg/t278.scala
diff --git a/test/files/neg/t284.check b/test/files/neg/t284.check
new file mode 100644
index 0000000000..37801af1b5
--- /dev/null
+++ b/test/files/neg/t284.check
@@ -0,0 +1,8 @@
+t284.scala:2: warning: Detected apparent refinement of Unit; are you missing an '=' sign?
+    def f1(a: T): Unit { }
+                       ^
+t284.scala:5: error: Unmatched closing brace '}' ignored here
+  }
+  ^
+one warning found
+one error found
diff --git a/test/files/neg/bug284.scala b/test/files/neg/t284.scala
index a210130102..a210130102 100644
--- a/test/files/neg/bug284.scala
+++ b/test/files/neg/t284.scala
diff --git a/test/files/neg/bug3098.check b/test/files/neg/t3098.check
index 403da281c8..403da281c8 100644
--- a/test/files/neg/bug3098.check
+++ b/test/files/neg/t3098.check
diff --git a/test/files/neg/bug3098.flags b/test/files/neg/t3098.flags
index e8fb65d50c..e8fb65d50c 100644
--- a/test/files/neg/bug3098.flags
+++ b/test/files/neg/t3098.flags
diff --git a/test/files/neg/bug3098/a.scala b/test/files/neg/t3098/a.scala
index 57a103c7a8..57a103c7a8 100644
--- a/test/files/neg/bug3098/a.scala
+++ b/test/files/neg/t3098/a.scala
diff --git a/test/files/neg/bug3098/b.scala b/test/files/neg/t3098/b.scala
index 84a1f9f6f4..84a1f9f6f4 100644
--- a/test/files/neg/bug3098/b.scala
+++ b/test/files/neg/t3098/b.scala
diff --git a/test/files/neg/t3209.check b/test/files/neg/t3209.check
new file mode 100644
index 0000000000..c5a6b1d95d
--- /dev/null
+++ b/test/files/neg/t3209.check
@@ -0,0 +1,4 @@
+t3209.scala:2: error: expected start of definition
+package test
+^
+one error found
diff --git a/test/files/neg/bug3209.scala b/test/files/neg/t3209.scala
index d893726659..d893726659 100644
--- a/test/files/neg/bug3209.scala
+++ b/test/files/neg/t3209.scala
diff --git a/test/files/neg/t3240.check b/test/files/neg/t3240.check
new file mode 100644
index 0000000000..7ebabd5fcd
--- /dev/null
+++ b/test/files/neg/t3240.check
@@ -0,0 +1,7 @@
+t3240.scala:3: error: only classes can have declared but undefined members
+  type t
+       ^
+t3240.scala:5: error: type arguments [this.t] do not conform to method asInstanceOf's type parameter bounds [T0]
+       a.getOrElse(defVal).asInstanceOf[t]
+                                       ^
+two errors found
diff --git a/test/files/neg/bug3240.scala b/test/files/neg/t3240.scala
index cf197a406d..cf197a406d 100644
--- a/test/files/neg/bug3240.scala
+++ b/test/files/neg/t3240.scala
diff --git a/test/files/neg/bug3392.check b/test/files/neg/t3392.check
index cbae73ad3a..842d63eec9 100644
--- a/test/files/neg/bug3392.check
+++ b/test/files/neg/t3392.check
@@ -1,4 +1,4 @@
-bug3392.scala:9: error: not found: value x
+t3392.scala:9: error: not found: value x
     case x@A(x/*<-- refers to the pattern that includes this comment*/.Ex(42)) =>
              ^
 one error found
diff --git a/test/files/neg/bug3392.scala b/test/files/neg/t3392.scala
index 655c2e84a3..655c2e84a3 100644
--- a/test/files/neg/bug3392.scala
+++ b/test/files/neg/t3392.scala
diff --git a/test/files/neg/t343.check b/test/files/neg/t343.check
new file mode 100644
index 0000000000..d310b7915f
--- /dev/null
+++ b/test/files/neg/t343.check
@@ -0,0 +1,4 @@
+t343.scala:5: error: private class Foo escapes its defining scope as part of type C.this.Foo
+  def get:Foo = new Foo();
+          ^
+one error found
diff --git a/test/files/neg/bug343.scala b/test/files/neg/t343.scala
index ed57d2eef7..ed57d2eef7 100644
--- a/test/files/neg/bug343.scala
+++ b/test/files/neg/t343.scala
diff --git a/test/files/neg/bug3631.check b/test/files/neg/t3631.check
index 12d94aa4dc..6d8feca1ed 100644
--- a/test/files/neg/bug3631.check
+++ b/test/files/neg/t3631.check
@@ -1,4 +1,4 @@
-bug3631.scala:3: error: Implementation restriction: case classes cannot have more than 22 parameters.
+t3631.scala:3: error: Implementation restriction: case classes cannot have more than 22 parameters.
 case class X23(x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int, x23: Int) { }
            ^
 one error found
diff --git a/test/files/neg/bug3631.scala b/test/files/neg/t3631.scala
index bcf91619ee..bcf91619ee 100644
--- a/test/files/neg/bug3631.scala
+++ b/test/files/neg/t3631.scala
diff --git a/test/files/neg/bug3683a.check b/test/files/neg/t3683a.check
index a1c5b9c56d..18e80dd5e8 100644
--- a/test/files/neg/bug3683a.check
+++ b/test/files/neg/t3683a.check
@@ -1,4 +1,4 @@
-bug3683a.scala:14: error: match is not exhaustive!
+t3683a.scala:14: error: match is not exhaustive!
 missing combination             XX
 
     w match {
diff --git a/test/files/neg/bug3683a.flags b/test/files/neg/t3683a.flags
index 85d8eb2ba2..85d8eb2ba2 100644
--- a/test/files/neg/bug3683a.flags
+++ b/test/files/neg/t3683a.flags
diff --git a/test/files/neg/bug3683a.scala b/test/files/neg/t3683a.scala
index 6d1915213a..6d1915213a 100644
--- a/test/files/neg/bug3683a.scala
+++ b/test/files/neg/t3683a.scala
diff --git a/test/files/neg/bug3683b.check b/test/files/neg/t3683b.check
index 2637f62630..6e3369241b 100644
--- a/test/files/neg/bug3683b.check
+++ b/test/files/neg/t3683b.check
@@ -1,4 +1,4 @@
-bug3683b.scala:15: error: constructor cannot be instantiated to expected type;
+t3683b.scala:15: error: constructor cannot be instantiated to expected type;
  found   : X
  required: W[Bar]
 Note: Foo >: Bar (and X <: W[Foo]), but trait W is invariant in type T.
diff --git a/test/files/neg/bug3683b.scala b/test/files/neg/t3683b.scala
index 646e418121..646e418121 100644
--- a/test/files/neg/bug3683b.scala
+++ b/test/files/neg/t3683b.scala
diff --git a/test/files/neg/bug3714-neg.check b/test/files/neg/t3714-neg.check
index 48420514ec..2db0655502 100644
--- a/test/files/neg/bug3714-neg.check
+++ b/test/files/neg/t3714-neg.check
@@ -1,10 +1,10 @@
-bug3714-neg.scala:17: error: value break in class BreakImpl cannot be accessed in BreakImpl
+t3714-neg.scala:17: error: value break in class BreakImpl cannot be accessed in BreakImpl
  Access to protected value break not permitted because
  enclosing object Test is not a subclass of 
  class BreakImpl where target is defined
     case b: BreakImpl => b.break
                            ^
-bug3714-neg.scala:25: error: value break in class BreakImpl cannot be accessed in BreakImpl
+t3714-neg.scala:25: error: value break in class BreakImpl cannot be accessed in BreakImpl
  Access to protected value break not permitted because
  enclosing object Test is not a subclass of 
  class BreakImpl where target is defined
diff --git a/test/files/neg/bug3714-neg.scala b/test/files/neg/t3714-neg.scala
index 19bdebbfa9..753b367ec0 100644
--- a/test/files/neg/bug3714-neg.scala
+++ b/test/files/neg/t3714-neg.scala
@@ -1,4 +1,4 @@
-// this is a slight negative twist on run/bug3714.scala.
+// this is a slight negative twist on run/t3714.scala.
 trait Break {
   protected val break: Int;
 }
diff --git a/test/files/neg/t3736.check b/test/files/neg/t3736.check
new file mode 100644
index 0000000000..7a20f6c08b
--- /dev/null
+++ b/test/files/neg/t3736.check
@@ -0,0 +1,16 @@
+t3736.scala:4: error: super not allowed here: use this.isInstanceOf instead
+    def f2 = super.isInstanceOf[String]
+                   ^
+t3736.scala:5: error: super not allowed here: use this.asInstanceOf instead
+    def f3 = super.asInstanceOf[AnyRef]
+                   ^
+t3736.scala:6: error: super not allowed here: use this.== instead
+    def f4 = super.==(new AnyRef)
+                   ^
+t3736.scala:7: error: super not allowed here: use this.!= instead
+    def f5 = super.!=(new AnyRef)
+                   ^
+t3736.scala:8: error: super not allowed here: use this.## instead
+    def f6 = super.##
+                   ^
+5 errors found
diff --git a/test/files/neg/bug3736.scala b/test/files/neg/t3736.scala
index cf0920912a..cf0920912a 100644
--- a/test/files/neg/bug3736.scala
+++ b/test/files/neg/t3736.scala
diff --git a/test/files/neg/t3909.check b/test/files/neg/t3909.check
new file mode 100644
index 0000000000..7da0195607
--- /dev/null
+++ b/test/files/neg/t3909.check
@@ -0,0 +1,4 @@
+t3909.scala:1: error: in object DO, multiple overloaded alternatives of m1 define default arguments
+object DO {
+       ^
+one error found
diff --git a/test/files/neg/bug3909.scala b/test/files/neg/t3909.scala
index 758dc70fd4..758dc70fd4 100644
--- a/test/files/neg/bug3909.scala
+++ b/test/files/neg/t3909.scala
diff --git a/test/files/neg/bug391.check b/test/files/neg/t391.check
index 18f36a5757..879d9af71f 100644
--- a/test/files/neg/bug391.check
+++ b/test/files/neg/t391.check
@@ -1,13 +1,13 @@
-bug391.scala:2: error: identifier expected but 'def' found.
+t391.scala:2: error: identifier expected but 'def' found.
   def fun1(def x: Int): Int = x; // the "def x" is illegal
            ^
-bug391.scala:4: error: ':' expected but '}' found.
+t391.scala:4: error: ':' expected but '}' found.
 }
 ^
-bug391.scala:6: error: identifier expected but 'def' found.
+t391.scala:6: error: identifier expected but 'def' found.
 class E(def x: Int); // the "def x" is illegal
         ^
-bug391.scala:6: error: ':' expected but eof found.
+t391.scala:6: error: ':' expected but eof found.
 class E(def x: Int); // the "def x" is illegal
                                               ^
 four errors found
diff --git a/test/files/neg/bug391.scala b/test/files/neg/t391.scala
index 08c083baa5..08c083baa5 100644
--- a/test/files/neg/bug391.scala
+++ b/test/files/neg/t391.scala
diff --git a/test/files/neg/t3913.check b/test/files/neg/t3913.check
new file mode 100644
index 0000000000..d85e5c5bea
--- /dev/null
+++ b/test/files/neg/t3913.check
@@ -0,0 +1,4 @@
+t3913.scala:2: error: super constructor cannot be passed a self reference unless parameter is declared by-name
+object LimboStage  extends Stage( Set( LimboStage ))
+                                       ^
+one error found
diff --git a/test/files/neg/bug3913.scala b/test/files/neg/t3913.scala
index e0917ff3e3..e0917ff3e3 100644
--- a/test/files/neg/bug3913.scala
+++ b/test/files/neg/t3913.scala
diff --git a/test/files/neg/t4069.check b/test/files/neg/t4069.check
new file mode 100644
index 0000000000..91bf882cec
--- /dev/null
+++ b/test/files/neg/t4069.check
@@ -0,0 +1,16 @@
+t4069.scala:7: error: unexpected end of input: possible missing '}' in XML block
+          case 2 =>
+          ^
+t4069.scala:6: error: Missing closing brace `}' assumed here
+            </div>
+            ^
+t4069.scala:9: error: in XML literal: in XML content, please use '}}' to express '}'
+        }
+        ^
+t4069.scala:4: error:  I encountered a '}' where I didn't expect one, maybe this tag isn't closed <div>
+            <div>
+             ^
+t4069.scala:10: error: '}' expected but eof found.
+}
+^
+5 errors found
diff --git a/test/files/neg/bug4069.scala b/test/files/neg/t4069.scala
index 80df6ec16d..80df6ec16d 100644
--- a/test/files/neg/bug4069.scala
+++ b/test/files/neg/t4069.scala
diff --git a/test/files/neg/bug409.check b/test/files/neg/t409.check
index 25e5a41d16..433d64d25d 100644
--- a/test/files/neg/bug409.check
+++ b/test/files/neg/t409.check
@@ -1,4 +1,4 @@
-bug409.scala:6: error: traits or objects may not have parameters
+t409.scala:6: error: traits or objects may not have parameters
 class Toto extends Expr with Case1(12);
                                   ^
 one error found
diff --git a/test/files/neg/bug409.scala b/test/files/neg/t409.scala
index 5dac2fdaa4..5dac2fdaa4 100644
--- a/test/files/neg/bug409.scala
+++ b/test/files/neg/t409.scala
diff --git a/test/files/neg/bug412.check b/test/files/neg/t412.check
index f25ad6fa7e..9cb467e854 100644
--- a/test/files/neg/bug412.check
+++ b/test/files/neg/t412.check
@@ -1,4 +1,4 @@
-bug412.scala:11: error: stable identifier required, but A.this.c found.
+t412.scala:11: error: stable identifier required, but A.this.c found.
  Note that value c is not stable because its type, A.this.CX with A.this.C2, is volatile.
     def castA(x: c.T): T2 = x;
                  ^
diff --git a/test/files/neg/bug412.scala b/test/files/neg/t412.scala
index 54cd90da1c..54cd90da1c 100644
--- a/test/files/neg/bug412.scala
+++ b/test/files/neg/t412.scala
diff --git a/test/files/neg/bug414.check b/test/files/neg/t414.check
index 91bb39caf2..a855497648 100644
--- a/test/files/neg/bug414.check
+++ b/test/files/neg/t414.check
@@ -1,10 +1,10 @@
-bug414.scala:5: error: pattern type is incompatible with expected type;
+t414.scala:5: error: pattern type is incompatible with expected type;
  found   : object Empty
  required: IntMap[a]
 Note: if you intended to match against the class, try `case _: Empty[_]` or `case Empty()`
                 case Empty =>
                      ^
-bug414.scala:7: error: type mismatch;
+t414.scala:7: error: type mismatch;
  found   : Unit
  required: a
                 case _ =>
diff --git a/test/files/neg/bug414.scala b/test/files/neg/t414.scala
index 2bc83eedcb..2bc83eedcb 100644
--- a/test/files/neg/bug414.scala
+++ b/test/files/neg/t414.scala
diff --git a/test/files/neg/bug4158.check b/test/files/neg/t4158.check
index 0d9873dc32..db61ff2ec4 100644
--- a/test/files/neg/bug4158.check
+++ b/test/files/neg/t4158.check
@@ -1,4 +1,4 @@
-bug4158.scala:3: error: type mismatch;
+t4158.scala:3: error: type mismatch;
  found   : Null(null)
  required: Int
 Note that implicit conversions are not applicable because they are ambiguous:
@@ -7,7 +7,7 @@ Note that implicit conversions are not applicable because they are ambiguous:
  are possible conversion functions from Null(null) to Int
   var y = null: Int
           ^
-bug4158.scala:2: error: type mismatch;
+t4158.scala:2: error: type mismatch;
  found   : Null(null)
  required: Int
 Note that implicit conversions are not applicable because they are ambiguous:
diff --git a/test/files/neg/bug4158.scala b/test/files/neg/t4158.scala
index 07aa69a95c..07aa69a95c 100644
--- a/test/files/neg/bug4158.scala
+++ b/test/files/neg/t4158.scala
diff --git a/test/files/neg/bug4166.check b/test/files/neg/t4166.check
index 938dad1488..24129c54ad 100644
--- a/test/files/neg/bug4166.check
+++ b/test/files/neg/t4166.check
@@ -1,4 +1,4 @@
-bug4166.scala:3: error: super constructor arguments cannot reference unconstructed `this`
+t4166.scala:3: error: super constructor arguments cannot reference unconstructed `this`
 class Demo extends Base(new { Demo.this }) {
                               ^
 one error found
diff --git a/test/files/neg/bug4166.scala b/test/files/neg/t4166.scala
index c20796c43c..c20796c43c 100644
--- a/test/files/neg/bug4166.scala
+++ b/test/files/neg/t4166.scala
diff --git a/test/files/neg/bug4174.check b/test/files/neg/t4174.check
index 4881c000ea..914fcff76e 100644
--- a/test/files/neg/bug4174.check
+++ b/test/files/neg/t4174.check
@@ -1,4 +1,4 @@
-bug4174.scala:7: error: method bar overrides nothing
+t4174.scala:7: error: method bar overrides nothing
     foo(new C { override def bar = 1 })
                              ^
 one error found
diff --git a/test/files/neg/bug4174.scala b/test/files/neg/t4174.scala
index b4a5ab29da..b4a5ab29da 100644
--- a/test/files/neg/bug4174.scala
+++ b/test/files/neg/t4174.scala
diff --git a/test/files/neg/bug0418.check b/test/files/neg/t418.check
index 08bd24bf29..1489547823 100644
--- a/test/files/neg/bug0418.check
+++ b/test/files/neg/t418.check
@@ -1,7 +1,7 @@
-bug0418.scala:2: error: not found: value Foo12340771
+t418.scala:2: error: not found: value Foo12340771
   null match { case Foo12340771.Bar(x) => x }
                     ^
-bug0418.scala:2: error: not found: value x
+t418.scala:2: error: not found: value x
   null match { case Foo12340771.Bar(x) => x }
                                           ^
 two errors found
diff --git a/test/files/neg/bug418.scala b/test/files/neg/t418.scala
index 67007010d4..67007010d4 100644
--- a/test/files/neg/bug418.scala
+++ b/test/files/neg/t418.scala
diff --git a/test/files/neg/bug4196.check b/test/files/neg/t4196.check
index 0905d2e6a7..a0586819e9 100644
--- a/test/files/neg/bug4196.check
+++ b/test/files/neg/t4196.check
@@ -1,4 +1,4 @@
-bug4196.scala:5: error: Some[String] does not take parameters
+t4196.scala:5: error: Some[String] does not take parameters
   }.apply("first param") ("spurious param")
                          ^
 one error found
diff --git a/test/files/neg/bug4196.scala b/test/files/neg/t4196.scala
index 06e1f28d54..06e1f28d54 100644
--- a/test/files/neg/bug4196.scala
+++ b/test/files/neg/t4196.scala
diff --git a/test/files/neg/bug421.check b/test/files/neg/t421.check
index 71daba2881..e81df52ab0 100644
--- a/test/files/neg/bug421.check
+++ b/test/files/neg/t421.check
@@ -1,4 +1,4 @@
-bug421.scala:5: error: star patterns must correspond with varargs parameters
+t421.scala:5: error: star patterns must correspond with varargs parameters
     case Bar("foo",_*) => error("huh?");
                     ^
 one error found
diff --git a/test/files/neg/bug421.scala b/test/files/neg/t421.scala
index 43f6c9dafd..43f6c9dafd 100644
--- a/test/files/neg/bug421.scala
+++ b/test/files/neg/t421.scala
diff --git a/test/files/neg/t4217.check b/test/files/neg/t4217.check
new file mode 100644
index 0000000000..e8cd5fd69e
--- /dev/null
+++ b/test/files/neg/t4217.check
@@ -0,0 +1,4 @@
+t4217.scala:2: error: 'case' expected but '}' found.
+  42 match { } 
+             ^
+one error found
diff --git a/test/files/neg/bug4217.scala b/test/files/neg/t4217.scala
index 0817df2cb7..0817df2cb7 100644
--- a/test/files/neg/bug4217.scala
+++ b/test/files/neg/t4217.scala
diff --git a/test/files/neg/bug4221.check b/test/files/neg/t4221.check
index 471332e3c1..46c2d10a98 100644
--- a/test/files/neg/bug4221.check
+++ b/test/files/neg/t4221.check
@@ -1,4 +1,4 @@
-bug4221.scala:8: error: type mismatch;
+t4221.scala:8: error: type mismatch;
  found   : Unit
  required: Wrapper[S]
   def wrap[S <: Cl#Sub[S]](v: S): Wrapper[S] = {
diff --git a/test/files/neg/bug4221.scala b/test/files/neg/t4221.scala
index 0a8b8add18..0a8b8add18 100644
--- a/test/files/neg/bug4221.scala
+++ b/test/files/neg/t4221.scala
diff --git a/test/files/neg/bug4302.check b/test/files/neg/t4302.check
index ca33748cfd..327425acb0 100644
--- a/test/files/neg/bug4302.check
+++ b/test/files/neg/t4302.check
@@ -1,4 +1,4 @@
-bug4302.scala:2: error: abstract type T in type T is unchecked since it is eliminated by erasure
+t4302.scala:2: error: abstract type T in type T is unchecked since it is eliminated by erasure
   def hasMatch[T](x: AnyRef) = x.isInstanceOf[T]
                                              ^
 one error found
diff --git a/test/files/neg/bug4302.flags b/test/files/neg/t4302.flags
index 779916d58f..779916d58f 100644
--- a/test/files/neg/bug4302.flags
+++ b/test/files/neg/t4302.flags
diff --git a/test/files/neg/bug4302.scala b/test/files/neg/t4302.scala
index 53565f05c2..53565f05c2 100644
--- a/test/files/neg/bug4302.scala
+++ b/test/files/neg/t4302.scala
diff --git a/test/files/neg/t4419.check b/test/files/neg/t4419.check
new file mode 100644
index 0000000000..8a5d95ca4e
--- /dev/null
+++ b/test/files/neg/t4419.check
@@ -0,0 +1,4 @@
+t4419.scala:2: error: forward reference extends over definition of value b
+  { val b = a; val a = 1 }
+            ^
+one error found
diff --git a/test/files/neg/bug4419.scala b/test/files/neg/t4419.scala
index 38a34be489..38a34be489 100644
--- a/test/files/neg/bug4419.scala
+++ b/test/files/neg/t4419.scala
diff --git a/test/files/neg/bug452.check b/test/files/neg/t452.check
index ac23ebc560..85197af21b 100644
--- a/test/files/neg/bug452.check
+++ b/test/files/neg/t452.check
@@ -1,4 +1,4 @@
-bug452.scala:3: error: type mismatch;
+t452.scala:3: error: type mismatch;
  found   : Test.type (with underlying type object Test)
  required: Test.Foo
     def this() = this(this);
diff --git a/test/files/neg/bug452.scala b/test/files/neg/t452.scala
index 855406d0c4..855406d0c4 100644
--- a/test/files/neg/bug452.scala
+++ b/test/files/neg/t452.scala
diff --git a/test/files/neg/bug4537.check b/test/files/neg/t4537.check
index 931bcd0405..931bcd0405 100644
--- a/test/files/neg/bug4537.check
+++ b/test/files/neg/t4537.check
diff --git a/test/files/neg/bug4537/a.scala b/test/files/neg/t4537/a.scala
index 65e183c5f8..65e183c5f8 100644
--- a/test/files/neg/bug4537/a.scala
+++ b/test/files/neg/t4537/a.scala
diff --git a/test/files/neg/bug4537/b.scala b/test/files/neg/t4537/b.scala
index bb9dd4e15a..bb9dd4e15a 100644
--- a/test/files/neg/bug4537/b.scala
+++ b/test/files/neg/t4537/b.scala
diff --git a/test/files/neg/bug4537/c.scala b/test/files/neg/t4537/c.scala
index 379599112d..379599112d 100644
--- a/test/files/neg/bug4537/c.scala
+++ b/test/files/neg/t4537/c.scala
diff --git a/test/files/neg/bug4584.check b/test/files/neg/t4584.check
index 0008d9efa5..3380f02e85 100644
--- a/test/files/neg/bug4584.check
+++ b/test/files/neg/t4584.check
@@ -1,4 +1,4 @@
-bug4584.scala:1: error: incomplete unicode escape
+t4584.scala:1: error: incomplete unicode escape
 class A { val \u2
                 ^
 one error found
diff --git a/test/files/neg/bug4584.scala b/test/files/neg/t4584.scala
index b34aba91a2..b34aba91a2 100644
--- a/test/files/neg/bug4584.scala
+++ b/test/files/neg/t4584.scala
diff --git a/test/files/neg/t464-neg.check b/test/files/neg/t464-neg.check
new file mode 100644
index 0000000000..aea1987b2e
--- /dev/null
+++ b/test/files/neg/t464-neg.check
@@ -0,0 +1,16 @@
+t464-neg.scala:7: error: not found: value f1
+  f1()
+  ^
+t464-neg.scala:8: error: method f1 in class A cannot be accessed in A with ScalaObject
+  super.f1()
+        ^
+t464-neg.scala:9: error: value f2 is not a member of B
+  def otherb(b2: B) = b2.f2()
+                         ^
+t464-neg.scala:10: error: method f3 in class A cannot be accessed in B
+  f3()
+  ^
+t464-neg.scala:11: error: method f3 in class A cannot be accessed in A with ScalaObject
+  super.f3()
+        ^
+5 errors found
diff --git a/test/files/neg/bug464-neg.scala b/test/files/neg/t464-neg.scala
index 138fa8e869..138fa8e869 100644
--- a/test/files/neg/bug464-neg.scala
+++ b/test/files/neg/t464-neg.scala
diff --git a/test/files/neg/bug4727.check b/test/files/neg/t4727.check
index cac35b1548..9fa0fa54d1 100644
--- a/test/files/neg/bug4727.check
+++ b/test/files/neg/t4727.check
@@ -1,4 +1,4 @@
-bug4727.scala:5: error: type mismatch;
+t4727.scala:5: error: type mismatch;
  found   : Null
  required: Int
 Note that implicit conversions are not applicable because they are ambiguous:
diff --git a/test/files/neg/bug4727.scala b/test/files/neg/t4727.scala
index 40c06713ca..40c06713ca 100644
--- a/test/files/neg/bug4727.scala
+++ b/test/files/neg/t4727.scala
diff --git a/test/files/neg/t473.check b/test/files/neg/t473.check
new file mode 100644
index 0000000000..a14222c962
--- /dev/null
+++ b/test/files/neg/t473.check
@@ -0,0 +1,4 @@
+t473.scala:3: error: super constructor cannot be passed a self reference unless parameter is declared by-name
+case object Voop extends Foo(Voop)
+                             ^
+one error found
diff --git a/test/files/neg/bug473.scala b/test/files/neg/t473.scala
index c7631705ac..c7631705ac 100644
--- a/test/files/neg/bug473.scala
+++ b/test/files/neg/t473.scala
diff --git a/test/files/neg/bug4851.check b/test/files/neg/t4851.check
index 8011350f23..8011350f23 100644
--- a/test/files/neg/bug4851.check
+++ b/test/files/neg/t4851.check
diff --git a/test/files/neg/bug4851.flags b/test/files/neg/t4851.flags
index 0545cb8b84..0545cb8b84 100644
--- a/test/files/neg/bug4851.flags
+++ b/test/files/neg/t4851.flags
diff --git a/test/files/neg/bug4851/J.java b/test/files/neg/t4851/J.java
index 9c35b8a16e..9c35b8a16e 100644
--- a/test/files/neg/bug4851/J.java
+++ b/test/files/neg/t4851/J.java
diff --git a/test/files/neg/bug4851/J2.java b/test/files/neg/t4851/J2.java
index 82954d9489..82954d9489 100644
--- a/test/files/neg/bug4851/J2.java
+++ b/test/files/neg/t4851/J2.java
diff --git a/test/files/neg/bug4851/S.scala b/test/files/neg/t4851/S.scala
index deb42980ab..deb42980ab 100644
--- a/test/files/neg/bug4851/S.scala
+++ b/test/files/neg/t4851/S.scala
diff --git a/test/files/neg/bug4877.check b/test/files/neg/t4877.check
index 6970271c40..5a5561b070 100644
--- a/test/files/neg/bug4877.check
+++ b/test/files/neg/t4877.check
@@ -1,19 +1,19 @@
-bug4877.scala:4: error: type mismatch;
+t4877.scala:4: error: type mismatch;
  found   : java.lang.Object{def bar: Int}
  required: AnyRef{def bar: String}
   def foo: AnyRef { def bar: String } = new AnyRef { def bar = 42 }
                                         ^
-bug4877.scala:6: error: type mismatch;
+t4877.scala:6: error: type mismatch;
  found   : java.lang.Object{def bar(x: Int): java.lang.String}
  required: AnyRef{def bar(x: Int): Int}
   def foo3: AnyRef { def bar(x: Int): Int } = new AnyRef { def bar(x: Int) = "abc" }
                                               ^
-bug4877.scala:7: error: type mismatch;
+t4877.scala:7: error: type mismatch;
  found   : java.lang.Object with C{def bar(x: Int): Int}
  required: C{def bar(x: Int): Int; def quux(x: Int): Int}
   def foo4: C { def bar(x: Int): Int ; def quux(x: Int): Int } = new C { def bar(x: Int) = 5 }
                                                                  ^
-bug4877.scala:17: error: type mismatch;
+t4877.scala:17: error: type mismatch;
  found   : java.lang.Object{type Mom = String; def bar(x: Int): Int; def bippy(): List[Int]}
  required: B.this.Bippy    (which expands to)
              AnyRef{type Mom; def bar(x: Int): this.Mom; def bippy(): List[this.Mom]}
diff --git a/test/files/neg/bug4877.flags b/test/files/neg/t4877.flags
index 7ccd56103a..7ccd56103a 100644
--- a/test/files/neg/bug4877.flags
+++ b/test/files/neg/t4877.flags
diff --git a/test/files/neg/bug4877.scala b/test/files/neg/t4877.scala
index 5d97877518..5d97877518 100644
--- a/test/files/neg/bug4877.scala
+++ b/test/files/neg/t4877.scala
diff --git a/test/files/neg/bug4879.check b/test/files/neg/t4879.check
index 6b9e452109..49f3c73cf7 100644
--- a/test/files/neg/bug4879.check
+++ b/test/files/neg/t4879.check
@@ -1,10 +1,10 @@
-bug4879.scala:6: error: pattern type is incompatible with expected type;
+t4879.scala:6: error: pattern type is incompatible with expected type;
  found   : object C
  required: C
 Note: if you intended to match against the class, try `case _: C` or `case C(_)`
     case C  => true
          ^
-bug4879.scala:10: error: pattern type is incompatible with expected type;
+t4879.scala:10: error: pattern type is incompatible with expected type;
  found   : object D
  required: D[T,U,V]
 Note: if you intended to match against the class, try `case _: D[_,_,_]` or `case D(_,_,_)`
diff --git a/test/files/neg/bug4879.scala b/test/files/neg/t4879.scala
index 7d6561e9e0..7d6561e9e0 100644
--- a/test/files/neg/bug4879.scala
+++ b/test/files/neg/t4879.scala
diff --git a/test/files/neg/bug4882.check b/test/files/neg/t4882.check
index 2987cabe7f..0aafc82770 100644
--- a/test/files/neg/bug4882.check
+++ b/test/files/neg/t4882.check
@@ -1,4 +1,4 @@
-bug4882.scala:2: error: `implicit' modifier not allowed for constructors
+t4882.scala:2: error: `implicit' modifier not allowed for constructors
   implicit def this(a: String) = this(a.toInt)
                ^
 one error found
diff --git a/test/files/neg/bug4882.scala b/test/files/neg/t4882.scala
index 4e58ef7879..4e58ef7879 100644
--- a/test/files/neg/bug4882.scala
+++ b/test/files/neg/t4882.scala
diff --git a/test/files/neg/t500.check b/test/files/neg/t500.check
new file mode 100644
index 0000000000..b3f5c85978
--- /dev/null
+++ b/test/files/neg/t500.check
@@ -0,0 +1,4 @@
+t500.scala:3: error: lower bound X does not conform to upper bound Y
+    type T >: X <: Y;
+         ^
+one error found
diff --git a/test/files/neg/bug500.scala b/test/files/neg/t500.scala
index d843d71f07..d843d71f07 100644
--- a/test/files/neg/bug500.scala
+++ b/test/files/neg/t500.scala
diff --git a/test/files/neg/bug501.check b/test/files/neg/t501.check
index 112e49aad5..3e3bf39075 100644
--- a/test/files/neg/bug501.check
+++ b/test/files/neg/t501.check
@@ -1,4 +1,4 @@
-bug501.scala:3: error: lower bound X does not conform to upper bound Y
+t501.scala:3: error: lower bound X does not conform to upper bound Y
     abstract class I { type T >: X <: Y; }
                             ^
 one error found
diff --git a/test/files/neg/bug501.scala b/test/files/neg/t501.scala
index 437ab8f21e..437ab8f21e 100644
--- a/test/files/neg/bug501.scala
+++ b/test/files/neg/t501.scala
diff --git a/test/files/neg/t510.check b/test/files/neg/t510.check
new file mode 100644
index 0000000000..355a6cdf07
--- /dev/null
+++ b/test/files/neg/t510.check
@@ -0,0 +1,4 @@
+t510.scala:19: error: cyclic aliasing or subtyping involving type T
+    def g(t: e.T): Unit = {
+          ^
+one error found
diff --git a/test/files/neg/bug510.scala b/test/files/neg/t510.scala
index a1cd2df009..a1cd2df009 100644
--- a/test/files/neg/bug510.scala
+++ b/test/files/neg/t510.scala
diff --git a/test/files/neg/bug512.check b/test/files/neg/t512.check
index f3d0e18a79..814e65e405 100644
--- a/test/files/neg/bug512.check
+++ b/test/files/neg/t512.check
@@ -1,4 +1,4 @@
-bug512.scala:3: error: not found: value something
+t512.scala:3: error: not found: value something
     val xxx = something ||
               ^
 one error found
diff --git a/test/files/neg/bug512.scala b/test/files/neg/t512.scala
index 0a0ccde75c..0a0ccde75c 100644
--- a/test/files/neg/bug512.scala
+++ b/test/files/neg/t512.scala
diff --git a/test/files/neg/bug515.check b/test/files/neg/t515.check
index a38c8b62d8..351e99aa55 100644
--- a/test/files/neg/bug515.check
+++ b/test/files/neg/t515.check
@@ -1,4 +1,4 @@
-bug515.scala:7: error: type mismatch;
+t515.scala:7: error: type mismatch;
  found   : java.lang.String
  required: Test.Truc
   val parent: Truc = file.getMachin
diff --git a/test/files/neg/bug515.scala b/test/files/neg/t515.scala
index bb2376dcab..bb2376dcab 100644
--- a/test/files/neg/bug515.scala
+++ b/test/files/neg/t515.scala
diff --git a/test/files/neg/bug520.check b/test/files/neg/t520.check
index 258f8112e3..0035f89a79 100644
--- a/test/files/neg/bug520.check
+++ b/test/files/neg/t520.check
@@ -1,4 +1,4 @@
-bug520.scala:8: error: overloaded method verifyKeyword needs result type
+t520.scala:8: error: overloaded method verifyKeyword needs result type
       verifyKeyword("", source, pos);
                    ^
 one error found
diff --git a/test/files/neg/bug520.scala b/test/files/neg/t520.scala
index 076aca3122..076aca3122 100644
--- a/test/files/neg/bug520.scala
+++ b/test/files/neg/t520.scala
diff --git a/test/files/neg/t521.check b/test/files/neg/t521.check
new file mode 100644
index 0000000000..a100195655
--- /dev/null
+++ b/test/files/neg/t521.check
@@ -0,0 +1,15 @@
+t521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => String is not defined
+class PlainFile(val file : File) extends AbstractFile {}
+      ^
+t521.scala:13: error: overriding value file in class PlainFile of type java.io.File;
+ value file needs `override' modifier
+final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
+                           ^
+t521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => String is not defined
+final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
+            ^
+t521.scala:15: error: overriding value path in class VirtualFile of type String;
+ method path needs to be a stable, immutable value
+    override def path = "";
+                 ^
+four errors found
diff --git a/test/files/neg/bug521.scala b/test/files/neg/t521.scala
index c6afebc0be..c6afebc0be 100644
--- a/test/files/neg/bug521.scala
+++ b/test/files/neg/t521.scala
diff --git a/test/files/neg/t545.check b/test/files/neg/t545.check
new file mode 100644
index 0000000000..8ebbf9bdf6
--- /dev/null
+++ b/test/files/neg/t545.check
@@ -0,0 +1,7 @@
+t545.scala:4: error: value blah is not a member of Test.Foo
+  val x = foo.blah match {
+              ^
+t545.scala:5: error: recursive value x needs type
+    case List(x) => x
+                    ^
+two errors found
diff --git a/test/files/neg/bug545.scala b/test/files/neg/t545.scala
index f1f9909dcb..f1f9909dcb 100644
--- a/test/files/neg/bug545.scala
+++ b/test/files/neg/t545.scala
diff --git a/test/files/neg/t550.check b/test/files/neg/t550.check
new file mode 100644
index 0000000000..da862e110e
--- /dev/null
+++ b/test/files/neg/t550.check
@@ -0,0 +1,7 @@
+t550.scala:6: error: type List takes type parameters
+  def sum[a](xs: List)(implicit m: Monoid[a]): a =
+                 ^
+t550.scala:8: error: could not find implicit value for parameter m: Monoid[a]
+  sum(List(1,2,3))
+     ^
+two errors found
diff --git a/test/files/neg/bug550.scala b/test/files/neg/t550.scala
index 5212a2658d..5212a2658d 100644
--- a/test/files/neg/bug550.scala
+++ b/test/files/neg/t550.scala
diff --git a/test/files/neg/bug556.check b/test/files/neg/t556.check
index 26aa2f1129..c278e13991 100644
--- a/test/files/neg/bug556.check
+++ b/test/files/neg/t556.check
@@ -1,4 +1,4 @@
-bug556.scala:3: error: wrong number of parameters; expected = 1
+t556.scala:3: error: wrong number of parameters; expected = 1
   def g:Int = f((x,y)=>x)
                      ^
 one error found
diff --git a/test/files/neg/bug556.scala b/test/files/neg/t556.scala
index b0113258c9..b0113258c9 100644
--- a/test/files/neg/bug556.scala
+++ b/test/files/neg/t556.scala
diff --git a/test/files/neg/bug558.check b/test/files/neg/t558.check
index 061f64f7bb..f33ddc451f 100644
--- a/test/files/neg/bug558.check
+++ b/test/files/neg/t558.check
@@ -1,4 +1,4 @@
-bug558.scala:13: error: value file is not a member of NewModel.this.RootURL
+t558.scala:13: error: value file is not a member of NewModel.this.RootURL
     final val source = top.file;
                            ^
 one error found
diff --git a/test/files/neg/bug558.scala b/test/files/neg/t558.scala
index 58b030347c..58b030347c 100644
--- a/test/files/neg/bug558.scala
+++ b/test/files/neg/t558.scala
diff --git a/test/files/neg/bug562.check b/test/files/neg/t562.check
index 638d758b8d..8c3823642a 100644
--- a/test/files/neg/bug562.check
+++ b/test/files/neg/t562.check
@@ -1,4 +1,4 @@
-bug562.scala:10: error: super may be not be used on value y
+t562.scala:10: error: super may be not be used on value y
   override val y = super.y;
                          ^
 one error found
diff --git a/test/files/neg/bug562.scala b/test/files/neg/t562.scala
index c4a6e61742..c4a6e61742 100644
--- a/test/files/neg/bug562.scala
+++ b/test/files/neg/t562.scala
diff --git a/test/files/neg/bug563.check b/test/files/neg/t563.check
index c592a56100..1431c85eb0 100644
--- a/test/files/neg/bug563.check
+++ b/test/files/neg/t563.check
@@ -1,4 +1,4 @@
-bug563.scala:6: error: missing parameter type
+t563.scala:6: error: missing parameter type
             map(n,ptr => Option(ptr.get));
                   ^
 one error found
diff --git a/test/files/neg/bug563.scala b/test/files/neg/t563.scala
index 204ad3cbdd..204ad3cbdd 100644
--- a/test/files/neg/bug563.scala
+++ b/test/files/neg/t563.scala
diff --git a/test/files/neg/bug565.check b/test/files/neg/t565.check
index 47a1ebd169..136cc94b6f 100644
--- a/test/files/neg/bug565.check
+++ b/test/files/neg/t565.check
@@ -1,4 +1,4 @@
-bug565.scala:2: error: only classes can have declared but undefined members
+t565.scala:2: error: only classes can have declared but undefined members
 (Note that variables need to be initialized to be defined)
   var s0: String
       ^
diff --git a/test/files/neg/bug565.scala b/test/files/neg/t565.scala
index 9a4732fcc3..9a4732fcc3 100644
--- a/test/files/neg/bug565.scala
+++ b/test/files/neg/t565.scala
diff --git a/test/files/neg/bug576.check b/test/files/neg/t576.check
index b496ccafd4..7105c92866 100644
--- a/test/files/neg/bug576.check
+++ b/test/files/neg/t576.check
@@ -1,4 +1,4 @@
-bug576.scala:14: error: overloaded method insert needs result type
+t576.scala:14: error: overloaded method insert needs result type
       if (true) sibling.insert(node);
                               ^
 one error found
diff --git a/test/files/neg/bug576.scala b/test/files/neg/t576.scala
index fd83217a45..fd83217a45 100644
--- a/test/files/neg/bug576.scala
+++ b/test/files/neg/t576.scala
diff --git a/test/files/neg/t585.check b/test/files/neg/t585.check
new file mode 100644
index 0000000000..d332ac5414
--- /dev/null
+++ b/test/files/neg/t585.check
@@ -0,0 +1,4 @@
+t585.scala:1: error: unclosed comment
+/*
+^
+one error found
diff --git a/test/files/neg/bug585.scala b/test/files/neg/t585.scala
index 0875e2cb0f..0875e2cb0f 100644
--- a/test/files/neg/bug585.scala
+++ b/test/files/neg/t585.scala
diff --git a/test/files/neg/bug588.check b/test/files/neg/t588.check
index 8c01ac5b09..f8b5516fdc 100644
--- a/test/files/neg/bug588.check
+++ b/test/files/neg/t588.check
@@ -1,10 +1,10 @@
-bug588.scala:3: error: double definition:
+t588.scala:3: error: double definition:
 method visit:(f: Int => String)Boolean and
 method visit:(f: Int => Unit)Boolean at line 2
 have same type after erasure: (f: Function1)Boolean
   def visit(f: Int => String): Boolean
       ^
-bug588.scala:10: error: double definition:
+t588.scala:10: error: double definition:
 method f:(brac: Test.this.TypeB)Unit and
 method f:(node: Test.this.TypeA)Unit at line 9
 have same type after erasure: (brac: Test#TraitA)Unit
diff --git a/test/files/neg/bug588.scala b/test/files/neg/t588.scala
index f30937377e..f30937377e 100644
--- a/test/files/neg/bug588.scala
+++ b/test/files/neg/t588.scala
diff --git a/test/files/neg/bug591.check b/test/files/neg/t591.check
index 2c2e08da99..434c2dd002 100644
--- a/test/files/neg/bug591.check
+++ b/test/files/neg/t591.check
@@ -1,4 +1,4 @@
-bug591.scala:38: error: method input_= is defined twice
+t591.scala:38: error: method input_= is defined twice
     def input_=(in : Input) = {}
         ^
 one error found
diff --git a/test/files/neg/bug591.scala b/test/files/neg/t591.scala
index 0f0b02395c..0f0b02395c 100644
--- a/test/files/neg/bug591.scala
+++ b/test/files/neg/t591.scala
diff --git a/test/files/neg/t593.check b/test/files/neg/t593.check
new file mode 100644
index 0000000000..c1aeab8ec4
--- /dev/null
+++ b/test/files/neg/t593.check
@@ -0,0 +1,4 @@
+t593.scala:1: error: traits or objects may not have parameters
+trait Wrapper[T](x : T) {
+                ^
+one error found
diff --git a/test/files/neg/bug593.scala b/test/files/neg/t593.scala
index df7199a42a..df7199a42a 100644
--- a/test/files/neg/bug593.scala
+++ b/test/files/neg/t593.scala
diff --git a/test/files/neg/bug608.check b/test/files/neg/t608.check
index a8e32e4c10..5c7f49d004 100644
--- a/test/files/neg/bug608.check
+++ b/test/files/neg/t608.check
@@ -1,4 +1,4 @@
-bug608.scala:16: error: type mismatch;
+t608.scala:16: error: type mismatch;
  found   : hs{type a = ha}
  required: hs{type s = hs; type a = ha}
        = g(f(x).bimap(id))
diff --git a/test/files/neg/bug608.scala b/test/files/neg/t608.scala
index 34dc4c0352..34dc4c0352 100644
--- a/test/files/neg/bug608.scala
+++ b/test/files/neg/t608.scala
diff --git a/test/files/neg/bug630.check b/test/files/neg/t630.check
index 739d214fe5..0814ef0c18 100644
--- a/test/files/neg/bug630.check
+++ b/test/files/neg/t630.check
@@ -1,4 +1,4 @@
-bug630.scala:20: error: overriding value foo in trait Bar of type Req2;
+t630.scala:20: error: overriding value foo in trait Bar of type Req2;
  object foo has incompatible type
         object foo extends Req1
                ^
diff --git a/test/files/neg/bug630.scala b/test/files/neg/t630.scala
index 8a073963b0..8a073963b0 100644
--- a/test/files/neg/bug630.scala
+++ b/test/files/neg/t630.scala
diff --git a/test/files/neg/t631.check b/test/files/neg/t631.check
new file mode 100644
index 0000000000..3759565e11
--- /dev/null
+++ b/test/files/neg/t631.check
@@ -0,0 +1,4 @@
+t631.scala:1: error: `implicit' modifier cannot be used for top-level objects
+implicit object Test {
+                ^
+one error found
diff --git a/test/files/neg/bug631.scala b/test/files/neg/t631.scala
index 631db3eb10..631db3eb10 100644
--- a/test/files/neg/bug631.scala
+++ b/test/files/neg/t631.scala
diff --git a/test/files/neg/bug633.check b/test/files/neg/t633.check
index 90f2f42c18..d69d3be70e 100644
--- a/test/files/neg/bug633.check
+++ b/test/files/neg/t633.check
@@ -1,4 +1,4 @@
-bug633.scala:3: error: not found: type ListBuffer
+t633.scala:3: error: not found: type ListBuffer
         def t(a : ListBuffer[String]) = {
                   ^
 one error found
diff --git a/test/files/neg/bug633.scala b/test/files/neg/t633.scala
index fd4e560720..fd4e560720 100644
--- a/test/files/neg/bug633.scala
+++ b/test/files/neg/t633.scala
diff --git a/test/files/neg/t639.check b/test/files/neg/t639.check
new file mode 100644
index 0000000000..3b53da0515
--- /dev/null
+++ b/test/files/neg/t639.check
@@ -0,0 +1,4 @@
+t639.scala:3: error: not found: object a
+import a._
+       ^
+one error found
diff --git a/test/files/neg/bug639.scala b/test/files/neg/t639.scala
index eaeed944a4..eaeed944a4 100644
--- a/test/files/neg/bug639.scala
+++ b/test/files/neg/t639.scala
diff --git a/test/files/neg/t649.check b/test/files/neg/t649.check
new file mode 100644
index 0000000000..5a270d4751
--- /dev/null
+++ b/test/files/neg/t649.check
@@ -0,0 +1,4 @@
+t649.scala:3: error: overloaded method foo needs result type
+  def foo[A] = foo[A]
+                  ^
+one error found
diff --git a/test/files/neg/bug649.scala b/test/files/neg/t649.scala
index 2519eb5cf3..2519eb5cf3 100644
--- a/test/files/neg/bug649.scala
+++ b/test/files/neg/t649.scala
diff --git a/test/files/neg/bug650.check b/test/files/neg/t650.check
index 1120d68879..320ae66704 100644
--- a/test/files/neg/bug650.check
+++ b/test/files/neg/t650.check
@@ -1,4 +1,4 @@
-bug650.scala:4: error: missing type arguments
+t650.scala:4: error: missing type arguments
 trait Test2 extends LinkedList;
                     ^
 one error found
diff --git a/test/files/neg/bug650.scala b/test/files/neg/t650.scala
index cdb4b3da47..cdb4b3da47 100644
--- a/test/files/neg/bug650.scala
+++ b/test/files/neg/t650.scala
diff --git a/test/files/neg/bug663.check b/test/files/neg/t663.check
index 6ae7198f0d..a790a7d70a 100644
--- a/test/files/neg/bug663.check
+++ b/test/files/neg/t663.check
@@ -1,4 +1,4 @@
-bug663.scala:11: error: name clash between defined and inherited member:
+t663.scala:11: error: name clash between defined and inherited member:
 method asMatch:(m: Test.this.Node)Any and
 method asMatch:(node: Test.this.Matchable)Any in trait MatchableImpl
 have same type after erasure: (m: test.Test#NodeImpl)java.lang.Object
diff --git a/test/files/neg/bug663.scala b/test/files/neg/t663.scala
index 797c4a300d..797c4a300d 100644
--- a/test/files/neg/bug663.scala
+++ b/test/files/neg/t663.scala
diff --git a/test/files/neg/t664.check b/test/files/neg/t664.check
new file mode 100644
index 0000000000..43a6bea074
--- /dev/null
+++ b/test/files/neg/t664.check
@@ -0,0 +1,7 @@
+t664.scala:4: error: type Foo is not a member of test.Test with ScalaObject
+  trait Foo extends super.Foo {
+                          ^
+t664.scala:5: error: type Bar is not a member of AnyRef with ScalaObject
+    trait Bar extends super.Bar;
+                            ^
+two errors found
diff --git a/test/files/neg/bug664.scala b/test/files/neg/t664.scala
index f3b8d06053..f3b8d06053 100644
--- a/test/files/neg/bug664.scala
+++ b/test/files/neg/t664.scala
diff --git a/test/files/neg/bug667.check b/test/files/neg/t667.check
index 704e3178ff..d4367bc87b 100644
--- a/test/files/neg/bug667.check
+++ b/test/files/neg/t667.check
@@ -1,4 +1,4 @@
-bug667.scala:8: error: class Ni inherits itself
+t667.scala:8: error: class Ni inherits itself
     class Ni extends super.Ni with Ni;
                                    ^
 one error found
diff --git a/test/files/neg/bug667.scala b/test/files/neg/t667.scala
index a79bc272e4..a79bc272e4 100644
--- a/test/files/neg/bug667.scala
+++ b/test/files/neg/t667.scala
diff --git a/test/files/neg/bug668.check b/test/files/neg/t668.check
index 10be0c8d14..b057ca7936 100644
--- a/test/files/neg/bug668.check
+++ b/test/files/neg/t668.check
@@ -1,4 +1,4 @@
-bug668.scala:1: error: type Iterable takes type parameters
+t668.scala:1: error: type Iterable takes type parameters
 class Test extends Iterable
                    ^
 one error found
diff --git a/test/files/neg/bug668.scala b/test/files/neg/t668.scala
index 3256037b1e..3256037b1e 100644
--- a/test/files/neg/bug668.scala
+++ b/test/files/neg/t668.scala
diff --git a/test/files/neg/bug677.check b/test/files/neg/t677.check
index 5b0bb2705f..122830a98f 100644
--- a/test/files/neg/bug677.check
+++ b/test/files/neg/t677.check
@@ -1,4 +1,4 @@
-bug677.scala:2: error: type mismatch;
+t677.scala:2: error: type mismatch;
  found   : () => Int
  required: Nothing
   val zx: Nothing = {() => 4}
diff --git a/test/files/neg/bug677.scala b/test/files/neg/t677.scala
index c65ee9640f..c65ee9640f 100644
--- a/test/files/neg/bug677.scala
+++ b/test/files/neg/t677.scala
diff --git a/test/files/neg/bug691.check b/test/files/neg/t691.check
index 47ac8c3888..77ff7b1d02 100644
--- a/test/files/neg/bug691.check
+++ b/test/files/neg/t691.check
@@ -1,4 +1,4 @@
-bug691.scala:27: error: ambiguous parent class qualifier
+t691.scala:27: error: ambiguous parent class qualifier
     trait TiC extends super[Arrow].Ti2 with super[AssignArrow].Ti1;
                       ^
 one error found
diff --git a/test/files/neg/bug691.scala b/test/files/neg/t691.scala
index 233476f658..233476f658 100644
--- a/test/files/neg/bug691.scala
+++ b/test/files/neg/t691.scala
diff --git a/test/files/neg/bug692.check b/test/files/neg/t692.check
index 9e96027899..12b7d40ba5 100644
--- a/test/files/neg/bug692.check
+++ b/test/files/neg/t692.check
@@ -1,24 +1,24 @@
-bug692.scala:3: error: not found: type T
+t692.scala:3: error: not found: type T
   trait Type[T0] extends Type0[T];
                                ^
-bug692.scala:10: error: class Foo takes type parameters
+t692.scala:10: error: class Foo takes type parameters
   case class FooType() extends ClassType[Foo,AnyRef](ObjectType());
                                          ^
-bug692.scala:13: error: class Foo takes type parameters
+t692.scala:13: error: class Foo takes type parameters
   case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
                                                                               ^
-bug692.scala:13: error: class Foo takes type parameters
+t692.scala:13: error: class Foo takes type parameters
   case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
                            ^
-bug692.scala:14: error: class Foo takes type parameters
+t692.scala:14: error: class Foo takes type parameters
   implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] = 
                                ^
-bug692.scala:15: error: type mismatch;
+t692.scala:15: error: type mismatch;
  found   : test3.this.BarType[T4]
  required: test3.this.RefType[test3.this.Bar[T4]]
     BarType(elem);
            ^
-bug692.scala:19: error: class Foo takes type parameters
+t692.scala:19: error: class Foo takes type parameters
   class Bar[A <: Foo](implicit tpeA : Type[A]) extends Foo;
                  ^
 7 errors found
diff --git a/test/files/neg/bug692.scala b/test/files/neg/t692.scala
index 24e1d2fea3..24e1d2fea3 100644
--- a/test/files/neg/bug692.scala
+++ b/test/files/neg/t692.scala
diff --git a/test/files/neg/t693.check b/test/files/neg/t693.check
new file mode 100644
index 0000000000..62325b5c60
--- /dev/null
+++ b/test/files/neg/t693.check
@@ -0,0 +1,4 @@
+t693.scala:4: error: x is already defined as value x
+  val x : Int = 10; 
+      ^
+one error found
diff --git a/test/files/neg/bug693.scala b/test/files/neg/t693.scala
index 3a9e6247a8..3a9e6247a8 100644
--- a/test/files/neg/bug693.scala
+++ b/test/files/neg/t693.scala
diff --git a/test/files/neg/bug696.check b/test/files/neg/t696.check
index 1ca740c211..ac26a864a5 100644
--- a/test/files/neg/bug696.check
+++ b/test/files/neg/t696.check
@@ -1,4 +1,4 @@
-bug696.scala:4: error: diverging implicit expansion for type TypeUtil0.Type[Any]
+t696.scala:4: error: diverging implicit expansion for type TypeUtil0.Type[Any]
 starting with method WithType in object TypeUtil0
   as[Any](null);
          ^
diff --git a/test/files/neg/bug696.scala b/test/files/neg/t696.scala
index a06a32141a..a06a32141a 100644
--- a/test/files/neg/bug696.scala
+++ b/test/files/neg/t696.scala
diff --git a/test/files/neg/t700.check b/test/files/neg/t700.check
new file mode 100644
index 0000000000..4c0a2e5fda
--- /dev/null
+++ b/test/files/neg/t700.check
@@ -0,0 +1,4 @@
+t700.scala:6: error: method foobar in trait Foo is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override'
+  def foobar: Unit = super.foobar
+                           ^
+one error found
diff --git a/test/files/neg/bug700.scala b/test/files/neg/t700.scala
index b08c8b5529..b08c8b5529 100644
--- a/test/files/neg/bug700.scala
+++ b/test/files/neg/t700.scala
diff --git a/test/files/neg/bug708.check b/test/files/neg/t708.check
index cfeb01c87f..15a9c9ed93 100644
--- a/test/files/neg/bug708.check
+++ b/test/files/neg/t708.check
@@ -1,4 +1,4 @@
-bug708.scala:8: error: overriding type S in trait X with bounds >: Nothing <: A.this.T;
+t708.scala:8: error: overriding type S in trait X with bounds >: Nothing <: A.this.T;
  type S has incompatible type
     override private[A] type S = Any;
                              ^
diff --git a/test/files/neg/bug708.scala b/test/files/neg/t708.scala
index f86a005811..f86a005811 100644
--- a/test/files/neg/bug708.scala
+++ b/test/files/neg/t708.scala
diff --git a/test/files/neg/bug712.check b/test/files/neg/t712.check
index 532eb4aec0..6819dc0ce9 100644
--- a/test/files/neg/bug712.check
+++ b/test/files/neg/t712.check
@@ -1,4 +1,4 @@
-bug712.scala:10: error: value self is not a member of B.this.ParentImpl
+t712.scala:10: error: value self is not a member of B.this.ParentImpl
   implicit def coerce(p : ParentImpl) = p.self;
                                           ^
 one error found
diff --git a/test/files/neg/bug712.scala b/test/files/neg/t712.scala
index 6f2627743f..6f2627743f 100644
--- a/test/files/neg/bug712.scala
+++ b/test/files/neg/t712.scala
diff --git a/test/files/neg/t715.check b/test/files/neg/t715.check
new file mode 100644
index 0000000000..2c01047a63
--- /dev/null
+++ b/test/files/neg/t715.check
@@ -0,0 +1,4 @@
+t715.scala:12: error: method chilren in trait NodeImpl is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override'
+    override def children = super.chilren;
+                                  ^
+one error found
diff --git a/test/files/neg/bug715.scala b/test/files/neg/t715.scala
index 87b2525a63..87b2525a63 100644
--- a/test/files/neg/bug715.scala
+++ b/test/files/neg/t715.scala
diff --git a/test/files/neg/bug729.check b/test/files/neg/t729.check
index 0b38b9bc1d..fb858dc09a 100644
--- a/test/files/neg/bug729.check
+++ b/test/files/neg/t729.check
@@ -1,4 +1,4 @@
-bug729.scala:20: error: type mismatch;
+t729.scala:20: error: type mismatch;
  found   : ScalaParserAutoEdit.this.NodeImpl(in trait Parser)
  required: ScalaParserAutoEdit.this.NodeImpl(in trait ScalaParserAutoEdit)
       val yyy : NodeImpl = link.from;
diff --git a/test/files/neg/bug729.scala b/test/files/neg/t729.scala
index 83e7f4cd1e..83e7f4cd1e 100644
--- a/test/files/neg/bug729.scala
+++ b/test/files/neg/t729.scala
diff --git a/test/files/neg/bug752.check b/test/files/neg/t752.check
index 9262f38f01..a91bba46ea 100644
--- a/test/files/neg/bug752.check
+++ b/test/files/neg/t752.check
@@ -1,4 +1,4 @@
-bug752.scala:6: error: type mismatch;
+t752.scala:6: error: type mismatch;
  found   : String => Unit
  required: Int => Unit
                 f(g _)
diff --git a/test/files/neg/bug752.scala b/test/files/neg/t752.scala
index 00f45e323c..00f45e323c 100644
--- a/test/files/neg/bug752.scala
+++ b/test/files/neg/t752.scala
diff --git a/test/files/neg/bug765.check b/test/files/neg/t765.check
index 02bd111ef7..5a5f603252 100644
--- a/test/files/neg/bug765.check
+++ b/test/files/neg/t765.check
@@ -1,4 +1,4 @@
-bug765.scala:3: error: not found: type Bar123
+t765.scala:3: error: not found: type Bar123
     val bar = new Bar123
                   ^
 one error found
diff --git a/test/files/neg/bug765.scala b/test/files/neg/t765.scala
index 3e5371b533..3e5371b533 100644
--- a/test/files/neg/bug765.scala
+++ b/test/files/neg/t765.scala
diff --git a/test/files/neg/bug766.check b/test/files/neg/t766.check
index d259db6835..92039ed1ff 100644
--- a/test/files/neg/bug766.check
+++ b/test/files/neg/t766.check
@@ -1,4 +1,4 @@
-bug766.scala:5: error: not found: value badIdentifier
+t766.scala:5: error: not found: value badIdentifier
       val p = badIdentifier
               ^
 one error found
diff --git a/test/files/neg/bug766.scala b/test/files/neg/t766.scala
index b4b04d9642..b4b04d9642 100644
--- a/test/files/neg/bug766.scala
+++ b/test/files/neg/t766.scala
diff --git a/test/files/neg/bug779.check b/test/files/neg/t779.check
index 941951900e..65f463c192 100644
--- a/test/files/neg/bug779.check
+++ b/test/files/neg/t779.check
@@ -1,4 +1,4 @@
-bug779.scala:6: error: method ast has return statement; needs result type
+t779.scala:6: error: method ast has return statement; needs result type
     override def ast = return null
                        ^
 one error found
diff --git a/test/files/neg/bug779.scala b/test/files/neg/t779.scala
index cc92f9062a..cc92f9062a 100644
--- a/test/files/neg/bug779.scala
+++ b/test/files/neg/t779.scala
diff --git a/test/files/neg/bug783.check b/test/files/neg/t783.check
index bf82edc843..37610a50ff 100644
--- a/test/files/neg/bug783.check
+++ b/test/files/neg/t783.check
@@ -1,4 +1,4 @@
-bug783.scala:12: error: type mismatch;
+t783.scala:12: error: type mismatch;
  found   : Contexts.this.Global#Template
  required: Contexts.this.global.Template
       globalInit0.Template(10, 20);
diff --git a/test/files/neg/bug783.scala b/test/files/neg/t783.scala
index 59f7c7f97d..59f7c7f97d 100644
--- a/test/files/neg/bug783.scala
+++ b/test/files/neg/t783.scala
diff --git a/test/files/neg/t798.check b/test/files/neg/t798.check
new file mode 100644
index 0000000000..b120f3a403
--- /dev/null
+++ b/test/files/neg/t798.check
@@ -0,0 +1,4 @@
+t798.scala:2: error: cyclic aliasing or subtyping involving type Bracks
+trait Test[Bracks <: Bracks] {
+           ^
+one error found
diff --git a/test/files/neg/bug798.scala b/test/files/neg/t798.scala
index a2bf66d19b..a2bf66d19b 100644
--- a/test/files/neg/bug798.scala
+++ b/test/files/neg/t798.scala
diff --git a/test/files/neg/t800.check b/test/files/neg/t800.check
new file mode 100644
index 0000000000..4bfba5420b
--- /dev/null
+++ b/test/files/neg/t800.check
@@ -0,0 +1,13 @@
+t800.scala:4: error: qualification is already defined as value qualification
+  val qualification = false;
+      ^
+t800.scala:8: error: method qualification is defined twice
+  val qualification = false;
+      ^
+t800.scala:12: error: value qualification is defined twice
+  var qualification = false;
+      ^
+t800.scala:16: error: method qualification is defined twice
+  var qualification = false;
+      ^
+four errors found
diff --git a/test/files/neg/bug800.scala b/test/files/neg/t800.scala
index 388574d42d..388574d42d 100644
--- a/test/files/neg/bug800.scala
+++ b/test/files/neg/t800.scala
diff --git a/test/files/neg/bug835.check b/test/files/neg/t835.check
index 79ea97b71f..6ad18d3028 100644
--- a/test/files/neg/bug835.check
+++ b/test/files/neg/t835.check
@@ -1,8 +1,8 @@
-bug835.scala:2: error: no `: _*' annotation allowed here
+t835.scala:2: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   Console.println(List(List(1, 2, 3) : _*, List(4, 5, 6) : _*))
                                      ^
-bug835.scala:2: error: no `: _*' annotation allowed here
+t835.scala:2: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   Console.println(List(List(1, 2, 3) : _*, List(4, 5, 6) : _*))
                                                          ^
diff --git a/test/files/neg/bug835.scala b/test/files/neg/t835.scala
index 553d2c1be4..553d2c1be4 100644
--- a/test/files/neg/bug835.scala
+++ b/test/files/neg/t835.scala
diff --git a/test/files/neg/bug836.check b/test/files/neg/t836.check
index 4949e2cd66..be3a87882b 100644
--- a/test/files/neg/bug836.check
+++ b/test/files/neg/t836.check
@@ -1,4 +1,4 @@
-bug836.scala:9: error: type mismatch;
+t836.scala:9: error: type mismatch;
  found   : Any
  required: A.this.S
   val some: S = any   // compiles => type X is set to scala.Any
diff --git a/test/files/neg/bug836.scala b/test/files/neg/t836.scala
index 3633b816c6..3633b816c6 100644
--- a/test/files/neg/bug836.scala
+++ b/test/files/neg/t836.scala
diff --git a/test/files/neg/t845.check b/test/files/neg/t845.check
new file mode 100644
index 0000000000..07ed7e417b
--- /dev/null
+++ b/test/files/neg/t845.check
@@ -0,0 +1,4 @@
+t845.scala:4: error: only classes can have declared but undefined members
+  type Bar;
+       ^
+one error found
diff --git a/test/files/neg/bug845.scala b/test/files/neg/t845.scala
index ddf6a16f32..ddf6a16f32 100644
--- a/test/files/neg/bug845.scala
+++ b/test/files/neg/t845.scala
diff --git a/test/files/neg/bug846.check b/test/files/neg/t846.check
index 9a17238c64..242a8001ff 100644
--- a/test/files/neg/bug846.check
+++ b/test/files/neg/t846.check
@@ -1,4 +1,4 @@
-bug846.scala:9: error: type mismatch;
+t846.scala:9: error: type mismatch;
  found   : Null(null)
  required: B
     if (a != null) f(a) else null
diff --git a/test/files/neg/bug846.scala b/test/files/neg/t846.scala
index acf8462030..acf8462030 100644
--- a/test/files/neg/bug846.scala
+++ b/test/files/neg/t846.scala
diff --git a/test/files/neg/bug856.check b/test/files/neg/t856.check
index 168855d6a2..d0bbde6c58 100644
--- a/test/files/neg/bug856.check
+++ b/test/files/neg/t856.check
@@ -1,4 +1,4 @@
-bug856.scala:3: error: class ComplexRect needs to be abstract, since:
+t856.scala:3: error: class ComplexRect needs to be abstract, since:
 method _2 in trait Product2 of type => Double is not defined
 method canEqual in trait Equals of type (that: Any)Boolean is not defined
 class ComplexRect(val _1:Double, _2:Double) extends Complex {
diff --git a/test/files/neg/bug856.scala b/test/files/neg/t856.scala
index fea216bfad..fea216bfad 100644
--- a/test/files/neg/bug856.scala
+++ b/test/files/neg/t856.scala
diff --git a/test/files/neg/bug875.check b/test/files/neg/t875.check
index 16a982241e..406edcf507 100644
--- a/test/files/neg/bug875.check
+++ b/test/files/neg/t875.check
@@ -1,16 +1,16 @@
-bug875.scala:3: error: no `: _*' annotation allowed here
+t875.scala:3: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   val ys = List(1, 2, 3, xs: _*)
                            ^
-bug875.scala:6: error: no `: _*' annotation allowed here
+t875.scala:6: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   mkList1(xs: _*)
             ^
-bug875.scala:15: error: no `: _*' annotation allowed here
+t875.scala:15: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   f(true, 1, xs: _*)
                ^
-bug875.scala:16: error: no `: _*' annotation allowed here
+t875.scala:16: error: no `: _*' annotation allowed here
 (such annotations are only allowed in arguments to *-parameters)
   g(1, xs:_*)
          ^
diff --git a/test/files/neg/bug875.scala b/test/files/neg/t875.scala
index 841b2aec3f..841b2aec3f 100644
--- a/test/files/neg/bug875.scala
+++ b/test/files/neg/t875.scala
diff --git a/test/files/neg/bug876.check b/test/files/neg/t876.check
index f72cc969c2..04c5c8f22e 100644
--- a/test/files/neg/bug876.check
+++ b/test/files/neg/t876.check
@@ -1,4 +1,4 @@
-bug876.scala:25: error: too many arguments for method apply: (key: AssertionError.A)manager.B in class HashMap
+t876.scala:25: error: too many arguments for method apply: (key: AssertionError.A)manager.B in class HashMap
         assert(manager.map(A2) == List(manager.map(A2, A1)))
                                                   ^
 one error found
diff --git a/test/files/neg/bug876.scala b/test/files/neg/t876.scala
index 1f6a90dff3..1f6a90dff3 100644
--- a/test/files/neg/bug876.scala
+++ b/test/files/neg/t876.scala
diff --git a/test/files/neg/bug877.check b/test/files/neg/t877.check
index ddd1154698..5f25bd439c 100644
--- a/test/files/neg/bug877.check
+++ b/test/files/neg/t877.check
@@ -1,7 +1,7 @@
-bug877.scala:3: error: Invalid literal number
+t877.scala:3: error: Invalid literal number
 trait Foo extends A(22A, Bug!) {}
                     ^
-bug877.scala:3: error: parents of traits may not have parameters
+t877.scala:3: error: parents of traits may not have parameters
 trait Foo extends A(22A, Bug!) {}
                    ^
 two errors found
diff --git a/test/files/neg/bug877.scala b/test/files/neg/t877.scala
index 5e132a1dd4..5e132a1dd4 100644
--- a/test/files/neg/bug877.scala
+++ b/test/files/neg/t877.scala
diff --git a/test/files/neg/t882.check b/test/files/neg/t882.check
new file mode 100644
index 0000000000..a906778a1a
--- /dev/null
+++ b/test/files/neg/t882.check
@@ -0,0 +1,4 @@
+t882.scala:2: error: traits cannot have type parameters with context bounds `: ...' nor view bounds `<% ...'
+trait SortedSet[A <% Ordered[A]] {
+                                 ^
+one error found
diff --git a/test/files/neg/bug882.scala b/test/files/neg/t882.scala
index 5a8908befc..5a8908befc 100644
--- a/test/files/neg/bug882.scala
+++ b/test/files/neg/t882.scala
diff --git a/test/files/neg/bug900.check b/test/files/neg/t900.check
index 95f71557b8..cede26258b 100644
--- a/test/files/neg/bug900.check
+++ b/test/files/neg/t900.check
@@ -1,4 +1,4 @@
-bug900.scala:4: error: type mismatch;
+t900.scala:4: error: type mismatch;
  found   : Foo.this.x.type (with underlying type Foo.this.bar)
  required: AnyRef
 Note that implicit conversions are not applicable because they are ambiguous:
diff --git a/test/files/neg/bug900.scala b/test/files/neg/t900.scala
index 2d2c857575..2d2c857575 100644
--- a/test/files/neg/bug900.scala
+++ b/test/files/neg/t900.scala
diff --git a/test/files/neg/t908.check b/test/files/neg/t908.check
new file mode 100644
index 0000000000..2c723a700b
--- /dev/null
+++ b/test/files/neg/t908.check
@@ -0,0 +1,4 @@
+t908.scala:8: error: not found: value makeA
+    this(makeA)
+         ^
+one error found
diff --git a/test/files/neg/bug908.scala b/test/files/neg/t908.scala
index 97f3c50586..97f3c50586 100644
--- a/test/files/neg/bug908.scala
+++ b/test/files/neg/t908.scala
diff --git a/test/files/neg/bug909.check b/test/files/neg/t909.check
index 6dbe8aa024..5138b8c507 100644
--- a/test/files/neg/bug909.check
+++ b/test/files/neg/t909.check
@@ -1,4 +1,4 @@
-bug909.scala:6: error: type mismatch;
+t909.scala:6: error: type mismatch;
  found   : java.lang.String("Hello")
  required: Int
                         case Foo("Hello") =>
diff --git a/test/files/neg/bug909.scala b/test/files/neg/t909.scala
index cd67042e02..cd67042e02 100644
--- a/test/files/neg/bug909.scala
+++ b/test/files/neg/t909.scala
diff --git a/test/files/neg/bug910.check b/test/files/neg/t910.check
index 1a845db9b9..45420f8e35 100644
--- a/test/files/neg/bug910.check
+++ b/test/files/neg/t910.check
@@ -1,4 +1,4 @@
-bug910.scala:4: error: type mismatch;
+t910.scala:4: error: type mismatch;
  found   : Seq[Char]
  required: Seq[Int]
     val y: Seq[Int] = rest
diff --git a/test/files/neg/bug910.scala b/test/files/neg/t910.scala
index cc47104d14..cc47104d14 100644
--- a/test/files/neg/bug910.scala
+++ b/test/files/neg/t910.scala
diff --git a/test/files/neg/t935.check b/test/files/neg/t935.check
new file mode 100644
index 0000000000..af634a2630
--- /dev/null
+++ b/test/files/neg/t935.check
@@ -0,0 +1,7 @@
+t935.scala:7: error: type arguments [Test3.B] do not conform to class E's type parameter bounds [T <: String]
+  @E[B](new B) val b = "hi"
+                   ^
+t935.scala:13: error: type arguments [Test4.B] do not conform to class E's type parameter bounds [T <: String]
+  val b: String @E[B](new B) = "hi"
+                 ^
+two errors found
diff --git a/test/files/neg/bug935.scala b/test/files/neg/t935.scala
index 299062adb8..299062adb8 100644
--- a/test/files/neg/bug935.scala
+++ b/test/files/neg/t935.scala
diff --git a/test/files/neg/t944.check b/test/files/neg/t944.check
new file mode 100644
index 0000000000..1fc0a12208
--- /dev/null
+++ b/test/files/neg/t944.check
@@ -0,0 +1,4 @@
+t944.scala:5: error: implementation restricts functions to 22 parameters
+           a23:Int) => 1
+                    ^
+one error found
diff --git a/test/files/neg/bug944.scala b/test/files/neg/t944.scala
index dc80e5f49f..dc80e5f49f 100644
--- a/test/files/neg/bug944.scala
+++ b/test/files/neg/t944.scala
diff --git a/test/files/neg/bug960.check b/test/files/neg/t960.check
index ebfc3c6638..d65b0cea93 100644
--- a/test/files/neg/bug960.check
+++ b/test/files/neg/t960.check
@@ -1,10 +1,10 @@
-bug960.scala:18: error: ambiguous reference to overloaded definition,
+t960.scala:18: error: ambiguous reference to overloaded definition,
 both method unapply in object List of type [a](xs: List[a])Option[Null]
 and  method unapply in object List of type [a](xs: List[a])Option[(a, List[a])]
 match argument types (List[a])
     case List(x, xs) => 7
          ^
-bug960.scala:12: error: method unapply is defined twice
+t960.scala:12: error: method unapply is defined twice
   def unapply[a](xs: List[a]): Option[Null] = xs match {
       ^
 two errors found
diff --git a/test/files/neg/bug960.scala b/test/files/neg/t960.scala
index 5101cf8433..5101cf8433 100644
--- a/test/files/neg/bug960.scala
+++ b/test/files/neg/t960.scala
diff --git a/test/files/neg/t961.check b/test/files/neg/t961.check
new file mode 100644
index 0000000000..48273f764d
--- /dev/null
+++ b/test/files/neg/t961.check
@@ -0,0 +1,4 @@
+t961.scala:11: error: object Temp.B does not take parameters
+  B() match {
+   ^
+one error found
diff --git a/test/files/neg/bug961.scala b/test/files/neg/t961.scala
index 088bddd7ee..088bddd7ee 100644
--- a/test/files/neg/bug961.scala
+++ b/test/files/neg/t961.scala
diff --git a/test/files/neg/bug987.check b/test/files/neg/t987.check
index 4cad622ab8..90ab70ba1c 100644
--- a/test/files/neg/bug987.check
+++ b/test/files/neg/t987.check
@@ -1,19 +1,19 @@
-bug987.scala:15: error: illegal inheritance;
+t987.scala:15: error: illegal inheritance;
  class E inherits different type instances of trait B:
 B[D] and B[C]
 class E extends D
       ^
-bug987.scala:20: error: illegal inheritance;
+t987.scala:20: error: illegal inheritance;
  class F inherits different type instances of trait B:
 B[D] and B[C]
 class F extends D
       ^
-bug987.scala:25: error: illegal inheritance;
+t987.scala:25: error: illegal inheritance;
  class D inherits different type instances of trait B:
 B[D] and B[C]
 abstract class D extends C with B[D] {}
                ^
-bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]]
+t987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]]
 abstract class D extends C with B[D] {}
                                 ^
 four errors found
diff --git a/test/files/neg/bug987.scala b/test/files/neg/t987.scala
index 1fedf12ebc..1fedf12ebc 100644
--- a/test/files/neg/bug987.scala
+++ b/test/files/neg/t987.scala
diff --git a/test/files/neg/bug997.check b/test/files/neg/t997.check
index 44e383228d..c9fe0de756 100644
--- a/test/files/neg/bug997.check
+++ b/test/files/neg/t997.check
@@ -1,13 +1,13 @@
-bug997.scala:7: error: wrong number of arguments for object Foo
+t997.scala:7: error: wrong number of arguments for object Foo
 "x" match { case Foo(a) => Console.println(a) }
                     ^
-bug997.scala:7: error: not found: value a
+t997.scala:7: error: not found: value a
 "x" match { case Foo(a) => Console.println(a) }
                                            ^
-bug997.scala:13: error: wrong number of arguments for object Foo
+t997.scala:13: error: wrong number of arguments for object Foo
 "x" match { case Foo(a, b, c) => Console.println((a,b,c)) }
                     ^
-bug997.scala:13: error: not found: value a
+t997.scala:13: error: not found: value a
 "x" match { case Foo(a, b, c) => Console.println((a,b,c)) }
                                                   ^
 four errors found
diff --git a/test/files/neg/bug997.scala b/test/files/neg/t997.scala
index 42b46174d6..42b46174d6 100644
--- a/test/files/neg/bug997.scala
+++ b/test/files/neg/t997.scala
diff --git a/test/files/neg/tcpoly_override.scala b/test/files/neg/tcpoly_override.scala
index 7f64ad0d5f..dd043b47ed 100644
--- a/test/files/neg/tcpoly_override.scala
+++ b/test/files/neg/tcpoly_override.scala
@@ -1,4 +1,4 @@
-// bug1231: reported by Vladimir Reshetnikov on 19 July 2007
+// t1231: reported by Vladimir Reshetnikov on 19 July 2007
 trait A {
  type T[_]
 }
diff --git a/test/files/pos/patmat.scala b/test/files/pos/patmat.scala
index 8131a044fa..4e652b146e 100644
--- a/test/files/pos/patmat.scala
+++ b/test/files/pos/patmat.scala
@@ -26,7 +26,7 @@ object Foo1258 {
   }
 }
 
-object Bug1261 {
+object t1261 {
   sealed trait Elem
   case class Foo() extends Elem
   case class Bar() extends Elem
@@ -94,7 +94,7 @@ trait Outer { // bug #1282 compile-only
 }
 
 class Test806_818 { // #806, #811 compile only -- type of bind
-  // bug811
+  // t811
   trait Core {
     trait NodeImpl
     trait OtherImpl extends NodeImpl
diff --git a/test/files/pos/bug0002.scala b/test/files/pos/t0002.scala
index 4c58ed3f4f..4c58ed3f4f 100644
--- a/test/files/pos/bug0002.scala
+++ b/test/files/pos/t0002.scala
diff --git a/test/files/pos/bug0017.scala b/test/files/pos/t0017.scala
index d2bcda08d4..d2bcda08d4 100644
--- a/test/files/pos/bug0017.scala
+++ b/test/files/pos/t0017.scala
diff --git a/test/files/pos/bug0020.scala b/test/files/pos/t0020.scala
index 4f1e5b1732..4f1e5b1732 100644
--- a/test/files/pos/bug0020.scala
+++ b/test/files/pos/t0020.scala
diff --git a/test/files/pos/bug0029.scala b/test/files/pos/t0029.scala
index 937b6d70c0..937b6d70c0 100644
--- a/test/files/pos/bug0029.scala
+++ b/test/files/pos/t0029.scala
diff --git a/test/files/pos/bug0030.scala b/test/files/pos/t0030.scala
index 2f23be14d9..2f23be14d9 100644
--- a/test/files/pos/bug0030.scala
+++ b/test/files/pos/t0030.scala
diff --git a/test/files/pos/bug0031.scala b/test/files/pos/t0031.scala
index aa787ca794..aa787ca794 100644
--- a/test/files/pos/bug0031.scala
+++ b/test/files/pos/t0031.scala
diff --git a/test/files/pos/bug0032.scala b/test/files/pos/t0032.scala
index 727a7d4e99..727a7d4e99 100644
--- a/test/files/pos/bug0032.scala
+++ b/test/files/pos/t0032.scala
diff --git a/test/files/pos/bug0036.scala b/test/files/pos/t0036.scala
index 3c9a84f8ad..3c9a84f8ad 100644
--- a/test/files/pos/bug0036.scala
+++ b/test/files/pos/t0036.scala
diff --git a/test/files/pos/bug0039.scala b/test/files/pos/t0039.scala
index 652c606b0e..652c606b0e 100644
--- a/test/files/pos/bug0039.scala
+++ b/test/files/pos/t0039.scala
diff --git a/test/files/pos/bug0049.scala b/test/files/pos/t0049.scala
index dd86642263..dd86642263 100644
--- a/test/files/pos/bug0049.scala
+++ b/test/files/pos/t0049.scala
diff --git a/test/files/pos/bug0053.scala b/test/files/pos/t0053.scala
index 44763ef144..44763ef144 100644
--- a/test/files/pos/bug0053.scala
+++ b/test/files/pos/t0053.scala
diff --git a/test/files/pos/bug0054.scala b/test/files/pos/t0054.scala
index 670160f36e..670160f36e 100644
--- a/test/files/pos/bug0054.scala
+++ b/test/files/pos/t0054.scala
diff --git a/test/files/pos/bug0061.scala b/test/files/pos/t0061.scala
index dd3f94f30c..dd3f94f30c 100644
--- a/test/files/pos/bug0061.scala
+++ b/test/files/pos/t0061.scala
diff --git a/test/files/pos/bug0064.scala b/test/files/pos/t0064.scala
index c2ce4bf6d0..c2ce4bf6d0 100644
--- a/test/files/pos/bug0064.scala
+++ b/test/files/pos/t0064.scala
diff --git a/test/files/pos/bug0066.scala b/test/files/pos/t0066.scala
index 2153264e7a..2153264e7a 100644
--- a/test/files/pos/bug0066.scala
+++ b/test/files/pos/t0066.scala
diff --git a/test/files/pos/bug0068.scala b/test/files/pos/t0068.scala
index beb2c7c0ab..beb2c7c0ab 100644
--- a/test/files/pos/bug0068.scala
+++ b/test/files/pos/t0068.scala
diff --git a/test/files/pos/bug0069.scala b/test/files/pos/t0069.scala
index 113820613f..113820613f 100644
--- a/test/files/pos/bug0069.scala
+++ b/test/files/pos/t0069.scala
diff --git a/test/files/pos/bug0076.scala b/test/files/pos/t0076.scala
index 5419cf5154..5419cf5154 100644
--- a/test/files/pos/bug0076.scala
+++ b/test/files/pos/t0076.scala
diff --git a/test/files/pos/bug0081.scala b/test/files/pos/t0081.scala
index 20fd604974..20fd604974 100644
--- a/test/files/pos/bug0081.scala
+++ b/test/files/pos/t0081.scala
diff --git a/test/files/pos/bug0082.scala b/test/files/pos/t0082.scala
index 2b365ca333..2b365ca333 100644
--- a/test/files/pos/bug0082.scala
+++ b/test/files/pos/t0082.scala
diff --git a/test/files/pos/bug0085.scala b/test/files/pos/t0085.scala
index e018afb6ee..e018afb6ee 100644
--- a/test/files/pos/bug0085.scala
+++ b/test/files/pos/t0085.scala
diff --git a/test/files/pos/bug0091.scala b/test/files/pos/t0091.scala
index d491b7cfb9..d491b7cfb9 100644
--- a/test/files/pos/bug0091.scala
+++ b/test/files/pos/t0091.scala
diff --git a/test/files/pos/bug0093.scala b/test/files/pos/t0093.scala
index d648d773b0..d648d773b0 100644
--- a/test/files/pos/bug0093.scala
+++ b/test/files/pos/t0093.scala
diff --git a/test/files/pos/bug0095.scala b/test/files/pos/t0095.scala
index 71386cf5c7..71386cf5c7 100644
--- a/test/files/pos/bug0095.scala
+++ b/test/files/pos/t0095.scala
diff --git a/test/files/pos/bug0123.scala b/test/files/pos/t0123.scala
index 79f0c907a3..79f0c907a3 100644
--- a/test/files/pos/bug0123.scala
+++ b/test/files/pos/t0123.scala
diff --git a/test/files/pos/bug0204.scala b/test/files/pos/t0204.scala
index 23d36523e9..23d36523e9 100644
--- a/test/files/pos/bug0204.scala
+++ b/test/files/pos/t0204.scala
diff --git a/test/files/pos/bug0304.scala b/test/files/pos/t0304.scala
index 607a115db2..607a115db2 100644
--- a/test/files/pos/bug0304.scala
+++ b/test/files/pos/t0304.scala
diff --git a/test/files/pos/bug0305.scala b/test/files/pos/t0305.scala
index 4838b1fcf8..4838b1fcf8 100644
--- a/test/files/pos/bug0305.scala
+++ b/test/files/pos/t0305.scala
diff --git a/test/files/pos/bug0422.scala b/test/files/pos/t0422.scala
index cb3ba279d4..cb3ba279d4 100644
--- a/test/files/pos/bug0422.scala
+++ b/test/files/pos/t0422.scala
diff --git a/test/files/pos/bug0599.scala b/test/files/pos/t0599.scala
index 885159af66..885159af66 100644
--- a/test/files/pos/bug0599.scala
+++ b/test/files/pos/t0599.scala
diff --git a/test/files/pos/bug0646.scala b/test/files/pos/t0646.scala
index a56e857223..a56e857223 100644
--- a/test/files/pos/bug0646.scala
+++ b/test/files/pos/t0646.scala
diff --git a/test/files/pos/t1001.scala b/test/files/pos/t1001.scala
index 4312e25351..7a06bfa0e2 100644
--- a/test/files/pos/t1001.scala
+++ b/test/files/pos/t1001.scala
@@ -6,7 +6,7 @@ object Overload{
   foo.getDeclaringClass
 }
 
-// was bug1001.scala
+// was t1001.scala
 
 // I suspect the stack overflow is occurring when the compiler is determining the types for the following line at the end of the file:-
 //    val data = List(N26,N25)
diff --git a/test/files/pos/bug1006.scala b/test/files/pos/t1006.scala
index 5ebf799d63..5ebf799d63 100644
--- a/test/files/pos/bug1006.scala
+++ b/test/files/pos/t1006.scala
diff --git a/test/files/pos/bug1014.scala b/test/files/pos/t1014.scala
index 1ac87b225b..1ac87b225b 100644
--- a/test/files/pos/bug1014.scala
+++ b/test/files/pos/t1014.scala
diff --git a/test/files/pos/bug1034.scala b/test/files/pos/t1034.scala
index 9d966334a6..9d966334a6 100644
--- a/test/files/pos/bug1034.scala
+++ b/test/files/pos/t1034.scala
diff --git a/test/files/pos/bug1048.scala b/test/files/pos/t1048.scala
index f88dbbc88b..f88dbbc88b 100644
--- a/test/files/pos/bug1048.scala
+++ b/test/files/pos/t1048.scala
diff --git a/test/files/pos/bug1049.scala b/test/files/pos/t1049.scala
index 3cc9d0cc58..61d99f946c 100644
--- a/test/files/pos/bug1049.scala
+++ b/test/files/pos/t1049.scala
@@ -1,4 +1,4 @@
-package bug1049
+package t1049
 
 abstract class Test {
   type T <: A
diff --git a/test/files/pos/bug1050.scala b/test/files/pos/t1050.scala
index 1dfa20c988..e017e30713 100644
--- a/test/files/pos/bug1050.scala
+++ b/test/files/pos/t1050.scala
@@ -1,4 +1,4 @@
-package bug1050
+package t1050
 
 abstract class A {
   type T <: scala.ScalaObject
diff --git a/test/files/pos/bug1056.scala b/test/files/pos/t1056.scala
index 68f1ff2731..68f1ff2731 100644
--- a/test/files/pos/bug1056.scala
+++ b/test/files/pos/t1056.scala
diff --git a/test/files/pos/bug1070.scala b/test/files/pos/t1070.scala
index 95b77184d7..95b77184d7 100644
--- a/test/files/pos/bug1070.scala
+++ b/test/files/pos/t1070.scala
diff --git a/test/files/pos/bug1071.scala b/test/files/pos/t1071.scala
index 59149a021b..59149a021b 100644
--- a/test/files/pos/bug1071.scala
+++ b/test/files/pos/t1071.scala
diff --git a/test/files/pos/bug1075.scala b/test/files/pos/t1075.scala
index 5f72957da1..5f72957da1 100644
--- a/test/files/pos/bug1075.scala
+++ b/test/files/pos/t1075.scala
diff --git a/test/files/pos/bug1085.scala b/test/files/pos/t1085.scala
index c59e657cb2..c59e657cb2 100644
--- a/test/files/pos/bug1085.scala
+++ b/test/files/pos/t1085.scala
diff --git a/test/files/pos/bug1090.scala b/test/files/pos/t1090.scala
index a9bce90b00..a9bce90b00 100644
--- a/test/files/pos/bug1090.scala
+++ b/test/files/pos/t1090.scala
diff --git a/test/files/pos/bug1107.scala b/test/files/pos/t1107.scala
index 0bf40bb4cc..0bf40bb4cc 100644
--- a/test/files/pos/bug1107.scala
+++ b/test/files/pos/t1107.scala
diff --git a/test/files/pos/bug1119.scala b/test/files/pos/t1119.scala
index 8b36877c49..8b36877c49 100644
--- a/test/files/pos/bug1119.scala
+++ b/test/files/pos/t1119.scala
diff --git a/test/files/pos/bug1123.scala b/test/files/pos/t1123.scala
index 3812fa3eb3..3812fa3eb3 100644
--- a/test/files/pos/bug1123.scala
+++ b/test/files/pos/t1123.scala
diff --git a/test/files/pos/bug112606A.scala b/test/files/pos/t112606A.scala
index 5bf532f8dd..5bf532f8dd 100644
--- a/test/files/pos/bug112606A.scala
+++ b/test/files/pos/t112606A.scala
diff --git a/test/files/pos/bug1136.scala b/test/files/pos/t1136.scala
index e505badc9c..e505badc9c 100644
--- a/test/files/pos/bug1136.scala
+++ b/test/files/pos/t1136.scala
diff --git a/test/files/pos/bug115.scala b/test/files/pos/t115.scala
index 0e6a63c168..0e6a63c168 100644
--- a/test/files/pos/bug115.scala
+++ b/test/files/pos/t115.scala
diff --git a/test/files/pos/bug116.scala b/test/files/pos/t116.scala
index 1e31b71bf0..1e31b71bf0 100644
--- a/test/files/pos/bug116.scala
+++ b/test/files/pos/t116.scala
diff --git a/test/files/pos/bug1168.scala b/test/files/pos/t1168.scala
index 75638e792f..75638e792f 100644
--- a/test/files/pos/bug1168.scala
+++ b/test/files/pos/t1168.scala
diff --git a/test/files/pos/bug1185.scala b/test/files/pos/t1185.scala
index de453ec8dd..de453ec8dd 100644
--- a/test/files/pos/bug1185.scala
+++ b/test/files/pos/t1185.scala
diff --git a/test/files/pos/bug119.scala b/test/files/pos/t119.scala
index 44a1566756..44a1566756 100644
--- a/test/files/pos/bug119.scala
+++ b/test/files/pos/t119.scala
diff --git a/test/files/pos/bug1203.scala b/test/files/pos/t1203.scala
index 4938621aa9..4938621aa9 100644
--- a/test/files/pos/bug1203.scala
+++ b/test/files/pos/t1203.scala
diff --git a/test/files/pos/bug1208.scala b/test/files/pos/t1208.scala
index 9ac783d39a..9ac783d39a 100644
--- a/test/files/pos/bug1208.scala
+++ b/test/files/pos/t1208.scala
diff --git a/test/files/pos/bug121.scala b/test/files/pos/t121.scala
index 78ddc41ee5..78ddc41ee5 100644
--- a/test/files/pos/bug121.scala
+++ b/test/files/pos/t121.scala
diff --git a/test/files/pos/bug1210a.scala b/test/files/pos/t1210a.scala
index b3492f96e4..b3492f96e4 100644
--- a/test/files/pos/bug1210a.scala
+++ b/test/files/pos/t1210a.scala
diff --git a/test/files/pos/bug122.scala b/test/files/pos/t122.scala
index 630e24ce4a..630e24ce4a 100644
--- a/test/files/pos/bug122.scala
+++ b/test/files/pos/t122.scala
diff --git a/test/files/pos/bug1237.scala b/test/files/pos/t1237.scala
index 7777372138..7777372138 100644
--- a/test/files/pos/bug1237.scala
+++ b/test/files/pos/t1237.scala
diff --git a/test/files/pos/bug124.scala b/test/files/pos/t124.scala
index 9aed6786f6..9aed6786f6 100644
--- a/test/files/pos/bug124.scala
+++ b/test/files/pos/t124.scala
diff --git a/test/files/pos/bug1272.scala b/test/files/pos/t1272.scala
index d86a909ae5..d86a909ae5 100644
--- a/test/files/pos/bug1272.scala
+++ b/test/files/pos/t1272.scala
diff --git a/test/files/pos/bug1279a.scala b/test/files/pos/t1279a.scala
index 9212b583d4..9212b583d4 100644
--- a/test/files/pos/bug1279a.scala
+++ b/test/files/pos/t1279a.scala
diff --git a/test/files/pos/bug1292.scala b/test/files/pos/t1292.scala
index 83a996d530..83a996d530 100644
--- a/test/files/pos/bug1292.scala
+++ b/test/files/pos/t1292.scala
diff --git a/test/files/pos/bug1318.scala b/test/files/pos/t1318.scala
index f3d2f7ab5a..f3d2f7ab5a 100644
--- a/test/files/pos/bug1318.scala
+++ b/test/files/pos/t1318.scala
diff --git a/test/files/pos/bug1381.scala b/test/files/pos/t1381.scala
index 0762891898..0762891898 100644
--- a/test/files/pos/bug1381.scala
+++ b/test/files/pos/t1381.scala
diff --git a/test/files/pos/bug1385.scala b/test/files/pos/t1385.scala
index 55356c1f25..55356c1f25 100644
--- a/test/files/pos/bug1385.scala
+++ b/test/files/pos/t1385.scala
diff --git a/test/files/pos/bug1439.flags b/test/files/pos/t1439.flags
index 779916d58f..779916d58f 100644
--- a/test/files/pos/bug1439.flags
+++ b/test/files/pos/t1439.flags
diff --git a/test/files/pos/bug1439.scala b/test/files/pos/t1439.scala
index 68a7332b2a..68a7332b2a 100644
--- a/test/files/pos/bug1439.scala
+++ b/test/files/pos/t1439.scala
diff --git a/test/files/pos/bug151.scala b/test/files/pos/t151.scala
index 86667b49f7..86667b49f7 100644
--- a/test/files/pos/bug151.scala
+++ b/test/files/pos/t151.scala
diff --git a/test/files/pos/bug1565.scala b/test/files/pos/t1565.scala
index df333151d5..df333151d5 100644
--- a/test/files/pos/bug1565.scala
+++ b/test/files/pos/t1565.scala
diff --git a/test/files/pos/bug159.scala b/test/files/pos/t159.scala
index 95c47da23a..95c47da23a 100644
--- a/test/files/pos/bug159.scala
+++ b/test/files/pos/t159.scala
diff --git a/test/files/pos/bug160.scala b/test/files/pos/t160.scala
index 91ac2ba842..91ac2ba842 100644
--- a/test/files/pos/bug160.scala
+++ b/test/files/pos/t160.scala
diff --git a/test/files/pos/bug1626.scala b/test/files/pos/t1626.scala
index 200be47430..200be47430 100644
--- a/test/files/pos/bug1626.scala
+++ b/test/files/pos/t1626.scala
diff --git a/test/files/pos/bug1737/A.java b/test/files/pos/t1737/A.java
index ee87e29a35..ee87e29a35 100644
--- a/test/files/pos/bug1737/A.java
+++ b/test/files/pos/t1737/A.java
diff --git a/test/files/pos/bug1737/B.java b/test/files/pos/t1737/B.java
index 28a1907a04..28a1907a04 100644
--- a/test/files/pos/bug1737/B.java
+++ b/test/files/pos/t1737/B.java
diff --git a/test/files/pos/bug1737/c.scala b/test/files/pos/t1737/c.scala
index 782ec18b9e..782ec18b9e 100644
--- a/test/files/pos/bug1737/c.scala
+++ b/test/files/pos/t1737/c.scala
diff --git a/test/files/pos/bug175.scala b/test/files/pos/t175.scala
index 4c0eb28ba0..4c0eb28ba0 100644
--- a/test/files/pos/bug175.scala
+++ b/test/files/pos/t175.scala
diff --git a/test/files/pos/bug177.scala b/test/files/pos/t177.scala
index 33b4de9264..33b4de9264 100644
--- a/test/files/pos/bug177.scala
+++ b/test/files/pos/t177.scala
diff --git a/test/files/pos/bug183.scala b/test/files/pos/t183.scala
index d7ed27f730..d7ed27f730 100644
--- a/test/files/pos/bug183.scala
+++ b/test/files/pos/t183.scala
diff --git a/test/files/pos/bug1843.scala b/test/files/pos/t1843.scala
index cc73353b75..cc73353b75 100644
--- a/test/files/pos/bug1843.scala
+++ b/test/files/pos/t1843.scala
diff --git a/test/files/pos/bug1858.scala b/test/files/pos/t1858.scala
index c06e73e7e6..c06e73e7e6 100644
--- a/test/files/pos/bug1858.scala
+++ b/test/files/pos/t1858.scala
diff --git a/test/files/pos/bug1909.scala b/test/files/pos/t1909.scala
index 01213f62a3..01213f62a3 100644
--- a/test/files/pos/bug1909.scala
+++ b/test/files/pos/t1909.scala
diff --git a/test/files/pos/bug1909b-pos.scala b/test/files/pos/t1909b-pos.scala
index b914bee366..b914bee366 100644
--- a/test/files/pos/bug1909b-pos.scala
+++ b/test/files/pos/t1909b-pos.scala
diff --git a/test/files/pos/bug1974.scala b/test/files/pos/t1974.scala
index a0daa13c21..a0daa13c21 100644
--- a/test/files/pos/bug1974.scala
+++ b/test/files/pos/t1974.scala
diff --git a/test/files/pos/bug201.scala b/test/files/pos/t201.scala
index b0c6b8da43..b0c6b8da43 100644
--- a/test/files/pos/bug201.scala
+++ b/test/files/pos/t201.scala
diff --git a/test/files/pos/bug2018.scala b/test/files/pos/t2018.scala
index 1736c394c9..1736c394c9 100644
--- a/test/files/pos/bug2018.scala
+++ b/test/files/pos/t2018.scala
diff --git a/test/files/pos/bug2081.scala b/test/files/pos/t2081.scala
index 52388464a5..52388464a5 100644
--- a/test/files/pos/bug2081.scala
+++ b/test/files/pos/t2081.scala
diff --git a/test/files/pos/bug2094.scala b/test/files/pos/t2094.scala
index ff142117b2..ff142117b2 100644
--- a/test/files/pos/bug2094.scala
+++ b/test/files/pos/t2094.scala
diff --git a/test/files/pos/bug210.scala b/test/files/pos/t210.scala
index f0b907aa5d..f0b907aa5d 100644
--- a/test/files/pos/bug210.scala
+++ b/test/files/pos/t210.scala
diff --git a/test/files/pos/bug211.scala b/test/files/pos/t211.scala
index e394f21e8f..d51c9706da 100644
--- a/test/files/pos/bug211.scala
+++ b/test/files/pos/t211.scala
@@ -3,6 +3,6 @@ trait B;
 class Foo extends A with B { self: A with B => }
 object Test extends App {
   new Foo();
-  Console.println("bug211 completed");
+  Console.println("t211 completed");
 }
 
diff --git a/test/files/pos/bug2119.scala b/test/files/pos/t2119.scala
index b9cb4d9c6d..b9cb4d9c6d 100644
--- a/test/files/pos/bug2119.scala
+++ b/test/files/pos/t2119.scala
diff --git a/test/files/pos/bug2127.scala b/test/files/pos/t2127.scala
index d6244c14a2..d6244c14a2 100644
--- a/test/files/pos/bug2127.scala
+++ b/test/files/pos/t2127.scala
diff --git a/test/files/pos/bug2130-1.scala b/test/files/pos/t2130-1.scala
index 8dd61c4d30..8dd61c4d30 100644
--- a/test/files/pos/bug2130-1.scala
+++ b/test/files/pos/t2130-1.scala
diff --git a/test/files/pos/bug2130-2.scala b/test/files/pos/t2130-2.scala
index 1d0b33c3e5..1d0b33c3e5 100644
--- a/test/files/pos/bug2130-2.scala
+++ b/test/files/pos/t2130-2.scala
diff --git a/test/files/pos/bug2168.scala b/test/files/pos/t2168.scala
index e3b24b6a72..e3b24b6a72 100644
--- a/test/files/pos/bug2168.scala
+++ b/test/files/pos/t2168.scala
diff --git a/test/files/pos/bug2171.flags b/test/files/pos/t2171.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/pos/bug2171.flags
+++ b/test/files/pos/t2171.flags
diff --git a/test/files/pos/bug2171.scala b/test/files/pos/t2171.scala
index 6c754c76a6..6c754c76a6 100644
--- a/test/files/pos/bug2171.scala
+++ b/test/files/pos/t2171.scala
diff --git a/test/files/pos/bug2187-2.scala b/test/files/pos/t2187-2.scala
index 3f2742dd89..3f2742dd89 100644
--- a/test/files/pos/bug2187-2.scala
+++ b/test/files/pos/t2187-2.scala
diff --git a/test/files/pos/bug2187.scala b/test/files/pos/t2187.scala
index 8a33531541..8a33531541 100644
--- a/test/files/pos/bug2187.scala
+++ b/test/files/pos/t2187.scala
diff --git a/test/files/pos/bug2260.scala b/test/files/pos/t2260.scala
index 4e4cc5ab2c..4e4cc5ab2c 100644
--- a/test/files/pos/bug2260.scala
+++ b/test/files/pos/t2260.scala
diff --git a/test/files/pos/bug2281.scala b/test/files/pos/t2281.scala
index fc4ae1ca25..fc4ae1ca25 100644
--- a/test/files/pos/bug2281.scala
+++ b/test/files/pos/t2281.scala
diff --git a/test/files/pos/bug229.scala b/test/files/pos/t229.scala
index 72ddfa74fe..72ddfa74fe 100644
--- a/test/files/pos/bug229.scala
+++ b/test/files/pos/t229.scala
diff --git a/test/files/pos/bug2310.scala b/test/files/pos/t2310.scala
index 68912b4961..68912b4961 100644
--- a/test/files/pos/bug2310.scala
+++ b/test/files/pos/t2310.scala
diff --git a/test/files/pos/bug2399.scala b/test/files/pos/t2399.scala
index 07882dd549..07882dd549 100644
--- a/test/files/pos/bug2399.scala
+++ b/test/files/pos/t2399.scala
diff --git a/test/files/pos/bug2409/J.java b/test/files/pos/t2409/J.java
index 6b7c45ff6d..6b7c45ff6d 100644
--- a/test/files/pos/bug2409/J.java
+++ b/test/files/pos/t2409/J.java
diff --git a/test/files/pos/bug2409/bug2409.scala b/test/files/pos/t2409/t2409.scala
index 5775008fc4..5775008fc4 100644
--- a/test/files/pos/bug2409/bug2409.scala
+++ b/test/files/pos/t2409/t2409.scala
diff --git a/test/files/pos/bug2441pos.scala b/test/files/pos/t2441pos.scala
index 25eb2232c9..25eb2232c9 100644
--- a/test/files/pos/bug2441pos.scala
+++ b/test/files/pos/t2441pos.scala
diff --git a/test/files/pos/bug245.scala b/test/files/pos/t245.scala
index 570ac4178d..570ac4178d 100644
--- a/test/files/pos/bug245.scala
+++ b/test/files/pos/t245.scala
diff --git a/test/files/pos/bug247.scala b/test/files/pos/t247.scala
index e976404e61..e976404e61 100644
--- a/test/files/pos/bug247.scala
+++ b/test/files/pos/t247.scala
diff --git a/test/files/pos/t2484.scala b/test/files/pos/t2484.scala
index 6990c46099..7d1b7cb03c 100755
--- a/test/files/pos/t2484.scala
+++ b/test/files/pos/t2484.scala
@@ -1,6 +1,6 @@
 class Admin extends javax.swing.JApplet {
   val jScrollPane = new javax.swing.JScrollPane (null, 0, 0)
-  def bug2484: Unit = {
+  def t2484: Unit = {
     scala.concurrent.ops.spawn {jScrollPane.synchronized {
       def someFunction () = {}
       //scala.concurrent.ops.spawn {someFunction ()}
diff --git a/test/files/pos/bug2486.scala b/test/files/pos/t2486.scala
index 69fe4c127e..69fe4c127e 100644
--- a/test/files/pos/bug2486.scala
+++ b/test/files/pos/t2486.scala
diff --git a/test/files/pos/bug252.scala b/test/files/pos/t252.scala
index d51b5511eb..d51b5511eb 100644
--- a/test/files/pos/bug252.scala
+++ b/test/files/pos/t252.scala
diff --git a/test/files/pos/bug261-ab.scala b/test/files/pos/t261-ab.scala
index df641e811a..df641e811a 100644
--- a/test/files/pos/bug261-ab.scala
+++ b/test/files/pos/t261-ab.scala
diff --git a/test/files/pos/bug261-ba.scala b/test/files/pos/t261-ba.scala
index 6c9c5b10b7..6c9c5b10b7 100644
--- a/test/files/pos/bug261-ba.scala
+++ b/test/files/pos/t261-ba.scala
diff --git a/test/files/pos/bug262.scala b/test/files/pos/t262.scala
index ec6187b36b..ec6187b36b 100644
--- a/test/files/pos/bug262.scala
+++ b/test/files/pos/t262.scala
diff --git a/test/files/pos/bug267.scala b/test/files/pos/t267.scala
index 7e5876eae9..7e5876eae9 100644
--- a/test/files/pos/bug267.scala
+++ b/test/files/pos/t267.scala
diff --git a/test/files/pos/bug2693.scala b/test/files/pos/t2693.scala
index 97732cf081..97732cf081 100644
--- a/test/files/pos/bug2693.scala
+++ b/test/files/pos/t2693.scala
diff --git a/test/files/pos/t2726/bug2726_2.scala b/test/files/pos/t2726/t2726_2.scala
index e738143aeb..e738143aeb 100644
--- a/test/files/pos/t2726/bug2726_2.scala
+++ b/test/files/pos/t2726/t2726_2.scala
diff --git a/test/files/pos/bug2782.scala b/test/files/pos/t2782.scala
index ab12aaf1fe..ab12aaf1fe 100644
--- a/test/files/pos/bug2782.scala
+++ b/test/files/pos/t2782.scala
diff --git a/test/files/pos/t2795.scala b/test/files/pos/t2795.scala
index a4e1b7db83..935cb1f444 100644
--- a/test/files/pos/t2795.scala
+++ b/test/files/pos/t2795.scala
@@ -1,4 +1,4 @@
-package bug1
+package t1
 
 trait Element[T] {
 }
diff --git a/test/files/pos/bug284-pos.scala b/test/files/pos/t284-pos.scala
index 19673b7e4c..19673b7e4c 100644
--- a/test/files/pos/bug284-pos.scala
+++ b/test/files/pos/t284-pos.scala
diff --git a/test/files/pos/bug287.scala b/test/files/pos/t287.scala
index 8e5e8831c1..8e5e8831c1 100644
--- a/test/files/pos/bug287.scala
+++ b/test/files/pos/t287.scala
diff --git a/test/files/pos/bug289.scala b/test/files/pos/t289.scala
index 96c0244dfa..96c0244dfa 100644
--- a/test/files/pos/bug289.scala
+++ b/test/files/pos/t289.scala
diff --git a/test/files/pos/bug2939.scala b/test/files/pos/t2939.scala
index 3be4d4d561..3be4d4d561 100644
--- a/test/files/pos/bug2939.scala
+++ b/test/files/pos/t2939.scala
diff --git a/test/files/pos/bug2945.scala b/test/files/pos/t2945.scala
index 762bdb61e1..762bdb61e1 100644
--- a/test/files/pos/bug2945.scala
+++ b/test/files/pos/t2945.scala
diff --git a/test/files/pos/bug295.scala b/test/files/pos/t295.scala
index 22c7beff4d..22c7beff4d 100644
--- a/test/files/pos/bug295.scala
+++ b/test/files/pos/t295.scala
diff --git a/test/files/pos/bug296.scala b/test/files/pos/t296.scala
index 0c267a307e..0c267a307e 100644
--- a/test/files/pos/bug296.scala
+++ b/test/files/pos/t296.scala
diff --git a/test/files/pos/bug3020.scala b/test/files/pos/t3020.scala
index 016563e27f..016563e27f 100644
--- a/test/files/pos/bug3020.scala
+++ b/test/files/pos/t3020.scala
diff --git a/test/files/pos/bug304.scala b/test/files/pos/t304.scala
index 76da44157d..76da44157d 100644
--- a/test/files/pos/bug304.scala
+++ b/test/files/pos/t304.scala
diff --git a/test/files/pos/bug3048.scala b/test/files/pos/t3048.scala
index dc056ecba2..dc056ecba2 100644
--- a/test/files/pos/bug3048.scala
+++ b/test/files/pos/t3048.scala
diff --git a/test/files/pos/bug3097.flags b/test/files/pos/t3097.flags
index 144ddac9d3..144ddac9d3 100644
--- a/test/files/pos/bug3097.flags
+++ b/test/files/pos/t3097.flags
diff --git a/test/files/pos/bug3097.scala b/test/files/pos/t3097.scala
index a034b960f7..a034b960f7 100644
--- a/test/files/pos/bug3097.scala
+++ b/test/files/pos/t3097.scala
diff --git a/test/files/pos/bug3106.scala b/test/files/pos/t3106.scala
index 162e93366f..162e93366f 100644
--- a/test/files/pos/bug3106.scala
+++ b/test/files/pos/t3106.scala
diff --git a/test/files/pos/bug3136.scala b/test/files/pos/t3136.scala
index 33d42c2f3c..33d42c2f3c 100644
--- a/test/files/pos/bug3136.scala
+++ b/test/files/pos/t3136.scala
diff --git a/test/files/pos/bug3137.scala b/test/files/pos/t3137.scala
index cb7317af01..cb7317af01 100644
--- a/test/files/pos/bug3137.scala
+++ b/test/files/pos/t3137.scala
diff --git a/test/files/pos/bug3175-pos.scala b/test/files/pos/t3175-pos.scala
index 89bbf8b5fc..89bbf8b5fc 100644
--- a/test/files/pos/bug3175-pos.scala
+++ b/test/files/pos/t3175-pos.scala
diff --git a/test/files/pos/bug318.scala b/test/files/pos/t318.scala
index dbe0e0528c..dbe0e0528c 100644
--- a/test/files/pos/bug318.scala
+++ b/test/files/pos/t318.scala
diff --git a/test/files/pos/bug319.scala b/test/files/pos/t319.scala
index eed25eb84c..eed25eb84c 100644
--- a/test/files/pos/bug319.scala
+++ b/test/files/pos/t319.scala
diff --git a/test/files/pos/bug3234.flags b/test/files/pos/t3234.flags
index c9cefdc4b9..c9cefdc4b9 100644
--- a/test/files/pos/bug3234.flags
+++ b/test/files/pos/t3234.flags
diff --git a/test/files/pos/bug3234.scala b/test/files/pos/t3234.scala
index 1553f1fa05..1553f1fa05 100644
--- a/test/files/pos/bug3234.scala
+++ b/test/files/pos/t3234.scala
diff --git a/test/files/pos/bug3252.flags b/test/files/pos/t3252.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/pos/bug3252.flags
+++ b/test/files/pos/t3252.flags
diff --git a/test/files/pos/bug3252.scala b/test/files/pos/t3252.scala
index 4b8e862714..4b8e862714 100644
--- a/test/files/pos/bug3252.scala
+++ b/test/files/pos/t3252.scala
diff --git a/test/files/pos/bug3278.scala b/test/files/pos/t3278.scala
index 788ec75d26..788ec75d26 100644
--- a/test/files/pos/bug3278.scala
+++ b/test/files/pos/t3278.scala
diff --git a/test/files/pos/bug3312.scala b/test/files/pos/t3312.scala
index aef965d2e7..aef965d2e7 100644
--- a/test/files/pos/bug3312.scala
+++ b/test/files/pos/t3312.scala
diff --git a/test/files/pos/bug3343.scala b/test/files/pos/t3343.scala
index 6c34cdff00..6c34cdff00 100644
--- a/test/files/pos/bug3343.scala
+++ b/test/files/pos/t3343.scala
diff --git a/test/files/pos/bug3371.scala b/test/files/pos/t3371.scala
index 897cd9de44..897cd9de44 100644
--- a/test/files/pos/bug3371.scala
+++ b/test/files/pos/t3371.scala
diff --git a/test/files/pos/bug3411.scala b/test/files/pos/t3411.scala
index b58e52db8d..b58e52db8d 100644
--- a/test/files/pos/bug3411.scala
+++ b/test/files/pos/t3411.scala
diff --git a/test/files/pos/bug342.scala b/test/files/pos/t342.scala
index 752b24d2ba..752b24d2ba 100644
--- a/test/files/pos/bug342.scala
+++ b/test/files/pos/t342.scala
diff --git a/test/files/pos/bug3420.flags b/test/files/pos/t3420.flags
index ea03113c66..ea03113c66 100644
--- a/test/files/pos/bug3420.flags
+++ b/test/files/pos/t3420.flags
diff --git a/test/files/pos/bug3420.scala b/test/files/pos/t3420.scala
index 0fc56ed67b..0fc56ed67b 100644
--- a/test/files/pos/bug3420.scala
+++ b/test/files/pos/t3420.scala
diff --git a/test/files/pos/bug3430.flags b/test/files/pos/t3430.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/pos/bug3430.flags
+++ b/test/files/pos/t3430.flags
diff --git a/test/files/pos/bug3430.scala b/test/files/pos/t3430.scala
index 3129c6276a..3129c6276a 100644
--- a/test/files/pos/bug3430.scala
+++ b/test/files/pos/t3430.scala
diff --git a/test/files/pos/bug344.scala b/test/files/pos/t344.scala
index 8a6ad9120d..8a6ad9120d 100644
--- a/test/files/pos/bug344.scala
+++ b/test/files/pos/t344.scala
diff --git a/test/files/pos/bug3440.scala b/test/files/pos/t3440.scala
index 026abfea1f..026abfea1f 100644
--- a/test/files/pos/bug3440.scala
+++ b/test/files/pos/t3440.scala
diff --git a/test/files/pos/bug3480.scala b/test/files/pos/t3480.scala
index 830365170b..830365170b 100644
--- a/test/files/pos/bug3480.scala
+++ b/test/files/pos/t3480.scala
diff --git a/test/files/pos/bug348plus.scala b/test/files/pos/t348plus.scala
index e61f7346f2..e61f7346f2 100644
--- a/test/files/pos/bug348plus.scala
+++ b/test/files/pos/t348plus.scala
diff --git a/test/files/pos/bug3495.flags b/test/files/pos/t3495.flags
index 08de722af0..08de722af0 100644
--- a/test/files/pos/bug3495.flags
+++ b/test/files/pos/t3495.flags
diff --git a/test/files/pos/bug3495.scala b/test/files/pos/t3495.scala
index 8d5dff4302..8d5dff4302 100644
--- a/test/files/pos/bug3495.scala
+++ b/test/files/pos/t3495.scala
diff --git a/test/files/pos/bug3498.scala b/test/files/pos/t3498.scala
index bcc90ca64c..bcc90ca64c 100644
--- a/test/files/pos/bug3498.scala
+++ b/test/files/pos/t3498.scala
diff --git a/test/files/pos/bug3521/DoubleValue.java b/test/files/pos/t3521/DoubleValue.java
index e8c093890b..e8c093890b 100644
--- a/test/files/pos/bug3521/DoubleValue.java
+++ b/test/files/pos/t3521/DoubleValue.java
diff --git a/test/files/pos/bug3521/a.scala b/test/files/pos/t3521/a.scala
index 94bb451fc3..94bb451fc3 100644
--- a/test/files/pos/bug3521/a.scala
+++ b/test/files/pos/t3521/a.scala
diff --git a/test/files/pos/bug3528.scala b/test/files/pos/t3528.scala
index ff49b3e929..ff49b3e929 100644
--- a/test/files/pos/bug3528.scala
+++ b/test/files/pos/t3528.scala
diff --git a/test/files/pos/bug3534.scala b/test/files/pos/t3534.scala
index d926d4e286..d926d4e286 100644
--- a/test/files/pos/bug3534.scala
+++ b/test/files/pos/t3534.scala
diff --git a/test/files/pos/3567/Foo.scala b/test/files/pos/t3567/Foo.scala
index 4f83ba9f43..4f83ba9f43 100644
--- a/test/files/pos/3567/Foo.scala
+++ b/test/files/pos/t3567/Foo.scala
diff --git a/test/files/pos/3567/Outer.java b/test/files/pos/t3567/Outer.java
index f1f124b808..f1f124b808 100644
--- a/test/files/pos/3567/Outer.java
+++ b/test/files/pos/t3567/Outer.java
diff --git a/test/files/pos/bug3570.scala b/test/files/pos/t3570.scala
index 8921f83b2a..8921f83b2a 100644
--- a/test/files/pos/bug3570.scala
+++ b/test/files/pos/t3570.scala
diff --git a/test/files/pos/bug3578.scala b/test/files/pos/t3578.scala
index d984118208..d984118208 100644
--- a/test/files/pos/bug3578.scala
+++ b/test/files/pos/t3578.scala
diff --git a/test/files/pos/bug359.scala b/test/files/pos/t359.scala
index 11233c3ba4..11233c3ba4 100644
--- a/test/files/pos/bug359.scala
+++ b/test/files/pos/t359.scala
diff --git a/test/files/pos/bug360.scala b/test/files/pos/t360.scala
index f3716d4f97..f3716d4f97 100644
--- a/test/files/pos/bug360.scala
+++ b/test/files/pos/t360.scala
diff --git a/test/files/pos/bug361.scala b/test/files/pos/t361.scala
index 1d19ecb523..1d19ecb523 100644
--- a/test/files/pos/bug361.scala
+++ b/test/files/pos/t361.scala
diff --git a/test/files/pos/bug3636.scala b/test/files/pos/t3636.scala
index 24d18c653d..24d18c653d 100644
--- a/test/files/pos/bug3636.scala
+++ b/test/files/pos/t3636.scala
diff --git a/test/files/pos/bug3642/Tuppel_1.java b/test/files/pos/t3642/Tuppel_1.java
index 07c715ee90..07c715ee90 100644
--- a/test/files/pos/bug3642/Tuppel_1.java
+++ b/test/files/pos/t3642/Tuppel_1.java
diff --git a/test/files/pos/bug3642/bug3642_2.scala b/test/files/pos/t3642/t3642_2.scala
index 0892e508a5..0892e508a5 100644
--- a/test/files/pos/bug3642/bug3642_2.scala
+++ b/test/files/pos/t3642/t3642_2.scala
diff --git a/test/files/pos/bug3671.scala b/test/files/pos/t3671.scala
index 1ca9327bb7..1ca9327bb7 100644
--- a/test/files/pos/bug3671.scala
+++ b/test/files/pos/t3671.scala
diff --git a/test/files/pos/bug3688-redux.scala b/test/files/pos/t3688-redux.scala
index e601cf240c..e601cf240c 100644
--- a/test/files/pos/bug3688-redux.scala
+++ b/test/files/pos/t3688-redux.scala
diff --git a/test/files/pos/bug372.scala b/test/files/pos/t372.scala
index 9ce5b9ab72..9ce5b9ab72 100644
--- a/test/files/pos/bug372.scala
+++ b/test/files/pos/t372.scala
diff --git a/test/files/pos/bug374.scala b/test/files/pos/t374.scala
index fb9c0b4027..fb9c0b4027 100644
--- a/test/files/pos/bug374.scala
+++ b/test/files/pos/t374.scala
diff --git a/test/files/pos/bug3861.scala b/test/files/pos/t3861.scala
index 5ebe025203..5ebe025203 100644
--- a/test/files/pos/bug3861.scala
+++ b/test/files/pos/t3861.scala
diff --git a/test/files/pos/bug3883.scala b/test/files/pos/t3883.scala
index adde0526b2..adde0526b2 100644
--- a/test/files/pos/bug3883.scala
+++ b/test/files/pos/t3883.scala
diff --git a/test/files/pos/bug389.scala b/test/files/pos/t389.scala
index 535bd4de87..535bd4de87 100644
--- a/test/files/pos/bug389.scala
+++ b/test/files/pos/t389.scala
diff --git a/test/files/pos/bug3938/Parent.java b/test/files/pos/t3938/Parent.java
index 08fae330bb..08fae330bb 100644
--- a/test/files/pos/bug3938/Parent.java
+++ b/test/files/pos/t3938/Parent.java
diff --git a/test/files/pos/bug3938/UseParent.scala b/test/files/pos/t3938/UseParent.scala
index 685d1a03a8..685d1a03a8 100644
--- a/test/files/pos/bug3938/UseParent.scala
+++ b/test/files/pos/t3938/UseParent.scala
diff --git a/test/files/pos/bug3960.flags b/test/files/pos/t3960.flags
index 4449dbbdf3..4449dbbdf3 100644
--- a/test/files/pos/bug3960.flags
+++ b/test/files/pos/t3960.flags
diff --git a/test/files/pos/bug3960.scala b/test/files/pos/t3960.scala
index 5c658e9fbc..5c658e9fbc 100644
--- a/test/files/pos/bug3960.scala
+++ b/test/files/pos/t3960.scala
diff --git a/test/files/pos/bug397.scala b/test/files/pos/t397.scala
index 87be2987ab..87be2987ab 100644
--- a/test/files/pos/bug397.scala
+++ b/test/files/pos/t397.scala
diff --git a/test/files/pos/bug3972.scala b/test/files/pos/t3972.scala
index 5dfc10fcef..5dfc10fcef 100644
--- a/test/files/pos/bug3972.scala
+++ b/test/files/pos/t3972.scala
diff --git a/test/files/pos/bug4018.scala b/test/files/pos/t4018.scala
index 2b265c5717..2b265c5717 100644
--- a/test/files/pos/bug4018.scala
+++ b/test/files/pos/t4018.scala
diff --git a/test/files/pos/bug402.scala b/test/files/pos/t402.scala
index a5a3df4825..a5a3df4825 100644
--- a/test/files/pos/bug402.scala
+++ b/test/files/pos/t402.scala
diff --git a/test/files/pos/bug4020.flags b/test/files/pos/t4020.flags
index 85d8eb2ba2..85d8eb2ba2 100644
--- a/test/files/pos/bug4020.flags
+++ b/test/files/pos/t4020.flags
diff --git a/test/files/pos/bug4020.scala b/test/files/pos/t4020.scala
index f976460191..f976460191 100644
--- a/test/files/pos/bug4020.scala
+++ b/test/files/pos/t4020.scala
diff --git a/test/files/pos/bug404.scala b/test/files/pos/t404.scala
index 8f5e8bef5e..8f5e8bef5e 100644
--- a/test/files/pos/bug404.scala
+++ b/test/files/pos/t404.scala
diff --git a/test/files/pos/bug415.scala b/test/files/pos/t415.scala
index 355b6136d1..355b6136d1 100644
--- a/test/files/pos/bug415.scala
+++ b/test/files/pos/t415.scala
diff --git a/test/files/pos/bug4188.scala b/test/files/pos/t4188.scala
index 40e7d4924e..40e7d4924e 100644
--- a/test/files/pos/bug4188.scala
+++ b/test/files/pos/t4188.scala
diff --git a/test/files/pos/bug419.scala b/test/files/pos/t419.scala
index 65dcb04356..65dcb04356 100644
--- a/test/files/pos/bug419.scala
+++ b/test/files/pos/t419.scala
diff --git a/test/files/pos/bug422.scala b/test/files/pos/t422.scala
index cb3ba279d4..cb3ba279d4 100644
--- a/test/files/pos/bug422.scala
+++ b/test/files/pos/t422.scala
diff --git a/test/files/pos/bug4220.scala b/test/files/pos/t4220.scala
index 98f2649767..98f2649767 100644
--- a/test/files/pos/bug4220.scala
+++ b/test/files/pos/t4220.scala
diff --git a/test/files/pos/bug4237.scala b/test/files/pos/t4237.scala
index fcf6eb8bf1..fcf6eb8bf1 100644
--- a/test/files/pos/bug4237.scala
+++ b/test/files/pos/t4237.scala
diff --git a/test/files/pos/bug4269.scala b/test/files/pos/t4269.scala
index 99a30785b4..99a30785b4 100644
--- a/test/files/pos/bug4269.scala
+++ b/test/files/pos/t4269.scala
diff --git a/test/files/pos/bug4275.scala b/test/files/pos/t4275.scala
index 1938aceadc..1938aceadc 100644
--- a/test/files/pos/bug4275.scala
+++ b/test/files/pos/t4275.scala
diff --git a/test/files/pos/bug430-feb09.scala b/test/files/pos/t430-feb09.scala
index 1499f32b7a..1499f32b7a 100644
--- a/test/files/pos/bug430-feb09.scala
+++ b/test/files/pos/t430-feb09.scala
diff --git a/test/files/pos/bug430.scala b/test/files/pos/t430.scala
index e04e39bea8..e04e39bea8 100644
--- a/test/files/pos/bug430.scala
+++ b/test/files/pos/t430.scala
diff --git a/test/files/pos/bug4305.scala b/test/files/pos/t4305.scala
index ba3eb65bc1..ba3eb65bc1 100644
--- a/test/files/pos/bug4305.scala
+++ b/test/files/pos/t4305.scala
diff --git a/test/files/pos/bug432.scala b/test/files/pos/t432.scala
index 087fd70aba..087fd70aba 100644
--- a/test/files/pos/bug432.scala
+++ b/test/files/pos/t432.scala
diff --git a/test/files/pos/bug439.scala b/test/files/pos/t439.scala
index f3191c72fa..f3191c72fa 100644
--- a/test/files/pos/bug439.scala
+++ b/test/files/pos/t439.scala
diff --git a/test/files/pos/bug443.scala b/test/files/pos/t443.scala
index 5b5e3ea828..5b5e3ea828 100644
--- a/test/files/pos/bug443.scala
+++ b/test/files/pos/t443.scala
diff --git a/test/files/pos/bug4501.scala b/test/files/pos/t4501.scala
index 40628f1a4b..40628f1a4b 100644
--- a/test/files/pos/bug4501.scala
+++ b/test/files/pos/t4501.scala
diff --git a/test/files/pos/bug4553.scala b/test/files/pos/t4553.scala
index 4eefe57b2b..4eefe57b2b 100755
--- a/test/files/pos/bug4553.scala
+++ b/test/files/pos/t4553.scala
diff --git a/test/files/pos/bug460.scala b/test/files/pos/t460.scala
index 3fc13e4dd0..3fc13e4dd0 100644
--- a/test/files/pos/bug460.scala
+++ b/test/files/pos/t460.scala
diff --git a/test/files/pos/bug4603/J.java b/test/files/pos/t4603/J.java
index 0c3f6b2bf2..0c3f6b2bf2 100644
--- a/test/files/pos/bug4603/J.java
+++ b/test/files/pos/t4603/J.java
diff --git a/test/files/pos/bug4603/S.scala b/test/files/pos/t4603/S.scala
index c7d809d9f7..c7d809d9f7 100644
--- a/test/files/pos/bug4603/S.scala
+++ b/test/files/pos/t4603/S.scala
diff --git a/test/files/pos/bug464.scala b/test/files/pos/t464.scala
index 45521335c3..45521335c3 100644
--- a/test/files/pos/bug464.scala
+++ b/test/files/pos/t464.scala
diff --git a/test/files/pos/bug4731.scala b/test/files/pos/t4731.scala
index d457543c1f..d457543c1f 100644
--- a/test/files/pos/bug4731.scala
+++ b/test/files/pos/t4731.scala
diff --git a/test/files/pos/bug4737/J_1.java b/test/files/pos/t4737/J_1.java
index 284afd6c10..284afd6c10 100644
--- a/test/files/pos/bug4737/J_1.java
+++ b/test/files/pos/t4737/J_1.java
diff --git a/test/files/pos/bug4737/S_2.scala b/test/files/pos/t4737/S_2.scala
index 8598466557..8598466557 100644
--- a/test/files/pos/bug4737/S_2.scala
+++ b/test/files/pos/t4737/S_2.scala
diff --git a/test/files/pos/bug4757/A_2.scala b/test/files/pos/t4757/A_2.scala
index 63106a6179..63106a6179 100644
--- a/test/files/pos/bug4757/A_2.scala
+++ b/test/files/pos/t4757/A_2.scala
diff --git a/test/files/pos/bug4757/B_3.scala b/test/files/pos/t4757/B_3.scala
index b50d1cd834..b50d1cd834 100644
--- a/test/files/pos/bug4757/B_3.scala
+++ b/test/files/pos/t4757/B_3.scala
diff --git a/test/files/pos/bug4757/P_1.scala b/test/files/pos/t4757/P_1.scala
index 8f01a4b669..8f01a4b669 100644
--- a/test/files/pos/bug4757/P_1.scala
+++ b/test/files/pos/t4757/P_1.scala
diff --git a/test/files/pos/bug4840.flags b/test/files/pos/t4840.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/pos/bug4840.flags
+++ b/test/files/pos/t4840.flags
diff --git a/test/files/pos/bug4840.scala b/test/files/pos/t4840.scala
index bf44f71d7a..bf44f71d7a 100644
--- a/test/files/pos/bug4840.scala
+++ b/test/files/pos/t4840.scala
diff --git a/test/files/pos/bug4853.scala b/test/files/pos/t4853.scala
index c91f2d6b05..c91f2d6b05 100644
--- a/test/files/pos/bug4853.scala
+++ b/test/files/pos/t4853.scala
diff --git a/test/files/pos/bug514.scala b/test/files/pos/t514.scala
index 188e4f2e56..188e4f2e56 100644
--- a/test/files/pos/bug514.scala
+++ b/test/files/pos/t514.scala
diff --git a/test/files/pos/bug516.scala b/test/files/pos/t516.scala
index ce4e0e3dd6..ce4e0e3dd6 100644
--- a/test/files/pos/bug516.scala
+++ b/test/files/pos/t516.scala
diff --git a/test/files/pos/bug522.scala b/test/files/pos/t522.scala
index e6eb25b6c3..e6eb25b6c3 100644
--- a/test/files/pos/bug522.scala
+++ b/test/files/pos/t522.scala
diff --git a/test/files/pos/bug530.scala b/test/files/pos/t530.scala
index 6c887d6821..6c887d6821 100644
--- a/test/files/pos/bug530.scala
+++ b/test/files/pos/t530.scala
diff --git a/test/files/pos/bug533.scala b/test/files/pos/t533.scala
index 0a6515fed3..0a6515fed3 100644
--- a/test/files/pos/bug533.scala
+++ b/test/files/pos/t533.scala
diff --git a/test/files/pos/bug566.scala b/test/files/pos/t566.scala
index 6a2a0a3621..6a2a0a3621 100644
--- a/test/files/pos/bug566.scala
+++ b/test/files/pos/t566.scala
diff --git a/test/files/pos/bug573.scala b/test/files/pos/t573.scala
index 694d001e3c..694d001e3c 100644
--- a/test/files/pos/bug573.scala
+++ b/test/files/pos/t573.scala
diff --git a/test/files/pos/bug577.scala b/test/files/pos/t577.scala
index ede45399a0..ede45399a0 100644
--- a/test/files/pos/bug577.scala
+++ b/test/files/pos/t577.scala
diff --git a/test/files/pos/bug578.scala b/test/files/pos/t578.scala
index 6f95dd8cea..6f95dd8cea 100644
--- a/test/files/pos/bug578.scala
+++ b/test/files/pos/t578.scala
diff --git a/test/files/pos/bug592.scala b/test/files/pos/t592.scala
index 6a941ef51a..6a941ef51a 100644
--- a/test/files/pos/bug592.scala
+++ b/test/files/pos/t592.scala
diff --git a/test/files/pos/bug595.scala b/test/files/pos/t595.scala
index 44124c90c9..44124c90c9 100644
--- a/test/files/pos/bug595.scala
+++ b/test/files/pos/t595.scala
diff --git a/test/files/pos/bug596.scala b/test/files/pos/t596.scala
index b1b5471b2f..b1b5471b2f 100644
--- a/test/files/pos/bug596.scala
+++ b/test/files/pos/t596.scala
diff --git a/test/files/pos/bug599.scala b/test/files/pos/t599.scala
index 968e2deaee..968e2deaee 100644
--- a/test/files/pos/bug599.scala
+++ b/test/files/pos/t599.scala
diff --git a/test/files/pos/bug602.scala b/test/files/pos/t602.scala
index 18dd405645..18dd405645 100644
--- a/test/files/pos/bug602.scala
+++ b/test/files/pos/t602.scala
diff --git a/test/files/pos/bug604.scala b/test/files/pos/t604.scala
index fb90d5ae31..fb90d5ae31 100644
--- a/test/files/pos/bug604.scala
+++ b/test/files/pos/t604.scala
diff --git a/test/files/pos/bug607.scala b/test/files/pos/t607.scala
index 42c3a15a85..42c3a15a85 100644
--- a/test/files/pos/bug607.scala
+++ b/test/files/pos/t607.scala
diff --git a/test/files/pos/bug611.scala b/test/files/pos/t611.scala
index 40ad28db4b..40ad28db4b 100644
--- a/test/files/pos/bug611.scala
+++ b/test/files/pos/t611.scala
diff --git a/test/files/pos/bug613.scala b/test/files/pos/t613.scala
index e140833106..e140833106 100644
--- a/test/files/pos/bug613.scala
+++ b/test/files/pos/t613.scala
diff --git a/test/files/pos/bug615.scala b/test/files/pos/t615.scala
index 8fefc952e0..8fefc952e0 100644
--- a/test/files/pos/bug615.scala
+++ b/test/files/pos/t615.scala
diff --git a/test/files/pos/bug616.scala b/test/files/pos/t616.scala
index bb91c732a6..bb91c732a6 100644
--- a/test/files/pos/bug616.scala
+++ b/test/files/pos/t616.scala
diff --git a/test/files/pos/bug628.scala b/test/files/pos/t628.scala
index f32c1cad0f..f32c1cad0f 100644
--- a/test/files/pos/bug628.scala
+++ b/test/files/pos/t628.scala
diff --git a/test/files/pos/bug640.scala b/test/files/pos/t640.scala
index 55f61df8af..55f61df8af 100644
--- a/test/files/pos/bug640.scala
+++ b/test/files/pos/t640.scala
diff --git a/test/files/pos/bug651.scala b/test/files/pos/t651.scala
index c146446af9..c146446af9 100644
--- a/test/files/pos/bug651.scala
+++ b/test/files/pos/t651.scala
diff --git a/test/files/pos/bug661.scala b/test/files/pos/t661.scala
index 3a447241fe..3a447241fe 100644
--- a/test/files/pos/bug661.scala
+++ b/test/files/pos/t661.scala
diff --git a/test/files/pos/bug675.scala b/test/files/pos/t675.scala
index c736d9dc05..c736d9dc05 100644
--- a/test/files/pos/bug675.scala
+++ b/test/files/pos/t675.scala
diff --git a/test/files/pos/bug684.scala b/test/files/pos/t684.scala
index fb5cac3a1a..fb5cac3a1a 100644
--- a/test/files/pos/bug684.scala
+++ b/test/files/pos/t684.scala
diff --git a/test/files/pos/bug690.scala b/test/files/pos/t690.scala
index a93c54f007..a93c54f007 100644
--- a/test/files/pos/bug690.scala
+++ b/test/files/pos/t690.scala
diff --git a/test/files/pos/bug694.scala b/test/files/pos/t694.scala
index ebabc658ce..ebabc658ce 100644
--- a/test/files/pos/bug694.scala
+++ b/test/files/pos/t694.scala
diff --git a/test/files/pos/bug697.scala b/test/files/pos/t697.scala
index 6caea418d5..6caea418d5 100644
--- a/test/files/pos/bug697.scala
+++ b/test/files/pos/t697.scala
diff --git a/test/files/pos/bug698.scala b/test/files/pos/t698.scala
index 00b3707976..00b3707976 100644
--- a/test/files/pos/bug698.scala
+++ b/test/files/pos/t698.scala
diff --git a/test/files/pos/bug703.scala b/test/files/pos/t703.scala
index b24d70c929..b24d70c929 100644
--- a/test/files/pos/bug703.scala
+++ b/test/files/pos/t703.scala
diff --git a/test/files/pos/bug704.scala b/test/files/pos/t704.scala
index e77a54a58e..e77a54a58e 100644
--- a/test/files/pos/bug704.scala
+++ b/test/files/pos/t704.scala
diff --git a/test/files/pos/bug711.scala b/test/files/pos/t711.scala
index 4dd6040969..4dd6040969 100644
--- a/test/files/pos/bug711.scala
+++ b/test/files/pos/t711.scala
diff --git a/test/files/pos/bug715.cmds b/test/files/pos/t715.cmds
index 2836967fca..2836967fca 100644
--- a/test/files/pos/bug715.cmds
+++ b/test/files/pos/t715.cmds
diff --git a/test/files/pos/bug715/meredith_1.scala b/test/files/pos/t715/meredith_1.scala
index 4be7b48908..4be7b48908 100644
--- a/test/files/pos/bug715/meredith_1.scala
+++ b/test/files/pos/t715/meredith_1.scala
diff --git a/test/files/pos/bug715/runner_2.scala b/test/files/pos/t715/runner_2.scala
index 1e4f40d654..1e4f40d654 100644
--- a/test/files/pos/bug715/runner_2.scala
+++ b/test/files/pos/t715/runner_2.scala
diff --git a/test/files/pos/bug720.scala b/test/files/pos/t720.scala
index ef04d01bec..ef04d01bec 100644
--- a/test/files/pos/bug720.scala
+++ b/test/files/pos/t720.scala
diff --git a/test/files/pos/bug756.scala b/test/files/pos/t756.scala
index a3c790c654..a3c790c654 100644
--- a/test/files/pos/bug756.scala
+++ b/test/files/pos/t756.scala
diff --git a/test/files/pos/bug757.scala b/test/files/pos/t757.scala
index fd7624cee7..fd7624cee7 100644
--- a/test/files/pos/bug757.scala
+++ b/test/files/pos/t757.scala
diff --git a/test/files/pos/bug757a.scala b/test/files/pos/t757a.scala
index f52652b1ba..f52652b1ba 100644
--- a/test/files/pos/bug757a.scala
+++ b/test/files/pos/t757a.scala
diff --git a/test/files/pos/bug758.scala b/test/files/pos/t758.scala
index 160bf37172..160bf37172 100644
--- a/test/files/pos/bug758.scala
+++ b/test/files/pos/t758.scala
diff --git a/test/files/pos/bug759.scala b/test/files/pos/t759.scala
index 4fa0ca0b22..4fa0ca0b22 100644
--- a/test/files/pos/bug759.scala
+++ b/test/files/pos/t759.scala
diff --git a/test/files/pos/bug762.scala b/test/files/pos/t762.scala
index 76860272ea..76860272ea 100644
--- a/test/files/pos/bug762.scala
+++ b/test/files/pos/t762.scala
diff --git a/test/files/pos/bug767.scala b/test/files/pos/t767.scala
index 0c4067f022..0c4067f022 100644
--- a/test/files/pos/bug767.scala
+++ b/test/files/pos/t767.scala
diff --git a/test/files/pos/bug780.scala b/test/files/pos/t780.scala
index 7ed6745d9f..7ed6745d9f 100644
--- a/test/files/pos/bug780.scala
+++ b/test/files/pos/t780.scala
diff --git a/test/files/pos/bug788.scala b/test/files/pos/t788.scala
index 19638dd170..19638dd170 100644
--- a/test/files/pos/bug788.scala
+++ b/test/files/pos/t788.scala
diff --git a/test/files/pos/bug789.scala b/test/files/pos/t789.scala
index 7a17f10b0e..7a17f10b0e 100644
--- a/test/files/pos/bug789.scala
+++ b/test/files/pos/t789.scala
diff --git a/test/files/pos/bug796.scala b/test/files/pos/t796.scala
index 066625179e..066625179e 100644
--- a/test/files/pos/bug796.scala
+++ b/test/files/pos/t796.scala
diff --git a/test/files/pos/bug802.scala b/test/files/pos/t802.scala
index 2dea7036d6..2dea7036d6 100644
--- a/test/files/pos/bug802.scala
+++ b/test/files/pos/t802.scala
diff --git a/test/files/pos/bug803.scala b/test/files/pos/t803.scala
index 066abecffa..066abecffa 100644
--- a/test/files/pos/bug803.scala
+++ b/test/files/pos/t803.scala
diff --git a/test/files/pos/bug805.scala b/test/files/pos/t805.scala
index 37bf6b5ef8..37bf6b5ef8 100644
--- a/test/files/pos/bug805.scala
+++ b/test/files/pos/t805.scala
diff --git a/test/files/pos/bug807.scala b/test/files/pos/t807.scala
index 0eeb92ea24..0eeb92ea24 100644
--- a/test/files/pos/bug807.scala
+++ b/test/files/pos/t807.scala
diff --git a/test/files/pos/bug812.scala b/test/files/pos/t812.scala
index 709b59c194..709b59c194 100644
--- a/test/files/pos/bug812.scala
+++ b/test/files/pos/t812.scala
diff --git a/test/files/pos/bug839.scala b/test/files/pos/t839.scala
index d845ed3aae..72f6ca0ec9 100644
--- a/test/files/pos/bug839.scala
+++ b/test/files/pos/t839.scala
@@ -1,4 +1,4 @@
-// see pending/pos/bug112606A.scala
+// see pending/pos/t112606A.scala
 package test;
 trait Test {
   trait Global {
diff --git a/test/files/pos/bug851.scala b/test/files/pos/t851.scala
index afe4b79d3c..afe4b79d3c 100644
--- a/test/files/pos/bug851.scala
+++ b/test/files/pos/t851.scala
diff --git a/test/files/pos/bug873.scala b/test/files/pos/t873.scala
index b8c50afd35..b8c50afd35 100644
--- a/test/files/pos/bug873.scala
+++ b/test/files/pos/t873.scala
diff --git a/test/files/pos/bug880.scala b/test/files/pos/t880.scala
index cceb53c398..cceb53c398 100644
--- a/test/files/pos/bug880.scala
+++ b/test/files/pos/t880.scala
diff --git a/test/files/pos/bug892.scala b/test/files/pos/t892.scala
index 41da7095bd..41da7095bd 100644
--- a/test/files/pos/bug892.scala
+++ b/test/files/pos/t892.scala
diff --git a/test/files/pos/bug911.scala b/test/files/pos/t911.scala
index 224b14cda3..224b14cda3 100644
--- a/test/files/pos/bug911.scala
+++ b/test/files/pos/t911.scala
diff --git a/test/files/pos/bug927.scala b/test/files/pos/t927.scala
index c903f19867..c903f19867 100644
--- a/test/files/pos/bug927.scala
+++ b/test/files/pos/t927.scala
diff --git a/test/files/pos/bug946.scala b/test/files/pos/t946.scala
index c4bd6e9ba4..c4bd6e9ba4 100644
--- a/test/files/pos/bug946.scala
+++ b/test/files/pos/t946.scala
diff --git a/test/files/pos/ticket2251.scala b/test/files/pos/ticket2251.scala
index 7b6efb0ea0..b3afee4ea9 100644
--- a/test/files/pos/ticket2251.scala
+++ b/test/files/pos/ticket2251.scala
@@ -1,6 +1,6 @@
 
 // Martin: I am not sure this is a solvable problem right now. I'll leave it in pending.
-// derived from pos/bug1001
+// derived from pos/t1001
 class A
 trait B[T <: B[T]] extends A
 class C extends B[C]
diff --git a/test/files/res/bug597.res b/test/files/res/bug597.res
deleted file mode 100644
index 0db355cd0f..0000000000
--- a/test/files/res/bug597.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug597/Test.scala
-bug597/Main.scala
diff --git a/test/files/res/bug687.res b/test/files/res/bug687.res
deleted file mode 100644
index ba8ba76995..0000000000
--- a/test/files/res/bug687.res
+++ /dev/null
@@ -1,3 +0,0 @@
-bug687/QueryA.scala
-bug687/QueryB.scala
-bug687/QueryA.scala
diff --git a/test/files/res/bug722.res b/test/files/res/bug722.res
deleted file mode 100644
index dbc785c171..0000000000
--- a/test/files/res/bug722.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug722/Parser.scala bug722/IfElse.scala
-bug722/Parser.scala bug722/IfElse.scala
diff --git a/test/files/res/bug735.res b/test/files/res/bug735.res
deleted file mode 100644
index d477e6fd47..0000000000
--- a/test/files/res/bug735.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug735/ScalaTyper.scala
-bug735/ScalaTyper.scala
diff --git a/test/files/res/bug743.res b/test/files/res/bug743.res
deleted file mode 100644
index f1dd2462e4..0000000000
--- a/test/files/res/bug743.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug743/ParserXXX.scala
-bug743/BracesXXX.scala
diff --git a/test/files/res/bug785.res b/test/files/res/bug785.res
deleted file mode 100644
index 7e5da1c453..0000000000
--- a/test/files/res/bug785.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug785/ScalaTrees.scala
-bug785/ScalaTrees.scala
diff --git a/test/files/res/bug831.res b/test/files/res/bug831.res
deleted file mode 100644
index 0cc6c398ab..0000000000
--- a/test/files/res/bug831.res
+++ /dev/null
@@ -1,2 +0,0 @@
-bug831/NewScalaTestXXX.scala
-bug831/NewScalaTestXXX.scala
diff --git a/test/files/res/bug597.check b/test/files/res/t597.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug597.check
+++ b/test/files/res/t597.check
diff --git a/test/files/res/t597.res b/test/files/res/t597.res
new file mode 100644
index 0000000000..1081b59b8b
--- /dev/null
+++ b/test/files/res/t597.res
@@ -0,0 +1,2 @@
+t597/Test.scala
+t597/Main.scala
diff --git a/test/files/res/bug597/Main.scala b/test/files/res/t597/Main.scala
index 24d1327135..24d1327135 100644
--- a/test/files/res/bug597/Main.scala
+++ b/test/files/res/t597/Main.scala
diff --git a/test/files/res/bug597/Test.scala b/test/files/res/t597/Test.scala
index 2f63f46c3d..2f63f46c3d 100644
--- a/test/files/res/bug597/Test.scala
+++ b/test/files/res/t597/Test.scala
diff --git a/test/files/res/bug687.check b/test/files/res/t687.check
index a905c3fbf0..f7b8c9292e 100644
--- a/test/files/res/bug687.check
+++ b/test/files/res/t687.check
@@ -1,6 +1,6 @@
 
 nsc> 
-nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member:
+nsc> t687/QueryB.scala:3: error: name clash between defined and inherited member:
 method equals:(o: java.lang.Object)Boolean and
 method equals:(x$1: Any)Boolean in class Any
 have same type after erasure: (o: java.lang.Object)Boolean
diff --git a/test/files/res/t687.res b/test/files/res/t687.res
new file mode 100644
index 0000000000..222297965a
--- /dev/null
+++ b/test/files/res/t687.res
@@ -0,0 +1,3 @@
+t687/QueryA.scala
+t687/QueryB.scala
+t687/QueryA.scala
diff --git a/test/files/res/bug687/QueryA.scala b/test/files/res/t687/QueryA.scala
index 2899f7e196..72365c7e7f 100644
--- a/test/files/res/bug687/QueryA.scala
+++ b/test/files/res/t687/QueryA.scala
@@ -1,4 +1,4 @@
-package bug687;
+package t687;
 trait Query {
   override def equals(o : Any) = false;
 }
diff --git a/test/files/res/bug687/QueryB.scala b/test/files/res/t687/QueryB.scala
index 3e1e0b7a34..8f6f2d9ebf 100644
--- a/test/files/res/bug687/QueryB.scala
+++ b/test/files/res/t687/QueryB.scala
@@ -1,4 +1,4 @@
-package bug687;
+package t687;
 trait Query {
   override def equals(o : Object) = false;
 }
diff --git a/test/files/res/bug722.check b/test/files/res/t722.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug722.check
+++ b/test/files/res/t722.check
diff --git a/test/files/res/t722.res b/test/files/res/t722.res
new file mode 100644
index 0000000000..e2873a556c
--- /dev/null
+++ b/test/files/res/t722.res
@@ -0,0 +1,2 @@
+t722/Parser.scala t722/IfElse.scala
+t722/Parser.scala t722/IfElse.scala
diff --git a/test/files/res/bug722/IfElse.scala b/test/files/res/t722/IfElse.scala
index 1515ecf422..c0128deab4 100644
--- a/test/files/res/bug722/IfElse.scala
+++ b/test/files/res/t722/IfElse.scala
@@ -1,4 +1,4 @@
-package bug722;
+package t722;
 trait IfEse extends ScanBased {
   object condition extends WhitespaceLink;
 }
diff --git a/test/files/res/bug722/Parser.scala b/test/files/res/t722/Parser.scala
index 7f84cb2b63..5dfcd57367 100644
--- a/test/files/res/bug722/Parser.scala
+++ b/test/files/res/t722/Parser.scala
@@ -1,5 +1,5 @@
 
-package bug722;
+package t722;
 trait Parser {
   trait Link  {
     def foo() = {}
diff --git a/test/files/res/bug722/ScanBased.scala b/test/files/res/t722/ScanBased.scala
index 4793a04914..8e55b800ac 100644
--- a/test/files/res/bug722/ScanBased.scala
+++ b/test/files/res/t722/ScanBased.scala
@@ -1,4 +1,4 @@
-package bug722;
+package t722;
 trait ScanBased extends Parser {
  trait AdjacentLink extends Link {
     override def foo() = super.foo;
diff --git a/test/files/res/bug735.check b/test/files/res/t735.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug735.check
+++ b/test/files/res/t735.check
diff --git a/test/files/res/t735.res b/test/files/res/t735.res
new file mode 100644
index 0000000000..6ef42ffef0
--- /dev/null
+++ b/test/files/res/t735.res
@@ -0,0 +1,2 @@
+t735/ScalaTyper.scala
+t735/ScalaTyper.scala
diff --git a/test/files/res/bug735/ScalaExpressions.scala b/test/files/res/t735/ScalaExpressions.scala
index aacc412b68..f9c8ac733c 100644
--- a/test/files/res/bug735/ScalaExpressions.scala
+++ b/test/files/res/t735/ScalaExpressions.scala
@@ -1,4 +1,4 @@
-package bug735;
+package t735;
 trait ScalaExpressions {
   trait ExpressionFactory {
     def foo = 10;
diff --git a/test/files/res/bug735/ScalaTyper.scala b/test/files/res/t735/ScalaTyper.scala
index 75e7a1855a..0369c5f19d 100644
--- a/test/files/res/bug735/ScalaTyper.scala
+++ b/test/files/res/t735/ScalaTyper.scala
@@ -1,5 +1,5 @@
 
-package bug735;
+package t735;
 trait ScalaTyper extends ScalaExpressions {
   val values = new ValueFactory {}
 }
diff --git a/test/files/res/bug743.check b/test/files/res/t743.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug743.check
+++ b/test/files/res/t743.check
diff --git a/test/files/res/t743.res b/test/files/res/t743.res
new file mode 100644
index 0000000000..7772a4b321
--- /dev/null
+++ b/test/files/res/t743.res
@@ -0,0 +1,2 @@
+t743/ParserXXX.scala
+t743/BracesXXX.scala
diff --git a/test/files/res/bug743/BracesXXX.scala b/test/files/res/t743/BracesXXX.scala
index 8a2416caa8..ed7b386a88 100644
--- a/test/files/res/bug743/BracesXXX.scala
+++ b/test/files/res/t743/BracesXXX.scala
@@ -1,4 +1,4 @@
-package bug743;
+package t743;
 trait BracesXXX extends ParserXXX {
   trait Matchable extends IsLinked {
     def foo : NodeImpl = null;
diff --git a/test/files/res/bug743/ParserXXX.scala b/test/files/res/t743/ParserXXX.scala
index 6ecf13c1e1..d132bdbf1d 100644
--- a/test/files/res/bug743/ParserXXX.scala
+++ b/test/files/res/t743/ParserXXX.scala
@@ -1,4 +1,4 @@
-package bug743;
+package t743;
 trait ParserXXX {
   val foo = null;
   trait NodeImpl {
diff --git a/test/files/res/bug785.check b/test/files/res/t785.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug785.check
+++ b/test/files/res/t785.check
diff --git a/test/files/res/t785.res b/test/files/res/t785.res
new file mode 100644
index 0000000000..cfac559d4b
--- /dev/null
+++ b/test/files/res/t785.res
@@ -0,0 +1,2 @@
+t785/ScalaTrees.scala
+t785/ScalaTrees.scala
diff --git a/test/files/res/bug785/ScalaNewTyper.scala b/test/files/res/t785/ScalaNewTyper.scala
index d55d60a8d0..acdba0f25d 100644
--- a/test/files/res/bug785/ScalaNewTyper.scala
+++ b/test/files/res/t785/ScalaNewTyper.scala
@@ -1,4 +1,4 @@
-package bug785;
+package t785;
 trait ScalaNewTyper {
   private var typed : String = null;
   trait HasSymbol {
diff --git a/test/files/res/bug785/ScalaTrees.scala b/test/files/res/t785/ScalaTrees.scala
index ade58e65c6..fdf32b5234 100644
--- a/test/files/res/bug785/ScalaTrees.scala
+++ b/test/files/res/t785/ScalaTrees.scala
@@ -1,4 +1,4 @@
-package bug785;
+package t785;
 trait ScalaTrees extends ScalaNewTyper {
   trait TraitClassImpl extends HasArgsTypeParametersImpl {
     argss(null);
diff --git a/test/files/res/bug831.check b/test/files/res/t831.check
index 6cf64f734b..6cf64f734b 100644
--- a/test/files/res/bug831.check
+++ b/test/files/res/t831.check
diff --git a/test/files/res/t831.res b/test/files/res/t831.res
new file mode 100644
index 0000000000..9b9bd69530
--- /dev/null
+++ b/test/files/res/t831.res
@@ -0,0 +1,2 @@
+t831/NewScalaTestXXX.scala
+t831/NewScalaTestXXX.scala
diff --git a/test/files/res/bug831/NewScalaParserXXX.scala b/test/files/res/t831/NewScalaParserXXX.scala
index e5af487def..958e4f99c1 100644
--- a/test/files/res/bug831/NewScalaParserXXX.scala
+++ b/test/files/res/t831/NewScalaParserXXX.scala
@@ -1,4 +1,4 @@
-package bug831;
+package t831;
 
 trait ScalaNodeScannerXXX {
   type Node <: NodeImpl;
diff --git a/test/files/res/bug831/NewScalaTestXXX.scala b/test/files/res/t831/NewScalaTestXXX.scala
index a1dafa8eac..24d864f298 100644
--- a/test/files/res/bug831/NewScalaTestXXX.scala
+++ b/test/files/res/t831/NewScalaTestXXX.scala
@@ -1,2 +1,2 @@
-package bug831;
+package t831;
 abstract class NewScalaTestXXX extends NewScalaParserXXX;
diff --git a/test/files/run/bug0325.check b/test/files/run/t0325.check
index 85fe91dac6..85fe91dac6 100644
--- a/test/files/run/bug0325.check
+++ b/test/files/run/t0325.check
diff --git a/test/files/run/bug0325.scala b/test/files/run/t0325.scala
index 236f1b101f..236f1b101f 100644
--- a/test/files/run/bug0325.scala
+++ b/test/files/run/t0325.scala
diff --git a/test/files/run/bug1005.check b/test/files/run/t1005.check
index 6ec0929090..6ec0929090 100644
--- a/test/files/run/bug1005.check
+++ b/test/files/run/t1005.check
diff --git a/test/files/run/bug1005.scala b/test/files/run/t1005.scala
index 5ccd89dd85..5ccd89dd85 100644
--- a/test/files/run/bug1005.scala
+++ b/test/files/run/t1005.scala
diff --git a/test/files/run/bug1042.check b/test/files/run/t1042.check
index 223b7836fb..223b7836fb 100644
--- a/test/files/run/bug1042.check
+++ b/test/files/run/t1042.check
diff --git a/test/files/run/bug1042.scala b/test/files/run/t1042.scala
index 1f39fff24a..1f39fff24a 100644
--- a/test/files/run/bug1042.scala
+++ b/test/files/run/t1042.scala
diff --git a/test/files/run/bug1044.scala b/test/files/run/t1044.scala
index 4d37a40c81..4d37a40c81 100644
--- a/test/files/run/bug1044.scala
+++ b/test/files/run/t1044.scala
diff --git a/test/files/run/bug1048.check b/test/files/run/t1048.check
index f1e5eeed2d..f1e5eeed2d 100644
--- a/test/files/run/bug1048.check
+++ b/test/files/run/t1048.check
diff --git a/test/files/run/bug1048.scala b/test/files/run/t1048.scala
index 5eaeaa25c6..5eaeaa25c6 100644
--- a/test/files/run/bug1048.scala
+++ b/test/files/run/t1048.scala
diff --git a/test/files/run/bug1074.check b/test/files/run/t1074.check
index ccf1cb1551..ccf1cb1551 100644
--- a/test/files/run/bug1074.check
+++ b/test/files/run/t1074.check
diff --git a/test/files/run/bug1074.scala b/test/files/run/t1074.scala
index a95f9eedbc..a95f9eedbc 100644
--- a/test/files/run/bug1074.scala
+++ b/test/files/run/t1074.scala
diff --git a/test/files/run/bug1079.check b/test/files/run/t1079.check
index c508d5366f..c508d5366f 100644
--- a/test/files/run/bug1079.check
+++ b/test/files/run/t1079.check
diff --git a/test/files/run/bug1079.scala b/test/files/run/t1079.scala
index ce435d254b..ce435d254b 100644
--- a/test/files/run/bug1079.scala
+++ b/test/files/run/t1079.scala
diff --git a/test/files/run/bug1110.scala b/test/files/run/t1110.scala
index 824643868c..824643868c 100644
--- a/test/files/run/bug1110.scala
+++ b/test/files/run/t1110.scala
diff --git a/test/files/run/bug1141.check b/test/files/run/t1141.check
index 7262160d1d..7262160d1d 100644
--- a/test/files/run/bug1141.check
+++ b/test/files/run/t1141.check
diff --git a/test/files/run/bug1141.scala b/test/files/run/t1141.scala
index 9641343c7e..9641343c7e 100644
--- a/test/files/run/bug1141.scala
+++ b/test/files/run/t1141.scala
diff --git a/test/files/run/bug1192.check b/test/files/run/t1192.check
index 57234e1d8a..57234e1d8a 100644
--- a/test/files/run/bug1192.check
+++ b/test/files/run/t1192.check
diff --git a/test/files/run/bug1192.scala b/test/files/run/t1192.scala
index 3222bb0a37..3222bb0a37 100644
--- a/test/files/run/bug1192.scala
+++ b/test/files/run/t1192.scala
diff --git a/test/files/run/bug1220.scala b/test/files/run/t1220.scala
index 75e0ea07e8..75e0ea07e8 100644
--- a/test/files/run/bug1220.scala
+++ b/test/files/run/t1220.scala
diff --git a/test/files/run/bug1300.check b/test/files/run/t1300.check
index 0f29a1fef5..0f29a1fef5 100644
--- a/test/files/run/bug1300.check
+++ b/test/files/run/t1300.check
diff --git a/test/files/run/bug1300.scala b/test/files/run/t1300.scala
index aa3580e33c..aa3580e33c 100644
--- a/test/files/run/bug1300.scala
+++ b/test/files/run/t1300.scala
diff --git a/test/files/run/bug1309.scala b/test/files/run/t1309.scala
index 84963549a2..84963549a2 100644
--- a/test/files/run/bug1309.scala
+++ b/test/files/run/t1309.scala
diff --git a/test/files/run/bug1333.check b/test/files/run/t1333.check
index 6303af7f1c..6303af7f1c 100644
--- a/test/files/run/bug1333.check
+++ b/test/files/run/t1333.check
diff --git a/test/files/run/bug1333.scala b/test/files/run/t1333.scala
index 1696629cbb..1696629cbb 100644
--- a/test/files/run/bug1333.scala
+++ b/test/files/run/t1333.scala
diff --git a/test/files/run/bug1360.check b/test/files/run/t1360.check
index 8417e208ae..8417e208ae 100644
--- a/test/files/run/bug1360.check
+++ b/test/files/run/t1360.check
diff --git a/test/files/run/bug1360.scala b/test/files/run/t1360.scala
index 4703127666..4703127666 100644
--- a/test/files/run/bug1360.scala
+++ b/test/files/run/t1360.scala
diff --git a/test/files/run/bug1373.scala b/test/files/run/t1373.scala
index d6f9c1ee1c..d6f9c1ee1c 100644
--- a/test/files/run/bug1373.scala
+++ b/test/files/run/t1373.scala
diff --git a/test/files/run/bug1427.scala b/test/files/run/t1427.scala
index ab0a42c7b7..ab0a42c7b7 100644
--- a/test/files/run/bug1427.scala
+++ b/test/files/run/t1427.scala
diff --git a/test/files/run/bug1434.scala b/test/files/run/t1434.scala
index 63bd88ec90..63bd88ec90 100644
--- a/test/files/run/bug1434.scala
+++ b/test/files/run/t1434.scala
diff --git a/test/files/run/bug1466.scala b/test/files/run/t1466.scala
index c59a388590..c59a388590 100644
--- a/test/files/run/bug1466.scala
+++ b/test/files/run/t1466.scala
diff --git a/test/files/run/bug1766.scala b/test/files/run/t1766.scala
index 638384d4f9..638384d4f9 100644
--- a/test/files/run/bug1766.scala
+++ b/test/files/run/t1766.scala
diff --git a/test/files/run/bug2005.scala b/test/files/run/t2005.scala
index 45da9fe5b2..45da9fe5b2 100644
--- a/test/files/run/bug2005.scala
+++ b/test/files/run/t2005.scala
diff --git a/test/files/run/bug2029.check b/test/files/run/t2029.check
index 57b610ccc5..57b610ccc5 100644
--- a/test/files/run/bug2029.check
+++ b/test/files/run/t2029.check
diff --git a/test/files/run/bug2029.scala b/test/files/run/t2029.scala
index 32b04f0b47..32b04f0b47 100644
--- a/test/files/run/bug2029.scala
+++ b/test/files/run/t2029.scala
diff --git a/test/files/run/bug2075.scala b/test/files/run/t2075.scala
index e3a68e4a83..e3a68e4a83 100644
--- a/test/files/run/bug2075.scala
+++ b/test/files/run/t2075.scala
diff --git a/test/files/run/bugs2087-and-2400.scala b/test/files/run/t2087-and-2400.scala
index 19a5df26e3..19a5df26e3 100644
--- a/test/files/run/bugs2087-and-2400.scala
+++ b/test/files/run/t2087-and-2400.scala
diff --git a/test/files/run/bug2106.flags b/test/files/run/t2106.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/run/bug2106.flags
+++ b/test/files/run/t2106.flags
diff --git a/test/files/run/bug2106.scala b/test/files/run/t2106.scala
index e8124dabab..e8124dabab 100644
--- a/test/files/run/bug2106.scala
+++ b/test/files/run/t2106.scala
diff --git a/test/files/run/bug2124.check b/test/files/run/t2124.check
index 2b8840209f..2b8840209f 100644
--- a/test/files/run/bug2124.check
+++ b/test/files/run/t2124.check
diff --git a/test/files/run/bug2124.scala b/test/files/run/t2124.scala
index e72deb09bc..e72deb09bc 100644
--- a/test/files/run/bug2124.scala
+++ b/test/files/run/t2124.scala
diff --git a/test/files/run/bug2125.check b/test/files/run/t2125.check
index 2b8840209f..2b8840209f 100644
--- a/test/files/run/bug2125.check
+++ b/test/files/run/t2125.check
diff --git a/test/files/run/bug2125.scala b/test/files/run/t2125.scala
index 8314e4f019..8314e4f019 100644
--- a/test/files/run/bug2125.scala
+++ b/test/files/run/t2125.scala
diff --git a/test/files/run/bug216.check b/test/files/run/t216.check
index d86bac9de5..d86bac9de5 100644
--- a/test/files/run/bug216.check
+++ b/test/files/run/t216.check
diff --git a/test/files/run/bug216.scala b/test/files/run/t216.scala
index 916a3c582b..916a3c582b 100644
--- a/test/files/run/bug216.scala
+++ b/test/files/run/t216.scala
diff --git a/test/files/run/bug2162.check b/test/files/run/t2162.check
index 87729eb41a..87729eb41a 100644
--- a/test/files/run/bug2162.check
+++ b/test/files/run/t2162.check
diff --git a/test/files/run/bug2162.scala b/test/files/run/t2162.scala
index fe576a8e2d..fe576a8e2d 100644
--- a/test/files/run/bug2162.scala
+++ b/test/files/run/t2162.scala
diff --git a/test/files/run/bug2175.scala b/test/files/run/t2175.scala
index 7885882d30..7885882d30 100644
--- a/test/files/run/bug2175.scala
+++ b/test/files/run/t2175.scala
diff --git a/test/files/run/bug2241.scala b/test/files/run/t2241.scala
index 4a8a662b85..4a8a662b85 100644
--- a/test/files/run/bug2241.scala
+++ b/test/files/run/t2241.scala
diff --git a/test/files/run/bug2250.scala b/test/files/run/t2250.scala
index 1ed333792a..1ed333792a 100644
--- a/test/files/run/bug2250.scala
+++ b/test/files/run/t2250.scala
diff --git a/test/files/run/bug2276.check b/test/files/run/t2276.check
index 95f51c8e29..95f51c8e29 100644
--- a/test/files/run/bug2276.check
+++ b/test/files/run/t2276.check
diff --git a/test/files/run/bug2276.scala b/test/files/run/t2276.scala
index ed5714e9fa..ed5714e9fa 100644
--- a/test/files/run/bug2276.scala
+++ b/test/files/run/t2276.scala
diff --git a/test/files/run/bug2308a.check b/test/files/run/t2308a.check
index 888240c702..888240c702 100644
--- a/test/files/run/bug2308a.check
+++ b/test/files/run/t2308a.check
diff --git a/test/files/run/bug2308a.scala b/test/files/run/t2308a.scala
index fff158c772..fff158c772 100644
--- a/test/files/run/bug2308a.scala
+++ b/test/files/run/t2308a.scala
diff --git a/test/files/run/bug2354.scala b/test/files/run/t2354.scala
index f46db13a95..f46db13a95 100644
--- a/test/files/run/bug2354.scala
+++ b/test/files/run/t2354.scala
diff --git a/test/files/run/bug2378.scala b/test/files/run/t2378.scala
index f696a78b4c..f696a78b4c 100644
--- a/test/files/run/bug2378.scala
+++ b/test/files/run/t2378.scala
diff --git a/test/files/run/bug2512.scala b/test/files/run/t2512.scala
index 8166839a9a..8166839a9a 100644
--- a/test/files/run/bug2512.scala
+++ b/test/files/run/t2512.scala
diff --git a/test/files/run/bug2514.scala b/test/files/run/t2514.scala
index e23b441ecf..e23b441ecf 100644
--- a/test/files/run/bug2514.scala
+++ b/test/files/run/t2514.scala
diff --git a/test/files/run/bug2552.check b/test/files/run/t2552.check
index 1deeae772f..1deeae772f 100644
--- a/test/files/run/bug2552.check
+++ b/test/files/run/t2552.check
diff --git a/test/files/run/bug2552.scala b/test/files/run/t2552.scala
index 0c6b4f005b..0c6b4f005b 100644
--- a/test/files/run/bug2552.scala
+++ b/test/files/run/t2552.scala
diff --git a/test/files/run/bug2636.scala b/test/files/run/t2636.scala
index 8c49a733fd..8c49a733fd 100644
--- a/test/files/run/bug2636.scala
+++ b/test/files/run/t2636.scala
diff --git a/test/files/run/bug266.scala b/test/files/run/t266.scala
index 20a29dabbb..20a29dabbb 100644
--- a/test/files/run/bug266.scala
+++ b/test/files/run/t266.scala
diff --git a/test/files/run/bug2721.check b/test/files/run/t2721.check
index 2bd7656b36..2bd7656b36 100644
--- a/test/files/run/bug2721.check
+++ b/test/files/run/t2721.check
diff --git a/test/files/run/bug2721.scala b/test/files/run/t2721.scala
index 8bd03bc838..8bd03bc838 100644
--- a/test/files/run/bug2721.scala
+++ b/test/files/run/t2721.scala
diff --git a/test/files/run/bug2755.check b/test/files/run/t2755.check
index 4905c0052d..4905c0052d 100644
--- a/test/files/run/bug2755.check
+++ b/test/files/run/t2755.check
diff --git a/test/files/run/bug2755.scala b/test/files/run/t2755.scala
index 8d10b56734..8d10b56734 100644
--- a/test/files/run/bug2755.scala
+++ b/test/files/run/t2755.scala
diff --git a/test/files/run/bug2800.check b/test/files/run/t2800.check
index 546ee52413..546ee52413 100644
--- a/test/files/run/bug2800.check
+++ b/test/files/run/t2800.check
diff --git a/test/files/run/bug2800.scala b/test/files/run/t2800.scala
index 84d1de0507..84d1de0507 100644
--- a/test/files/run/bug2800.scala
+++ b/test/files/run/t2800.scala
diff --git a/test/files/run/bug2873.check b/test/files/run/t2873.check
index 9198280f61..9198280f61 100644
--- a/test/files/run/bug2873.check
+++ b/test/files/run/t2873.check
diff --git a/test/files/run/bug2873.scala b/test/files/run/t2873.scala
index 8d48a8dbb4..8d48a8dbb4 100644
--- a/test/files/run/bug2873.scala
+++ b/test/files/run/t2873.scala
diff --git a/test/files/run/bug2876.scala b/test/files/run/t2876.scala
index f71879ebff..f71879ebff 100644
--- a/test/files/run/bug2876.scala
+++ b/test/files/run/t2876.scala
diff --git a/test/files/run/bug2958.scala b/test/files/run/t2958.scala
index dcd24ecc36..dcd24ecc36 100644
--- a/test/files/run/bug2958.scala
+++ b/test/files/run/t2958.scala
diff --git a/test/files/run/bug298.check b/test/files/run/t298.check
index 1cd1d2266c..1cd1d2266c 100644
--- a/test/files/run/bug298.check
+++ b/test/files/run/t298.check
diff --git a/test/files/run/bug298.scala b/test/files/run/t298.scala
index bfc219ec5a..bfc219ec5a 100644
--- a/test/files/run/bug298.scala
+++ b/test/files/run/t298.scala
diff --git a/test/files/run/bug3004.scala b/test/files/run/t3004.scala
index a1e9c6c72f..a1e9c6c72f 100644
--- a/test/files/run/bug3004.scala
+++ b/test/files/run/t3004.scala
diff --git a/test/files/run/bug3050.scala b/test/files/run/t3050.scala
index d1f3f13bec..d1f3f13bec 100644
--- a/test/files/run/bug3050.scala
+++ b/test/files/run/t3050.scala
diff --git a/test/files/run/bug3088.scala b/test/files/run/t3088.scala
index ea820b1c9c..ea820b1c9c 100644
--- a/test/files/run/bug3088.scala
+++ b/test/files/run/t3088.scala
diff --git a/test/files/run/bug3126.scala b/test/files/run/t3126.scala
index 36322bf896..36322bf896 100644
--- a/test/files/run/bug3126.scala
+++ b/test/files/run/t3126.scala
diff --git a/test/files/run/bug3150.scala b/test/files/run/t3150.scala
index 034703b5f7..034703b5f7 100644
--- a/test/files/run/bug3150.scala
+++ b/test/files/run/t3150.scala
diff --git a/test/files/run/bug3175.check b/test/files/run/t3175.check
index 12246140f4..12246140f4 100644
--- a/test/files/run/bug3175.check
+++ b/test/files/run/t3175.check
diff --git a/test/files/run/bug3175.scala b/test/files/run/t3175.scala
index 78660d4085..78660d4085 100644
--- a/test/files/run/bug3175.scala
+++ b/test/files/run/t3175.scala
diff --git a/test/files/run/bug3232.scala b/test/files/run/t3232.scala
index acb1a1e0e9..acb1a1e0e9 100644
--- a/test/files/run/bug3232.scala
+++ b/test/files/run/t3232.scala
diff --git a/test/files/run/bug3269.check b/test/files/run/t3269.check
index c25611c15c..c25611c15c 100644
--- a/test/files/run/bug3269.check
+++ b/test/files/run/t3269.check
diff --git a/test/files/run/bug3269.scala b/test/files/run/t3269.scala
index 17e42cdb0e..17e42cdb0e 100644
--- a/test/files/run/bug3269.scala
+++ b/test/files/run/t3269.scala
diff --git a/test/files/run/bug3273.scala b/test/files/run/t3273.scala
index 379a8a29c1..379a8a29c1 100644
--- a/test/files/run/bug3273.scala
+++ b/test/files/run/t3273.scala
diff --git a/test/files/run/bug3327.check b/test/files/run/t3327.check
index 980a0d5f19..980a0d5f19 100644
--- a/test/files/run/bug3327.check
+++ b/test/files/run/t3327.check
diff --git a/test/files/run/bug3327.scala b/test/files/run/t3327.scala
index 7e6d3fc210..7e6d3fc210 100644
--- a/test/files/run/bug3327.scala
+++ b/test/files/run/t3327.scala
diff --git a/test/files/run/bug3376.check b/test/files/run/t3376.check
index 3a1d7d581b..3a1d7d581b 100644
--- a/test/files/run/bug3376.check
+++ b/test/files/run/t3376.check
diff --git a/test/files/run/bug3376.scala b/test/files/run/t3376.scala
index e2c94e5072..e2c94e5072 100644
--- a/test/files/run/bug3376.scala
+++ b/test/files/run/t3376.scala
diff --git a/test/files/run/bug3395.check b/test/files/run/t3395.check
index 5f5521fae2..5f5521fae2 100644
--- a/test/files/run/bug3395.check
+++ b/test/files/run/t3395.check
diff --git a/test/files/run/bug3395.scala b/test/files/run/t3395.scala
index b4990a1716..b4990a1716 100644
--- a/test/files/run/bug3395.scala
+++ b/test/files/run/t3395.scala
diff --git a/test/files/run/bug3397.scala b/test/files/run/t3397.scala
index 2c8cbed3ab..2c8cbed3ab 100644
--- a/test/files/run/bug3397.scala
+++ b/test/files/run/t3397.scala
diff --git a/test/files/run/bug3487.scala b/test/files/run/t3487.scala
index f2ca735913..f2ca735913 100644
--- a/test/files/run/bug3487.scala
+++ b/test/files/run/t3487.scala
diff --git a/test/files/run/bug3509.flags b/test/files/run/t3509.flags
index 6933d924d3..6933d924d3 100644
--- a/test/files/run/bug3509.flags
+++ b/test/files/run/t3509.flags
diff --git a/test/files/run/bug3509.scala b/test/files/run/t3509.scala
index 76f8d6016e..76f8d6016e 100644
--- a/test/files/run/bug3509.scala
+++ b/test/files/run/t3509.scala
diff --git a/test/files/run/bug3516.check b/test/files/run/t3516.check
index d0d10d82fa..d0d10d82fa 100644
--- a/test/files/run/bug3516.check
+++ b/test/files/run/t3516.check
diff --git a/test/files/run/bug3516.scala b/test/files/run/t3516.scala
index aa302ce85a..aa302ce85a 100644
--- a/test/files/run/bug3516.scala
+++ b/test/files/run/t3516.scala
diff --git a/test/files/run/bug3518.scala b/test/files/run/t3518.scala
index 033cc19548..033cc19548 100644
--- a/test/files/run/bug3518.scala
+++ b/test/files/run/t3518.scala
diff --git a/test/files/run/bug3529.scala b/test/files/run/t3529.scala
index bb82424bf6..bb82424bf6 100644
--- a/test/files/run/bug3529.scala
+++ b/test/files/run/t3529.scala
diff --git a/test/files/run/bug3530.check b/test/files/run/t3530.check
index 1f906680e9..1f906680e9 100644
--- a/test/files/run/bug3530.check
+++ b/test/files/run/t3530.check
diff --git a/test/files/run/bug3530.scala b/test/files/run/t3530.scala
index f6f7fb4229..f6f7fb4229 100644
--- a/test/files/run/bug3530.scala
+++ b/test/files/run/t3530.scala
diff --git a/test/files/run/bug3540.scala b/test/files/run/t3540.scala
index 5ffacb5dff..5ffacb5dff 100644
--- a/test/files/run/bug3540.scala
+++ b/test/files/run/t3540.scala
diff --git a/test/files/run/bug3563.scala b/test/files/run/t3563.scala
index 8abbb60803..8abbb60803 100644
--- a/test/files/run/bug3563.scala
+++ b/test/files/run/t3563.scala
diff --git a/test/files/run/bug3613.scala b/test/files/run/t3613.scala
index 3763093d30..3763093d30 100644
--- a/test/files/run/bug3613.scala
+++ b/test/files/run/t3613.scala
diff --git a/test/files/run/bug3616.check b/test/files/run/t3616.check
index f31e21baff..f31e21baff 100644
--- a/test/files/run/bug3616.check
+++ b/test/files/run/t3616.check
diff --git a/test/files/run/bug3616.scala b/test/files/run/t3616.scala
index 777b97f9ab..777b97f9ab 100644
--- a/test/files/run/bug3616.scala
+++ b/test/files/run/t3616.scala
diff --git a/test/files/run/bug363.check b/test/files/run/t363.check
index 040b97c07a..040b97c07a 100644
--- a/test/files/run/bug363.check
+++ b/test/files/run/t363.check
diff --git a/test/files/run/bug363.scala b/test/files/run/t363.scala
index c747be2ec9..c747be2ec9 100644
--- a/test/files/run/bug363.scala
+++ b/test/files/run/t363.scala
diff --git a/test/files/run/bug3699.scala b/test/files/run/t3699.scala
index 0475353887..0475353887 100644
--- a/test/files/run/bug3699.scala
+++ b/test/files/run/t3699.scala
diff --git a/test/files/run/bug3714.scala b/test/files/run/t3714.scala
index 2d600f97f1..2d600f97f1 100644
--- a/test/files/run/bug3714.scala
+++ b/test/files/run/t3714.scala
diff --git a/test/files/run/bug3760.scala b/test/files/run/t3760.scala
index b78406824e..b78406824e 100644
--- a/test/files/run/bug3760.scala
+++ b/test/files/run/t3760.scala
diff --git a/test/files/run/bug3822.scala b/test/files/run/t3822.scala
index c35804035e..c35804035e 100644
--- a/test/files/run/bug3822.scala
+++ b/test/files/run/t3822.scala
diff --git a/test/files/run/bug3855.scala b/test/files/run/t3855.scala
index 32dfb1e23d..32dfb1e23d 100644
--- a/test/files/run/bug3855.scala
+++ b/test/files/run/t3855.scala
diff --git a/test/files/run/bug3923.scala b/test/files/run/t3923.scala
index 484095a607..484095a607 100644
--- a/test/files/run/bug3923.scala
+++ b/test/files/run/t3923.scala
diff --git a/test/files/run/bug3964.check b/test/files/run/t3964.check
index 55569e49e6..55569e49e6 100644
--- a/test/files/run/bug3964.check
+++ b/test/files/run/t3964.check
diff --git a/test/files/run/bug3964.scala b/test/files/run/t3964.scala
index df1eb716e8..df1eb716e8 100644
--- a/test/files/run/bug3964.scala
+++ b/test/files/run/t3964.scala
diff --git a/test/files/run/bug3984.scala b/test/files/run/t3984.scala
index 0747b0ee25..0747b0ee25 100644
--- a/test/files/run/bug3984.scala
+++ b/test/files/run/t3984.scala
diff --git a/test/files/run/bug405.scala b/test/files/run/t405.scala
index e736fc1e57..e736fc1e57 100644
--- a/test/files/run/bug405.scala
+++ b/test/files/run/t405.scala
diff --git a/test/files/run/bug4062.check b/test/files/run/t4062.check
index 1d474d5255..1d474d5255 100644
--- a/test/files/run/bug4062.check
+++ b/test/files/run/t4062.check
diff --git a/test/files/run/bug4062.scala b/test/files/run/t4062.scala
index f5478e7593..f5478e7593 100644
--- a/test/files/run/bug4062.scala
+++ b/test/files/run/t4062.scala
diff --git a/test/files/run/bug408.scala b/test/files/run/t408.scala
index 9e51e881ed..9e51e881ed 100644
--- a/test/files/run/bug408.scala
+++ b/test/files/run/t408.scala
diff --git a/test/files/run/bug4080.check b/test/files/run/t4080.check
index 66ce31bb43..66ce31bb43 100644
--- a/test/files/run/bug4080.check
+++ b/test/files/run/t4080.check
diff --git a/test/files/run/bug4080.scala b/test/files/run/t4080.scala
index 92740ed776..92740ed776 100644
--- a/test/files/run/bug4080.scala
+++ b/test/files/run/t4080.scala
diff --git a/test/files/run/bug4110.check b/test/files/run/t4110.check
index 8b005989de..8b005989de 100644
--- a/test/files/run/bug4110.check
+++ b/test/files/run/t4110.check
diff --git a/test/files/run/bug4110.scala b/test/files/run/t4110.scala
index a42646ce52..a42646ce52 100644
--- a/test/files/run/bug4110.scala
+++ b/test/files/run/t4110.scala
diff --git a/test/files/run/bug4119/J.java b/test/files/run/t4119/J.java
index ee65d33e22..ee65d33e22 100644
--- a/test/files/run/bug4119/J.java
+++ b/test/files/run/t4119/J.java
diff --git a/test/files/run/bug4119/S.scala b/test/files/run/t4119/S.scala
index d6ae5f1b87..d6ae5f1b87 100644
--- a/test/files/run/bug4119/S.scala
+++ b/test/files/run/t4119/S.scala
diff --git a/test/files/run/bug4122.scala b/test/files/run/t4122.scala
index 5ff570c009..5ff570c009 100644
--- a/test/files/run/bug4122.scala
+++ b/test/files/run/t4122.scala
diff --git a/test/files/run/bug4148.check b/test/files/run/t4148.check
index 544b0d19d1..544b0d19d1 100644
--- a/test/files/run/bug4148.check
+++ b/test/files/run/t4148.check
diff --git a/test/files/run/bug4148.scala b/test/files/run/t4148.scala
index a7d181268d..a7d181268d 100644
--- a/test/files/run/bug4148.scala
+++ b/test/files/run/t4148.scala
diff --git a/test/files/run/bug4172.check b/test/files/run/t4172.check
index 4bb963baa9..4bb963baa9 100644
--- a/test/files/run/bug4172.check
+++ b/test/files/run/t4172.check
diff --git a/test/files/run/bug4172.scala b/test/files/run/t4172.scala
index 3a08f2fecd..3a08f2fecd 100644
--- a/test/files/run/bug4172.scala
+++ b/test/files/run/t4172.scala
diff --git a/test/files/run/bug4201.scala b/test/files/run/t4201.scala
index f6c0acaf94..f6c0acaf94 100644
--- a/test/files/run/bug4201.scala
+++ b/test/files/run/t4201.scala
diff --git a/test/files/run/bug4238/J_1.java b/test/files/run/t4238/J_1.java
index 47a9c21000..47a9c21000 100644
--- a/test/files/run/bug4238/J_1.java
+++ b/test/files/run/t4238/J_1.java
diff --git a/test/files/run/bug4238/s_2.scala b/test/files/run/t4238/s_2.scala
index a6e9bd11de..a6e9bd11de 100644
--- a/test/files/run/bug4238/s_2.scala
+++ b/test/files/run/t4238/s_2.scala
diff --git a/test/files/run/bug4285.check b/test/files/run/t4285.check
index 84f8929e43..84f8929e43 100644
--- a/test/files/run/bug4285.check
+++ b/test/files/run/t4285.check
diff --git a/test/files/run/bug4285.flags b/test/files/run/t4285.flags
index eb4d19bcb9..eb4d19bcb9 100644
--- a/test/files/run/bug4285.flags
+++ b/test/files/run/t4285.flags
diff --git a/test/files/run/bug4285.scala b/test/files/run/t4285.scala
index 1d9afcaf3d..1d9afcaf3d 100644
--- a/test/files/run/bug4285.scala
+++ b/test/files/run/t4285.scala
diff --git a/test/files/run/bug4288.scala b/test/files/run/t4288.scala
index 4e7b366f60..4e7b366f60 100644
--- a/test/files/run/bug4288.scala
+++ b/test/files/run/t4288.scala
diff --git a/test/files/run/bug429.check b/test/files/run/t429.check
index 22b91b7850..22b91b7850 100644
--- a/test/files/run/bug429.check
+++ b/test/files/run/t429.check
diff --git a/test/files/run/bug429.scala b/test/files/run/t429.scala
index e62a6b307b..e62a6b307b 100644
--- a/test/files/run/bug429.scala
+++ b/test/files/run/t429.scala
diff --git a/test/files/run/bug4297.scala b/test/files/run/t4297.scala
index 7497dfe4c2..7497dfe4c2 100644
--- a/test/files/run/bug4297.scala
+++ b/test/files/run/t4297.scala
diff --git a/test/files/run/bug4317.check b/test/files/run/t4317.check
index c6d0e511a5..c6d0e511a5 100644
--- a/test/files/run/bug4317.check
+++ b/test/files/run/t4317.check
diff --git a/test/files/run/bug4317.flags b/test/files/run/t4317.flags
index e8fb65d50c..e8fb65d50c 100644
--- a/test/files/run/bug4317.flags
+++ b/test/files/run/t4317.flags
diff --git a/test/files/run/bug4317/J_2.java b/test/files/run/t4317/J_2.java
index 4e81b390eb..4e81b390eb 100644
--- a/test/files/run/bug4317/J_2.java
+++ b/test/files/run/t4317/J_2.java
diff --git a/test/files/run/bug4317/S_1.scala b/test/files/run/t4317/S_1.scala
index 2de408268c..2de408268c 100644
--- a/test/files/run/bug4317/S_1.scala
+++ b/test/files/run/t4317/S_1.scala
diff --git a/test/files/run/bug4317/S_3.scala b/test/files/run/t4317/S_3.scala
index ce8e2330e3..ce8e2330e3 100644
--- a/test/files/run/bug4317/S_3.scala
+++ b/test/files/run/t4317/S_3.scala
diff --git a/test/files/run/bug4387.scala b/test/files/run/t4387.scala
index f51c9b0572..f51c9b0572 100644
--- a/test/files/run/bug4387.scala
+++ b/test/files/run/t4387.scala
diff --git a/test/files/run/bug4532.check b/test/files/run/t4532.check
index 47a9809248..47a9809248 100644
--- a/test/files/run/bug4532.check
+++ b/test/files/run/t4532.check
diff --git a/test/files/run/bug4532.scala b/test/files/run/t4532.scala
index 2e100f2cc7..2e100f2cc7 100644
--- a/test/files/run/bug4532.scala
+++ b/test/files/run/t4532.scala
diff --git a/test/files/run/bug4542.check b/test/files/run/t4542.check
index cd7a2905e2..cd7a2905e2 100644
--- a/test/files/run/bug4542.check
+++ b/test/files/run/t4542.check
diff --git a/test/files/run/bug4542.scala b/test/files/run/t4542.scala
index 5d6e8fe87c..5d6e8fe87c 100644
--- a/test/files/run/bug4542.scala
+++ b/test/files/run/t4542.scala
diff --git a/test/files/run/bug4558.scala b/test/files/run/t4558.scala
index e7661421dc..e7661421dc 100644
--- a/test/files/run/bug4558.scala
+++ b/test/files/run/t4558.scala
diff --git a/test/files/run/bug4570.check b/test/files/run/t4570.check
index 257cc5642c..257cc5642c 100644
--- a/test/files/run/bug4570.check
+++ b/test/files/run/t4570.check
diff --git a/test/files/run/bug4570.scala b/test/files/run/t4570.scala
index 5e1a20c52d..5e1a20c52d 100644
--- a/test/files/run/bug4570.scala
+++ b/test/files/run/t4570.scala
diff --git a/test/files/run/bug4582.scala b/test/files/run/t4582.scala
index f747791546..f747791546 100644
--- a/test/files/run/bug4582.scala
+++ b/test/files/run/t4582.scala
diff --git a/test/files/run/bug4592.check b/test/files/run/t4592.check
index e133386482..e133386482 100644
--- a/test/files/run/bug4592.check
+++ b/test/files/run/t4592.check
diff --git a/test/files/run/bug4592.scala b/test/files/run/t4592.scala
index d1666d84d7..d1666d84d7 100644
--- a/test/files/run/bug4592.scala
+++ b/test/files/run/t4592.scala
diff --git a/test/files/run/bug4601.check b/test/files/run/t4601.check
index 83b0b0b0ff..83b0b0b0ff 100644
--- a/test/files/run/bug4601.check
+++ b/test/files/run/t4601.check
diff --git a/test/files/run/bug4601.scala b/test/files/run/t4601.scala
index fe40634842..fe40634842 100644
--- a/test/files/run/bug4601.scala
+++ b/test/files/run/t4601.scala
diff --git a/test/files/run/bug4617.check b/test/files/run/t4617.check
index 6bbcce30eb..6bbcce30eb 100644
--- a/test/files/run/bug4617.check
+++ b/test/files/run/t4617.check
diff --git a/test/files/run/bug4617.scala b/test/files/run/t4617.scala
index 2fea5e29ec..2fea5e29ec 100644
--- a/test/files/run/bug4617.scala
+++ b/test/files/run/t4617.scala
diff --git a/test/files/run/bug4656.check b/test/files/run/t4656.check
index 15a62794a9..15a62794a9 100644
--- a/test/files/run/bug4656.check
+++ b/test/files/run/t4656.check
diff --git a/test/files/run/bug4656.scala b/test/files/run/t4656.scala
index 4f3d189c8f..4f3d189c8f 100644
--- a/test/files/run/bug4656.scala
+++ b/test/files/run/t4656.scala
diff --git a/test/files/run/bug4660.scala b/test/files/run/t4660.scala
index e57bb4bf25..e57bb4bf25 100644
--- a/test/files/run/bug4660.scala
+++ b/test/files/run/t4660.scala
diff --git a/test/files/run/bug4671.check b/test/files/run/t4671.check
index dc92c9a72f..4699818cd4 100644
--- a/test/files/run/bug4671.check
+++ b/test/files/run/t4671.check
@@ -1,7 +1,7 @@
 Type in expressions to have them evaluated.
 Type :help for more information.
 
-scala> object o { val file = sys.props("partest.cwd") + "/bug4671.scala" }
+scala> object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
 defined module o
 
 scala> val s = scala.io.Source.fromFile(o.file)
@@ -13,7 +13,7 @@ import scala.tools.partest.ReplTest
 object Test extends ReplTest {  
   // My god...it's full of quines
   def code = """
-object o { val file = sys.props("partest.cwd") + "/bug4671.scala" }
+object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
 val s = scala.io.Source.fromFile(o.file)
 println(s.getLines.mkString("\n"))
 
@@ -33,7 +33,7 @@ import scala.tools.partest.ReplTest
 object Test extends ReplTest {  
   // My god...it's full of quines
   def code = """
-object o { val file = sys.props("partest.cwd") + "/bug4671.scala" }
+object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
 val s = scala.io.Source.fromFile(o.file)
 println(s.getLines.mkString("\n"))
 
diff --git a/test/files/run/bug4671.scala b/test/files/run/t4671.scala
index 0c1e5908bf..6170104c33 100644
--- a/test/files/run/bug4671.scala
+++ b/test/files/run/t4671.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.ReplTest
 object Test extends ReplTest {
   // My god...it's full of quines
   def code = """
-object o { val file = sys.props("partest.cwd") + "/bug4671.scala" }
+object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
 val s = scala.io.Source.fromFile(o.file)
 println(s.getLines.mkString("\n"))
 
diff --git a/test/files/run/bug4680.check b/test/files/run/t4680.check
index b5cfc651f2..b5cfc651f2 100644
--- a/test/files/run/bug4680.check
+++ b/test/files/run/t4680.check
diff --git a/test/files/run/bug4680.scala b/test/files/run/t4680.scala
index d5c8d0e7af..d5c8d0e7af 100644
--- a/test/files/run/bug4680.scala
+++ b/test/files/run/t4680.scala
diff --git a/test/files/run/bug4697.check b/test/files/run/t4697.check
index b9d569380c..b9d569380c 100644
--- a/test/files/run/bug4697.check
+++ b/test/files/run/t4697.check
diff --git a/test/files/run/bug4697.scala b/test/files/run/t4697.scala
index 95592172e0..95592172e0 100644
--- a/test/files/run/bug4697.scala
+++ b/test/files/run/t4697.scala
diff --git a/test/files/run/bug4710.check b/test/files/run/t4710.check
index aa2f08d452..aa2f08d452 100644
--- a/test/files/run/bug4710.check
+++ b/test/files/run/t4710.check
diff --git a/test/files/run/bug4710.scala b/test/files/run/t4710.scala
index 5e5b1e86b5..5e5b1e86b5 100644
--- a/test/files/run/bug4710.scala
+++ b/test/files/run/t4710.scala
diff --git a/test/files/run/bug4752.scala b/test/files/run/t4752.scala
index 3d5c166a7a..3d5c166a7a 100644
--- a/test/files/run/bug4752.scala
+++ b/test/files/run/t4752.scala
diff --git a/test/files/run/bug4753.check b/test/files/run/t4753.check
index 7b19ee8df2..7b19ee8df2 100644
--- a/test/files/run/bug4753.check
+++ b/test/files/run/t4753.check
diff --git a/test/files/run/bug4753.scala b/test/files/run/t4753.scala
index cfb252cbe5..cfb252cbe5 100644
--- a/test/files/run/bug4753.scala
+++ b/test/files/run/t4753.scala
diff --git a/test/files/run/bug4827.scala b/test/files/run/t4827.scala
index 7270cf169d..7270cf169d 100644
--- a/test/files/run/bug4827.scala
+++ b/test/files/run/t4827.scala
diff --git a/test/files/run/bug4827b.scala b/test/files/run/t4827b.scala
index 84d6d907d3..84d6d907d3 100644
--- a/test/files/run/bug4827b.scala
+++ b/test/files/run/t4827b.scala
diff --git a/test/files/run/bug4891.check b/test/files/run/t4891.check
index 072f8df8d4..072f8df8d4 100644
--- a/test/files/run/bug4891.check
+++ b/test/files/run/t4891.check
diff --git a/test/files/run/bug4891/J_2.java b/test/files/run/t4891/J_2.java
index db1cc52b13..db1cc52b13 100644
--- a/test/files/run/bug4891/J_2.java
+++ b/test/files/run/t4891/J_2.java
diff --git a/test/files/run/bug4891/S_1.scala b/test/files/run/t4891/S_1.scala
index 3309d22fbd..3309d22fbd 100644
--- a/test/files/run/bug4891/S_1.scala
+++ b/test/files/run/t4891/S_1.scala
diff --git a/test/files/run/bug4891/S_3.scala b/test/files/run/t4891/S_3.scala
index 0da4912bc5..0da4912bc5 100644
--- a/test/files/run/bug4891/S_3.scala
+++ b/test/files/run/t4891/S_3.scala
diff --git a/test/files/run/bug576.check b/test/files/run/t576.check
index 8a1218a102..8a1218a102 100644
--- a/test/files/run/bug576.check
+++ b/test/files/run/t576.check
diff --git a/test/files/run/bug576.scala b/test/files/run/t576.scala
index 2fc929f325..2fc929f325 100644
--- a/test/files/run/bug576.scala
+++ b/test/files/run/t576.scala
diff --git a/test/files/run/bug594.check b/test/files/run/t594.check
index 814f4a4229..814f4a4229 100644
--- a/test/files/run/bug594.check
+++ b/test/files/run/t594.check
diff --git a/test/files/run/bug594.scala b/test/files/run/t594.scala
index f923a3cd2a..f923a3cd2a 100644
--- a/test/files/run/bug594.scala
+++ b/test/files/run/t594.scala
diff --git a/test/files/run/bug601.check b/test/files/run/t601.check
index 7c2a4f6a15..7c2a4f6a15 100644
--- a/test/files/run/bug601.check
+++ b/test/files/run/t601.check
diff --git a/test/files/run/bug601.scala b/test/files/run/t601.scala
index 98b51ce97c..98b51ce97c 100644
--- a/test/files/run/bug601.scala
+++ b/test/files/run/t601.scala
diff --git a/test/files/run/bug603.check b/test/files/run/t603.check
index 1f40825021..1f40825021 100644
--- a/test/files/run/bug603.check
+++ b/test/files/run/t603.check
diff --git a/test/files/run/bug603.scala b/test/files/run/t603.scala
index 361cef1f41..361cef1f41 100644
--- a/test/files/run/bug603.scala
+++ b/test/files/run/t603.scala
diff --git a/test/files/run/bug627.check b/test/files/run/t627.check
index 39e641d987..39e641d987 100644
--- a/test/files/run/bug627.check
+++ b/test/files/run/t627.check
diff --git a/test/files/run/bug627.scala b/test/files/run/t627.scala
index ecaf150741..ecaf150741 100644
--- a/test/files/run/bug627.scala
+++ b/test/files/run/t627.scala
diff --git a/test/files/run/bug629.check b/test/files/run/t629.check
index d86bac9de5..d86bac9de5 100644
--- a/test/files/run/bug629.check
+++ b/test/files/run/t629.check
diff --git a/test/files/run/bug629.scala b/test/files/run/t629.scala
index 67baead5f1..67baead5f1 100644
--- a/test/files/run/bug629.scala
+++ b/test/files/run/t629.scala
diff --git a/test/files/run/bug657.check b/test/files/run/t657.check
index b0aad4deb5..b0aad4deb5 100644
--- a/test/files/run/bug657.check
+++ b/test/files/run/t657.check
diff --git a/test/files/run/bug657.scala b/test/files/run/t657.scala
index a9726092e7..a9726092e7 100644
--- a/test/files/run/bug657.scala
+++ b/test/files/run/t657.scala
diff --git a/test/files/run/bug744.check b/test/files/run/t744.check
index 757bf01370..757bf01370 100644
--- a/test/files/run/bug744.check
+++ b/test/files/run/t744.check
diff --git a/test/files/run/bug744.scala b/test/files/run/t744.scala
index 4895e9baa0..4895e9baa0 100644
--- a/test/files/run/bug744.scala
+++ b/test/files/run/t744.scala
diff --git a/test/files/run/bug751.scala b/test/files/run/t751.scala
index 294d3af5c2..294d3af5c2 100644
--- a/test/files/run/bug751.scala
+++ b/test/files/run/t751.scala
diff --git a/test/files/run/bug874.check b/test/files/run/t874.check
index 91de7e0a03..91de7e0a03 100644
--- a/test/files/run/bug874.check
+++ b/test/files/run/t874.check
diff --git a/test/files/run/bug874.scala b/test/files/run/t874.scala
index d83014651b..d83014651b 100644
--- a/test/files/run/bug874.scala
+++ b/test/files/run/t874.scala
diff --git a/test/files/run/bug889.check b/test/files/run/t889.check
index 67ca2bf467..67ca2bf467 100644
--- a/test/files/run/bug889.check
+++ b/test/files/run/t889.check
diff --git a/test/files/run/bug889.scala b/test/files/run/t889.scala
index c2c1730811..c2c1730811 100644
--- a/test/files/run/bug889.scala
+++ b/test/files/run/t889.scala
diff --git a/test/files/run/bug920.check b/test/files/run/t920.check
index 76018072e0..76018072e0 100644
--- a/test/files/run/bug920.check
+++ b/test/files/run/t920.check
diff --git a/test/files/run/bug920.scala b/test/files/run/t920.scala
index 6a7f122d55..6a7f122d55 100644
--- a/test/files/run/bug920.scala
+++ b/test/files/run/t920.scala
diff --git a/test/files/run/bug949.scala b/test/files/run/t949.scala
index a9c5d08c50..a9c5d08c50 100644
--- a/test/files/run/bug949.scala
+++ b/test/files/run/t949.scala
diff --git a/test/files/run/bug978.scala b/test/files/run/t978.scala
index 3ffac92761..3ffac92761 100644
--- a/test/files/run/bug978.scala
+++ b/test/files/run/t978.scala
diff --git a/test/pending/neg/bug3189.check b/test/pending/neg/bug3189.check
deleted file mode 100644
index 520644fd43..0000000000
--- a/test/pending/neg/bug3189.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug3189.scala:2: error: illegal start of simple pattern
-  val Array(a,b*) = ("": Any)
-                ^
-bug3189.scala:3: error: ')' expected but '}' found.
-}
-^
-two errors found
diff --git a/test/pending/neg/t3189.check b/test/pending/neg/t3189.check
new file mode 100644
index 0000000000..43dd0f29a0
--- /dev/null
+++ b/test/pending/neg/t3189.check
@@ -0,0 +1,7 @@
+t3189.scala:2: error: illegal start of simple pattern
+  val Array(a,b*) = ("": Any)
+                ^
+t3189.scala:3: error: ')' expected but '}' found.
+}
+^
+two errors found
diff --git a/test/pending/neg/bug3189.scala b/test/pending/neg/t3189.scala
index 4ea4bb7581..4ea4bb7581 100644
--- a/test/pending/neg/bug3189.scala
+++ b/test/pending/neg/t3189.scala
diff --git a/test/pending/neg/t3633/test/Test.scala b/test/pending/neg/t3633/test/Test.scala
index 2c54e7b3e9..395a6be6f4 100644
--- a/test/pending/neg/t3633/test/Test.scala
+++ b/test/pending/neg/t3633/test/Test.scala
@@ -6,18 +6,18 @@ final class Test extends PackageProtected {
 
 package another {
   object Main {
-    def bug1(t: Test) {
+    def t1(t: Test) {
       // Can always be replicated.
       println(t.foo)
     }
-    def bug2(t: Test) {
+    def t2(t: Test) {
       // Conditions to replicate: must use -optimise, class Test must be final
       println(t.bar)
       //@noinline is a usable workaround
     }
     def main(args: Array[String]) {
-      bug1(new Test)
-      bug2(new Test)
+      t1(new Test)
+      t2(new Test)
     }
   }
 }
diff --git a/test/pending/neg/bug963.scala b/test/pending/neg/t963.scala
index 430ef090e4..430ef090e4 100644
--- a/test/pending/neg/bug963.scala
+++ b/test/pending/neg/t963.scala
diff --git a/test/pending/pos/bug1357.scala b/test/pending/pos/t1357.scala
index fcdecb3ad3..fcdecb3ad3 100644
--- a/test/pending/pos/bug1357.scala
+++ b/test/pending/pos/t1357.scala
diff --git a/test/pending/pos/bug1957.scala b/test/pending/pos/t1957.scala
index f80cf730ed..f80cf730ed 100644
--- a/test/pending/pos/bug1957.scala
+++ b/test/pending/pos/t1957.scala
diff --git a/test/pending/pos/bug1987/bug1987a.scala b/test/pending/pos/t1987/a.scala
index 7a62877ba0..ff27044b69 100644
--- a/test/pending/pos/bug1987/bug1987a.scala
+++ b/test/pending/pos/t1987/a.scala
@@ -1,6 +1,6 @@
 package bug
 
-// goes with bug1987b.scala
+// goes with t1987b.scala
 package object packageb {
   def func(a: Int) = ()
   def func(a: String) = ()
diff --git a/test/pending/pos/bug1987/bug1987b.scala b/test/pending/pos/t1987/b.scala
index 875f5128f2..a469ca6ea8 100644
--- a/test/pending/pos/bug1987/bug1987b.scala
+++ b/test/pending/pos/t1987/b.scala
@@ -1,4 +1,4 @@
-// compile with bug1987a.scala
+// compile with t1987a.scala
 
 package bug.packageb
 // Note that the overloading works if instead of being in the package we import it:
diff --git a/test/pending/pos/bug4606.scala b/test/pending/pos/t4606.scala
index c9b9e0914e..f79d17d436 100644
--- a/test/pending/pos/bug4606.scala
+++ b/test/pending/pos/t4606.scala
@@ -1,4 +1,4 @@
-object bug4606 {
+object t4606 {
   class A(var x: Int)
   class B(x: Int) extends A(x)
   trait C { self: B =>
@@ -19,7 +19,7 @@ object bug4606 {
   }
 }
 
-object bug3194 {
+object t3194 {
   class A(var x: Int)
   class B(x: Int) extends A(x) {
     self: A =>
diff --git a/test/pending/pos/bug4859.scala b/test/pending/pos/t4859.scala
index ec5abd966d..ec5abd966d 100644
--- a/test/pending/pos/bug4859.scala
+++ b/test/pending/pos/t4859.scala
diff --git a/test/pending/run/bug1697.scala b/test/pending/run/t1697.scala
index 01590dd405..01590dd405 100644
--- a/test/pending/run/bug1697.scala
+++ b/test/pending/run/t1697.scala
diff --git a/test/pending/run/bug2318.check b/test/pending/run/t2318.check
index a486f1ac47..a486f1ac47 100644
--- a/test/pending/run/bug2318.check
+++ b/test/pending/run/t2318.check
diff --git a/test/pending/run/bug2318.scala b/test/pending/run/t2318.scala
index cb524471d6..7bb666706f 100644
--- a/test/pending/run/bug2318.scala
+++ b/test/pending/run/t2318.scala
@@ -12,13 +12,13 @@ object Test {
     }
   }
 
-  def bug1() = {
+  def t1() = {
     val p = Runtime.getRuntime().exec("ls");
     type Destroyable = { def destroy() : Unit }
     def doDestroy( obj : Destroyable ) : Unit = obj.destroy();
     doDestroy( p );
   }
-  def bug2() = {
+  def t2() = {
     System.setSecurityManager(Mgr)
 
     val b = new Bar { def bar = println("bar") }
@@ -30,9 +30,9 @@ object Test {
 
   def main(args: Array[String]) {
     // figuring this will otherwise break on windows
-    try bug1()
+    try t1()
     catch { case _: java.io.IOException => () }
 
-    bug2()
+    t2()
   }
 }
diff --git a/test/pending/run/bug2364.check b/test/pending/run/t2364.check
index 219305e43a..219305e43a 100644
--- a/test/pending/run/bug2364.check
+++ b/test/pending/run/t2364.check
diff --git a/test/pending/run/bug2364.scala b/test/pending/run/t2364.scala
index d5805a13b8..d5805a13b8 100644
--- a/test/pending/run/bug2364.scala
+++ b/test/pending/run/t2364.scala
diff --git a/test/pending/run/bug3669.scala b/test/pending/run/t3669.scala
index 4fd698c1a5..4fd698c1a5 100644
--- a/test/pending/run/bug3669.scala
+++ b/test/pending/run/t3669.scala
diff --git a/test/pending/run/bug4291.check b/test/pending/run/t4291.check
index 30bacfac28..30bacfac28 100644
--- a/test/pending/run/bug4291.check
+++ b/test/pending/run/t4291.check
diff --git a/test/pending/run/bug4291.scala b/test/pending/run/t4291.scala
index 0213bb2c20..0213bb2c20 100644
--- a/test/pending/run/bug4291.scala
+++ b/test/pending/run/t4291.scala
diff --git a/test/pending/script/bug2365.javaopts b/test/pending/script/t2365.javaopts
index 357e033c1c..357e033c1c 100644
--- a/test/pending/script/bug2365.javaopts
+++ b/test/pending/script/t2365.javaopts
diff --git a/test/pending/script/bug2365.sh b/test/pending/script/t2365.sh
index f3c44ad086..f3c44ad086 100755
--- a/test/pending/script/bug2365.sh
+++ b/test/pending/script/t2365.sh
diff --git a/test/pending/script/bug2365/Test.scala b/test/pending/script/t2365/Test.scala
index 53581d256b..53581d256b 100644
--- a/test/pending/script/bug2365/Test.scala
+++ b/test/pending/script/t2365/Test.scala
diff --git a/test/pending/script/bug2365/bug2365.scala b/test/pending/script/t2365/runner.scala
index b5e05325cf..b5e05325cf 100755
--- a/test/pending/script/bug2365/bug2365.scala
+++ b/test/pending/script/t2365/runner.scala
diff --git a/tools/test-renamer b/tools/test-renamer
new file mode 100755
index 0000000000..5a7fc3d78c
--- /dev/null
+++ b/tools/test-renamer
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+#
+# Despite its shameful hackiness, checked in for posterity.
+# It'll live on forever in the git history; then I can remove it.
+
+# set -e
+shopt -s nullglob
+
+cd $(dirname $0)/../test
+
+rename_pattern='^.*/bug[0-9]+.*?(\.scala)?$'
+
+targets ()
+{
+  ls -d pending/*/* disabled/*/* | egrep "$rename_pattern"
+}
+
+showRun ()
+{
+  echo "$@"
+  "$@"
+}
+
+for path in $(targets); do
+  if [[ -f "$path" ]]; then
+    # echo "$path"
+    dir=$(dirname "$path")
+    file=$(basename "$path")
+    base=${file%%.scala}
+    num=${base##bug}
+
+    (cd "$dir" && 
+      for file in ${base}.*; do
+        ext=${file##*.}
+        newname="t${num}.${ext}"
+        
+        if [[ -e "$newname" ]]; then
+          echo "Hey, $newname already exists."
+        else
+          showRun perl -pi -e "'s/bug$num\b/t$num/g;'" "$file"
+          showRun mv "$file" "$newname"
+        fi
+      done
+    )
+  fi
+  
+  if [[ -d "$path" ]]; then
+    dir=$(dirname "$path")
+    file=$(basename "$path")
+    base="$file"
+    num=${base##bug}
+    
+    (cd "$dir" &&
+      for file in $file ${file}.*; do
+        ext=${file##*.}
+        if [[ "$ext" != "$file" ]]; then
+          newname="t${num}.${ext}"
+        else
+          newname="t${num}"
+          for file0 in ${file}/*; do
+            showRun perl -pi -e "'s/bug$num\b/t$num/g;'" "$file0"
+          done
+        fi
+        
+        if [[ -e "$newname" ]]; then
+          echo "Hey, $newname already exists."
+        else
+          if [[ -f "$file" ]]; then
+            showRun perl -pi -e "'s/bug$num\b/t$num/g;'" "$file"
+          fi
+          showRun mv "$file" "$newname"
+        fi
+      done
+    )
+    
+  fi
+
+done
+# 
+# for d in files/*/*; do
+#   [[ -d "$d" ]] && do_dir "$d"
+# done