diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
index d80fcf4f09995c9980ce71cee981d0c0452660c8..01fb395fdb232536c2de589fdb3cac3a56c489fa 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
@@ -1,7 +1,7 @@
 /* Copyright 2009-2014 EPFL, Lausanne */
 
 import leon.lang._
-object Numerals {
+object ArrayLiterals {
   def foo(): Int = {
     val b : Array[Int] = Array[Int](1,2,3)
     val a : Array[Int] = Array(1,2,3)
diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
index 5d336d01dad49d68d1e3d09cc6df719d435261e6..046745504078ebbf0b83ee4bb967d87fc5a751f1 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
@@ -2,7 +2,7 @@
 
 import leon.lang._
 
-object Test {
+object ArrayUpdated {
 
   def test(a: Array[Int]): Int = {
     require(a.length > 0)
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
index 0851ba5adf9eaa3b80a73fe263b904e93fc474da..6d6ec65a398afb86f446fe16a8559ad6cd53959d 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
@@ -2,7 +2,7 @@ import leon.lang._
 import leon.annotation._
 import leon._
 
-object Operators {
+object Asserts1 {
 
   def foo(a: BigInt): BigInt = {
     require(a > 0)
diff --git a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
index bdebd252762b08976e5589c276eaa3e278718ccd..149dd4ac5ab4d70919a72b1e5d6f9d779e1e6d3b 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
@@ -2,7 +2,7 @@
 
 import leon.lang._
 
-object FiniteSorting {
+object FiniteSort {
 
   // These finite sorting functions essentially implement insertion sort.
   def sort2(x : BigInt, y : BigInt) : (BigInt,BigInt) = {
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Generics2.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
similarity index 100%
rename from src/test/resources/regression/verification/newsolvers/valid/Generics2.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Heap.scala b/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
similarity index 100%
rename from src/test/resources/regression/verification/newsolvers/valid/Heap.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
diff --git a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
index 8dade4ccc2da3d9587cc46027d940b4a4712d5a4..185aad5c98c20bc1e53b052e55e712a6785f92cc 100644
--- a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
@@ -1,5 +1,5 @@
 import leon.lang._
 
-object foo {
+object CharCompare {
   def cmp(c1: Char, c2: Char): Boolean = { c1 < c2 }.holds
 }
diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
index d0112ebc781f6694ed593e88a1397476c4118965..34850fe4f7058befab21f5efeabe1efdfa5fe53f 100644
--- a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
@@ -1,7 +1,8 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
 import leon.lang._
-object Numerals {
+
+object ArrayLiterals {
   def foo(): Int = {
     val b : Array[Int] = Array[Int](1,2,3)
     val a : Array[Int] = Array(1,2,3)
diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
index 897be5acf2e79c6e8607b599c4dd921853ab32d1..e60918b6437d8a13d50fed7c793967d46aebd7aa 100644
--- a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
@@ -2,7 +2,7 @@
 
 import leon.lang._
 
-object Test {
+object ArrayUpdated {
 
   def test(a: Array[Int]): Int = {
     require(a.length > 0)
diff --git a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
index b8681a6ea7bc7e60a85207cbda7c8a5758059a4f..fce6728b6ae0f88101333ff6bafec484d762c62b 100644
--- a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
@@ -4,7 +4,7 @@ import leon.lang._
 import leon.annotation._
 import leon._
 
-object Operators {
+object Asserts1 {
 
   def foo(a: BigInt): BigInt = {
     require(a > 0)
diff --git a/src/test/resources/regression/verification/purescala/valid/BVDivSemantic.scala b/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
similarity index 100%
rename from src/test/resources/regression/verification/purescala/valid/BVDivSemantic.scala
rename to src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
diff --git a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
index d113b27fa0831fe2d677f59c196692db88186aab..ead4c46cb384b28337978d67c1da9b11b6dde342 100644
--- a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
@@ -2,7 +2,7 @@
 
 import leon.lang._
 
-object FiniteSorting {
+object FiniteSort {
 
   // These finite sorting functions essentially implement insertion sort.
   def sort2(x : Int, y : Int) : (Int,Int) = {
diff --git a/src/test/resources/regression/verification/purescala/valid/Generics2.scala b/src/test/resources/regression/verification/purescala/valid/Generics1.scala
similarity index 100%
rename from src/test/resources/regression/verification/purescala/valid/Generics2.scala
rename to src/test/resources/regression/verification/purescala/valid/Generics1.scala
diff --git a/src/test/resources/regression/verification/purescala/valid/Heap.scala b/src/test/resources/regression/verification/purescala/valid/Heaps.scala
similarity index 100%
rename from src/test/resources/regression/verification/purescala/valid/Heap.scala
rename to src/test/resources/regression/verification/purescala/valid/Heaps.scala
diff --git a/src/test/resources/regression/verification/purescala/valid/TextJustifyNoPost.scala b/src/test/resources/regression/verification/purescala/valid/Justify.scala
similarity index 100%
rename from src/test/resources/regression/verification/purescala/valid/TextJustifyNoPost.scala
rename to src/test/resources/regression/verification/purescala/valid/Justify.scala
diff --git a/src/test/resources/regression/verification/purescala/valid/MapPlus.scala b/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
similarity index 100%
rename from src/test/resources/regression/verification/purescala/valid/MapPlus.scala
rename to src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala