Renamed Application to App.

59 files changed, 67 insertions, 67 deletions

diff --git a/test/files/pos/bug0305.scala b/test/files/pos/bug0305.scala
index 1219c27030..4838b1fcf8 100644
--- a/test/files/pos/bug0305.scala
+++ b/test/files/pos/bug0305.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   def foo(is:Int*) = 1;
   def foo(i:Int) = 2;
diff --git a/test/files/pos/bug1000.scala b/test/files/pos/bug1000.scala
index c6426401ae..93f8201261 100644
--- a/test/files/pos/bug1000.scala
+++ b/test/files/pos/bug1000.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val xs = Array(1, 2, 3)
   Console.println(xs.filter(_ >= 0).length)
 }
diff --git a/test/files/pos/bug1006.scala b/test/files/pos/bug1006.scala
index 34080b68c1..5ebf799d63 100644
--- a/test/files/pos/bug1006.scala
+++ b/test/files/pos/bug1006.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
 def test() {
 
diff --git a/test/files/pos/bug1014.scala b/test/files/pos/bug1014.scala
index fdabc8b67c..1ac87b225b 100644
--- a/test/files/pos/bug1014.scala
+++ b/test/files/pos/bug1014.scala
@@ -1,6 +1,6 @@
 import scala.xml.{NodeSeq, Elem}
 
-class EO extends Application with Moo{
+class EO extends App with Moo{
   def cat = <cat>dog</cat>
 
   implicit def nodeSeqToFlog(in: Elem): Flog = new Flog(in)
diff --git a/test/files/pos/bug1075.scala b/test/files/pos/bug1075.scala
index 0f518b24db..5f72957da1 100644
--- a/test/files/pos/bug1075.scala
+++ b/test/files/pos/bug1075.scala
@@ -12,6 +12,6 @@ class Directory(var dir_ : String)
   def dir = dir_
 }
 
-object Test extends Directory("/bab/dkkd//dkkdkd//kdkdk") with Application {
+object Test extends Directory("/bab/dkkd//dkkdkd//kdkdk") with App {
   println(dir)
 }
diff --git a/test/files/pos/bug115.scala b/test/files/pos/bug115.scala
index e361f06370..0e6a63c168 100644
--- a/test/files/pos/bug115.scala
+++ b/test/files/pos/bug115.scala
@@ -3,7 +3,7 @@ class S[A](f: A => A, x: A) {
 }
 class T[B](f: B => B, y: B) extends S((x: B) => f(x), y) {
 }
-object Test extends Application {
+object Test extends App {
   new T[Int](x => x * 2, 1);
   val f = new S((x: Int) => x, 1);
 }
diff --git a/test/files/pos/bug1168.scala b/test/files/pos/bug1168.scala
index 58407e328e..75638e792f 100644
--- a/test/files/pos/bug1168.scala
+++ b/test/files/pos/bug1168.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   trait SpecialException {}
 
diff --git a/test/files/pos/bug1560.scala b/test/files/pos/bug1560.scala
index 384e808e4b..cd27fdf0ef 100644
--- a/test/files/pos/bug1560.scala
+++ b/test/files/pos/bug1560.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   trait C[T] {
     def t: T
   }
diff --git a/test/files/pos/bug210.scala b/test/files/pos/bug210.scala
index 0049d1f34c..f0b907aa5d 100644
--- a/test/files/pos/bug210.scala
+++ b/test/files/pos/bug210.scala
@@ -10,7 +10,7 @@ trait Lang2 extends Lang1 {
   class Eval2 extends Eval1 { self: Visitor => }
 }
 /*
-object Main with Application {
+object Main with App {
   val lang2 = new Lang2 {}
   val eval = new lang2.Eval2
 }
diff --git a/test/files/pos/bug211.scala b/test/files/pos/bug211.scala
index 1c2c54934d..e394f21e8f 100644
--- a/test/files/pos/bug211.scala
+++ b/test/files/pos/bug211.scala
@@ -1,7 +1,7 @@
 trait A;
 trait B;
 class Foo extends A with B { self: A with B => }
-object Test extends Application {
+object Test extends App {
   new Foo();
   Console.println("bug211 completed");
 }
diff --git a/test/files/pos/bug2168.scala b/test/files/pos/bug2168.scala
index 1cf73446a8..e3b24b6a72 100644
--- a/test/files/pos/bug2168.scala
+++ b/test/files/pos/bug2168.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo1(x: AnyRef) = x match { case x: Function0[_] => x() }
   def foo2(x: AnyRef) = x match { case x: Function0[Any] => x() }
 }
diff --git a/test/files/pos/bug2187.scala b/test/files/pos/bug2187.scala
index 003b8c1436..8a33531541 100644
--- a/test/files/pos/bug2187.scala
+++ b/test/files/pos/bug2187.scala
@@ -1,5 +1,5 @@
 // bug #2187
-object Test extends Application {
+object Test extends App {
   def foo(xs:List[String]) = xs match {
     case Seq(x) => x
     case Seq(x,y) => ""
diff --git a/test/files/pos/bug2261.scala b/test/files/pos/bug2261.scala
index a499af838a..fcb9821b69 100644
--- a/test/files/pos/bug2261.scala
+++ b/test/files/pos/bug2261.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   class Bob[T]
   implicit def foo2bar[T](xs: List[T]): Bob[T] = new Bob[T]
   var x: Bob[Int] = null
diff --git a/test/files/pos/bug261-ab.scala b/test/files/pos/bug261-ab.scala
index 80699e692c..df641e811a 100644
--- a/test/files/pos/bug261-ab.scala
+++ b/test/files/pos/bug261-ab.scala
@@ -3,7 +3,7 @@ trait B {
   private val foo: String = "B"
   def f = println(foo)
 }
-object Test extends Application with B with A {
+object Test extends App with B with A {
   println(foo) // prints "A", as expected
   f            // prints "B", as expected
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/bug261-ba.scala b/test/files/pos/bug261-ba.scala
index c66a68d101..6c9c5b10b7 100644
--- a/test/files/pos/bug261-ba.scala
+++ b/test/files/pos/bug261-ba.scala
@@ -3,7 +3,7 @@ trait B {
   def f = println(foo)
 }
 trait A { val foo: String = "A" }
-object Test extends Application with B with A {
+object Test extends App with B with A {
   println(foo) // prints "A", as expected
   f            // prints "B", as expected
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/bug267.scala b/test/files/pos/bug267.scala
index d7eae9b8d6..7e5876eae9 100644
--- a/test/files/pos/bug267.scala
+++ b/test/files/pos/bug267.scala
@@ -17,7 +17,7 @@ trait Base {
   }
 }
 
-object testBase extends Application with Base {
+object testBase extends App with Base {
   type exp = Exp
   val term = new Num(2);
   Console.println(term.eval)
diff --git a/test/files/pos/bug342.scala b/test/files/pos/bug342.scala
index 29e36415f9..752b24d2ba 100644
--- a/test/files/pos/bug342.scala
+++ b/test/files/pos/bug342.scala
@@ -1,4 +1,4 @@
-object Main extends Application {
+object Main extends App {
 
   object Foo extends Enumeration(0, "Bar") {  // 2
     val Bar = Value
diff --git a/test/files/pos/bug348plus.scala b/test/files/pos/bug348plus.scala
index 30fa1576af..e61f7346f2 100644
--- a/test/files/pos/bug348plus.scala
+++ b/test/files/pos/bug348plus.scala
@@ -6,7 +6,7 @@ trait Foo {
   case class Baz(r:bar) extends Bar;
   case object NoBar extends Bar;
 }
-object Test extends Application {
+object Test extends App {
   object ConcreteFooBar extends Foo { // if moved to toplevel, it works
     type bar = Bar;
   }
diff --git a/test/files/pos/bug374.scala b/test/files/pos/bug374.scala
index 31a98871a8..fb9c0b4027 100644
--- a/test/files/pos/bug374.scala
+++ b/test/files/pos/bug374.scala
@@ -5,7 +5,7 @@ object tokens extends Enumeration {
   val NAME    = Value("name");
 }
 
-object test extends AnyRef with Application {
+object test extends AnyRef with App {
   import tokens._;
 
   val reserved = new scala.collection.mutable.HashMap[String, Token]();
diff --git a/test/files/pos/bug430.scala b/test/files/pos/bug430.scala
index 1f7d86b1c8..e04e39bea8 100644
--- a/test/files/pos/bug430.scala
+++ b/test/files/pos/bug430.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo[T <% Ordered[T]](x: T){ Console.println(""+(x < x)+" "+(x <= x)) }
   def bar(x: Unit   ): Unit = foo(x);
   def bar(x: Boolean): Unit = foo(x);
diff --git a/test/files/pos/bug514.scala b/test/files/pos/bug514.scala
index 0b7b9ac009..188e4f2e56 100644
--- a/test/files/pos/bug514.scala
+++ b/test/files/pos/bug514.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   object Truc {
     override def toString() = "oui"
     def toString(bool: Boolean) = "chaispas"
diff --git a/test/files/pos/bug531.scala b/test/files/pos/bug531.scala
index 26e4df988c..02763e08f1 100644
--- a/test/files/pos/bug531.scala
+++ b/test/files/pos/bug531.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   import scala.reflect._;
   def titi = {
     var truc = 0
diff --git a/test/files/pos/bug532.scala b/test/files/pos/bug532.scala
index 2c1adfd5b4..32649b1629 100644
--- a/test/files/pos/bug532.scala
+++ b/test/files/pos/bug532.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   import scala.reflect._;
   def titi: Unit = {
     var truc = 0
diff --git a/test/files/pos/bug613.scala b/test/files/pos/bug613.scala
index cf179420f4..e140833106 100644
--- a/test/files/pos/bug613.scala
+++ b/test/files/pos/bug613.scala
@@ -1,4 +1,4 @@
-class Outer extends Application {
+class Outer extends App {
   val y: Int = 1
   abstract class C {
     val x: Int
@@ -11,7 +11,7 @@ class Outer extends Application {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   val o = new Outer
   println(o.foo.x)
 }
diff --git a/test/files/pos/bug675.scala b/test/files/pos/bug675.scala
index 51f56920b5..c736d9dc05 100644
--- a/test/files/pos/bug675.scala
+++ b/test/files/pos/bug675.scala
@@ -10,7 +10,7 @@ trait T {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   val t = new T{}
   val x = new t.X{}
   Console.println(x.foo)
diff --git a/test/files/pos/bug698.scala b/test/files/pos/bug698.scala
index a70acae213..00b3707976 100644
--- a/test/files/pos/bug698.scala
+++ b/test/files/pos/bug698.scala
@@ -6,7 +6,7 @@ abstract class Foo
 abstract class Bar
 
 object Test
-        extends Foo with Application
+        extends Foo with App
 {
         object x extends Bar
 }
diff --git a/test/files/pos/bug711.scala b/test/files/pos/bug711.scala
index 70fcc7f0d0..4dd6040969 100644
--- a/test/files/pos/bug711.scala
+++ b/test/files/pos/bug711.scala
@@ -6,7 +6,7 @@ class Button extends Component {
 abstract class Origin {
   val delegate: Component }
 
-object main extends Origin with Application {
+object main extends Origin with App {
   val delegate: Component {
     def sayHey: Unit
   } = new Button
diff --git a/test/files/pos/bug720.scala b/test/files/pos/bug720.scala
index beeae371bd..ef04d01bec 100644
--- a/test/files/pos/bug720.scala
+++ b/test/files/pos/bug720.scala
@@ -3,7 +3,7 @@ object Conv {
   implicit def one2two (one: One): Two = new Two }
 class One extends Conv
 class Two
-object Test2 extends Application {
+object Test2 extends App {
   def fun (two: Two) = ()
   fun(new One)
 }
diff --git a/test/files/pos/bug757.scala b/test/files/pos/bug757.scala
index cc6527f3f2..fd7624cee7 100644
--- a/test/files/pos/bug757.scala
+++ b/test/files/pos/bug757.scala
@@ -7,7 +7,7 @@ package foo {
 }
 
 package bar {
-  object Main extends Application {
+  object Main extends App {
     foo.C.foo
   }
 }
diff --git a/test/files/pos/bug759.scala b/test/files/pos/bug759.scala
index 2eac89cd60..4fa0ca0b22 100644
--- a/test/files/pos/bug759.scala
+++ b/test/files/pos/bug759.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   def f[A](x : => A) = x
 
diff --git a/test/files/pos/bug796.scala b/test/files/pos/bug796.scala
index 2e57f60502..066625179e 100644
--- a/test/files/pos/bug796.scala
+++ b/test/files/pos/bug796.scala
@@ -6,7 +6,7 @@
  * Ideally, an option in the bugtracking system would automatically
  * handle "pos" bugs.
  */
-object Test extends Application {
+object Test extends App {
 
   object Twice {
     def apply(x: Int) = x * 2
diff --git a/test/files/pos/bug812.scala b/test/files/pos/bug812.scala
index 1c9c923b6c..709b59c194 100644
--- a/test/files/pos/bug812.scala
+++ b/test/files/pos/bug812.scala
@@ -1,7 +1,7 @@
 package test;
-import scala.{Application => Main};
+import scala.{App => Main};
 class Test extends Main {
   import test.{Test => Hello}
-  super[Application].main(Array("test"));
+  super[App].main(Array("test"));
   private[Test] def xxx = 10;
 }
diff --git a/test/files/pos/channels.scala b/test/files/pos/channels.scala
index 4c7be2cc82..eb26a2bcf6 100644
--- a/test/files/pos/channels.scala
+++ b/test/files/pos/channels.scala
@@ -11,7 +11,7 @@ object Bang {
 }
 
 */
-object Test extends Application {
+object Test extends App {
   object IC extends Channel[Int]
   def f[b](x: ![b]): Int = x match {
     case send: ![c] =>
@@ -21,7 +21,7 @@ object Test extends Application {
   }
 }
 
-object Test2 extends Application {
+object Test2 extends App {
   object IC extends Channel[Set[Int]]
   def f[b](s: ![b]): Set[Int] = s match {
     case IC ! x => x
diff --git a/test/files/pos/comp-rec-test.scala b/test/files/pos/comp-rec-test.scala
index eaf12942c7..c3e6f8c196 100644
--- a/test/files/pos/comp-rec-test.scala
+++ b/test/files/pos/comp-rec-test.scala
@@ -1,4 +1,4 @@
-object Comp extends Application {
+object Comp extends App {
 
    trait Family {
      type T
diff --git a/test/files/pos/constfold.scala b/test/files/pos/constfold.scala
index d42ada76d3..8d431efbac 100644
--- a/test/files/pos/constfold.scala
+++ b/test/files/pos/constfold.scala
@@ -5,7 +5,7 @@ object A {
   val s = "z is " + z;
 }
 
-object Test extends Application {
+object Test extends App {
 
     Console.println(A.x);
     Console.println(A.y);
diff --git a/test/files/pos/gosh.scala b/test/files/pos/gosh.scala
index 183ce9df1d..98fae8a31e 100644
--- a/test/files/pos/gosh.scala
+++ b/test/files/pos/gosh.scala
@@ -1,4 +1,4 @@
-object ShapeTest extends Application {
+object ShapeTest extends App {
 
   class Point(x: Int, y: Int) {
     override def toString() = "[" + x + "," + y + "]"
diff --git a/test/files/pos/gui.scala b/test/files/pos/gui.scala
index 9d87d1b869..3b4f49cf55 100644
--- a/test/files/pos/gui.scala
+++ b/test/files/pos/gui.scala
@@ -82,18 +82,18 @@ object GUI {
 
 object GUIClient {
 
-  class Application {
+  class App {
     def quit() { Console.println("application exited") }
   }
 
-  class QuitButton (scr: Screen, p: Geom.Point, name: String, a: Application)
+  class QuitButton (scr: Screen, p: Geom.Point, name: String, a: App)
   extends GUI.Button(scr, p, name) {
     def doit() { a.quit() }
   }
 
   def main(args: Array[String]) {
     val b = new QuitButton(
-      DummyScreen, Geom.Point(1, 1), "quit", new Application);
+      DummyScreen, Geom.Point(1, 1), "quit", new App);
     b.draw();
     b.enable(true).mouseDown(Geom.Point(1, 2));
   }
diff --git a/test/files/pos/init.scala b/test/files/pos/init.scala
index c51446c804..fdea0e06f0 100644
--- a/test/files/pos/init.scala
+++ b/test/files/pos/init.scala
@@ -8,7 +8,7 @@ class Foo {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   val foo = new Foo
   Console.println((new foo.Bar).id)
 }
diff --git a/test/files/pos/lexical.scala b/test/files/pos/lexical.scala
index 034b84bf0f..8c29513bb5 100755
--- a/test/files/pos/lexical.scala
+++ b/test/files/pos/lexical.scala
@@ -3,7 +3,7 @@ class RichInt(n: Int) {
   def days = 1000*60*60*24*n
 }
 
-object Test extends Application {
+object Test extends App {
   implicit def RichInt(n: Int): RichInt = new RichInt(n)
   println(10.days)
 }
diff --git a/test/files/pos/pos-bug1241.scala b/test/files/pos/pos-bug1241.scala
index 333e6c5490..1752208f37 100644
--- a/test/files/pos/pos-bug1241.scala
+++ b/test/files/pos/pos-bug1241.scala
@@ -1,4 +1,4 @@
-object test extends Application {
+object test extends App {
   // more..
   type T = { def hello() }
   //val x4 = new AnyRef { def hello() { println("4") } } // ok!
diff --git a/test/files/pos/scoping1.scala b/test/files/pos/scoping1.scala
index c9c0489e69..9fe1b5f3e5 100644
--- a/test/files/pos/scoping1.scala
+++ b/test/files/pos/scoping1.scala
@@ -1,4 +1,4 @@
-object This extends Application {
+object This extends App {
   trait A {
     def foo(): Unit
   }
diff --git a/test/files/pos/spec-Function1.scala b/test/files/pos/spec-Function1.scala
index 55ad464878..8d961c454d 100644
--- a/test/files/pos/spec-Function1.scala
+++ b/test/files/pos/spec-Function1.scala
@@ -20,7 +20,7 @@ package scala
  *    <code>anonfun1</code>:
  *  </p>
  *  <pre>
- *  <b>object</b> Main <b>extends</b> Application {
+ *  <b>object</b> Main <b>extends</b> App {
  *
  *    <b>val</b> succ = (x: Int) => x + 1
  *
diff --git a/test/files/pos/spec-lists.scala b/test/files/pos/spec-lists.scala
index 01416da95e..46e164e9cb 100644
--- a/test/files/pos/spec-lists.scala
+++ b/test/files/pos/spec-lists.scala
@@ -1,4 +1,4 @@
-object Main extends Application {
+object Main extends App {
 
   val xs = 1 :: 2 :: 3 :: 4 :: 5 :: Nil
 
diff --git a/test/files/pos/spec-sealed.scala b/test/files/pos/spec-sealed.scala
index 8c06148d3e..a5ee4e3c5f 100644
--- a/test/files/pos/spec-sealed.scala
+++ b/test/files/pos/spec-sealed.scala
@@ -18,7 +18,7 @@ case class Cons[@specialized a](private val hd: a, tl: MyList[a]) extends MyList
 
 abstract class IntList extends MyList[Int]
 
-object Main extends Application {
+object Main extends App {
   val xs = 1 :: 2 :: 3 :: MyNil
   println(xs)
 }
diff --git a/test/files/pos/sudoku.scala b/test/files/pos/sudoku.scala
index 9875b22cfd..9435f504d6 100644
--- a/test/files/pos/sudoku.scala
+++ b/test/files/pos/sudoku.scala
@@ -1,4 +1,4 @@
-object SudokuSolver extends Application {
+object SudokuSolver extends App {
   // The board is represented by an array of strings (arrays of chars),
   // held in a global variable m. The program begins by reading 9 lines
   // of input to fill the board
diff --git a/test/files/pos/t0231.scala b/test/files/pos/t0231.scala
index 895e780421..17a2eb1c54 100644
--- a/test/files/pos/t0231.scala
+++ b/test/files/pos/t0231.scala
@@ -11,7 +11,7 @@ class Bar extends Foo {
   }
 }
 
-object bug extends Application {
+object bug extends App {
   new Bar
   ()
 }
diff --git a/test/files/pos/t0651.scala b/test/files/pos/t0651.scala
index 76d5df9f9d..52bef7e02b 100644
--- a/test/files/pos/t0651.scala
+++ b/test/files/pos/t0651.scala
@@ -1,4 +1,4 @@
-object Reflection1 extends Application {
+object Reflection1 extends App {
   case class Element(name: String)
   println(reflect.Code.lift({val e = Element("someName"); e}).tree)
 }
diff --git a/test/files/pos/t0674.scala b/test/files/pos/t0674.scala
index 6884d84bed..589eeec9f3 100644
--- a/test/files/pos/t0674.scala
+++ b/test/files/pos/t0674.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 println(
 for(a <- Some(1);
     b <- Some(2);
diff --git a/test/files/pos/t1027.scala b/test/files/pos/t1027.scala
index 7854041f10..02ba9a8a3e 100644
--- a/test/files/pos/t1027.scala
+++ b/test/files/pos/t1027.scala
@@ -1,4 +1,4 @@
-object T1027 extends Application {
+object T1027 extends App {
   trait Comparable[T <: Comparable[T]] { this: T =>
     def < (that: T): Boolean
     def <=(that: T): Boolean = this < that || this == that
diff --git a/test/files/pos/t1545.scala b/test/files/pos/t1545.scala
index d7c0245725..8cdd39660c 100755
--- a/test/files/pos/t1545.scala
+++ b/test/files/pos/t1545.scala
@@ -1,4 +1,4 @@
-object Main extends Application {
+object Main extends App {
 
     case class Foo (field : Option[String])
 
diff --git a/test/files/pos/t1560.scala b/test/files/pos/t1560.scala
index 49cdaaed6a..2af299af86 100644
--- a/test/files/pos/t1560.scala
+++ b/test/files/pos/t1560.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   trait C[T] {
     def t: T
diff --git a/test/files/pos/t1756.scala b/test/files/pos/t1756.scala
index d5d3ddc624..1d067c3b04 100755
--- a/test/files/pos/t1756.scala
+++ b/test/files/pos/t1756.scala
@@ -34,7 +34,7 @@ class Poly[C <: Ring[C]](val c: C) extends Ring[Poly[C]] {
   def *(that: Poly[C]) = new Poly(this.c*that.c)
 }
 
-object Test extends Application {
+object Test extends App {
 
   implicit def coef2poly[C <: Ring[C]](c: C): Poly[C] = new Poly(c)
 
diff --git a/test/files/pos/t2234.scala b/test/files/pos/t2234.scala
index cea657b16f..218e9f5e53 100644
--- a/test/files/pos/t2234.scala
+++ b/test/files/pos/t2234.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val res0 = 1 #:: Stream.empty
   res0 match { case 1 #:: xs => xs }
 }
diff --git a/test/files/pos/t2425.scala b/test/files/pos/t2425.scala
index 403f1a18d7..477d5467aa 100755
--- a/test/files/pos/t2425.scala
+++ b/test/files/pos/t2425.scala
@@ -1,6 +1,6 @@
 trait B
 class D extends B
-object Test extends Application {
+object Test extends App {
   def foo[T](bar: T) = {
     bar match {
       case _: Array[Array[_]] => println("array 2d")
diff --git a/test/files/pos/tcpoly_infer_ticket1864.scala b/test/files/pos/tcpoly_infer_ticket1864.scala
index 587483287d..77d20234d5 100644
--- a/test/files/pos/tcpoly_infer_ticket1864.scala
+++ b/test/files/pos/tcpoly_infer_ticket1864.scala
@@ -9,7 +9,7 @@ class RichBuffer[T, B[U] <: Buffer[U]](buffer: Buffer[T]) {
   }
 }
 
-object Application {
+object App {
   def mymap2[T, B[U] <: Buffer[U], S](buffer: B[T], f: T => S)(implicit rv: B[S]): B[S] = {
     buffer.foreach{ e =>
       rv += f(e)
diff --git a/test/files/pos/tcpoly_infer_ticket716.scala b/test/files/pos/tcpoly_infer_ticket716.scala
index cfba07fa43..24e8f663bc 100644
--- a/test/files/pos/tcpoly_infer_ticket716.scala
+++ b/test/files/pos/tcpoly_infer_ticket716.scala
@@ -18,9 +18,9 @@ object Functor{
   //implicit def liftListtoOO[A](arg:List[A]):OOFunctor[List,A] = new OOFunctor[List,A](arg)
 }
 
-object GeneralLiftingDemo extends Application {
+object GeneralLiftingDemo extends App {
   import Functor._
   val l = List(1,2,3)
   val res = l fmap( 1+) // TODO: should not need explicit call to lifttoOO
   println("OO : " + res )
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/typerep-stephane.scala b/test/files/pos/typerep-stephane.scala
index 1061212369..2cb899591a 100644
--- a/test/files/pos/typerep-stephane.scala
+++ b/test/files/pos/typerep-stephane.scala
@@ -41,7 +41,7 @@ object typerep {
 
 }
 
-object test extends Application {
+object test extends App {
  import typerep._
  println(3.getType)
  println(List(3).getType)
diff --git a/test/files/pos/typerep_pos.scala b/test/files/pos/typerep_pos.scala
index 7faa8a1928..ebb643d321 100644
--- a/test/files/pos/typerep_pos.scala
+++ b/test/files/pos/typerep_pos.scala
@@ -1,4 +1,4 @@
-object typerep extends Application {
+object typerep extends App {
   class TypeRep[T] {}
   case object IntRep extends TypeRep[Int] {
     override def toString = "Int"
diff --git a/test/files/pos/unapplyVal.scala b/test/files/pos/unapplyVal.scala
index 338cdb1839..368b9b9375 100644
--- a/test/files/pos/unapplyVal.scala
+++ b/test/files/pos/unapplyVal.scala
@@ -18,7 +18,7 @@ class Buffer {
 }
 
 
-object unapplyJoins extends Application { // bug #1257
+object unapplyJoins extends App { // bug #1257
 
   class Sync {
     def apply(): Int = 42