diff --git a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala b/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
index 9a78a3512ae578ddd3be8a61411b937eab6bb710..f597cd7734131a52d08b11a0d1661495d39ecfba 100644
--- a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
+++ b/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
@@ -1,13 +1,10 @@
 package leon
 package invariant.util
 
-import purescala.Common._
-import purescala.Definitions._
 import purescala.Expressions._
 import purescala.ExprOps._
 import purescala.Extractors._
 import purescala.Types._
-import scala.collection.mutable.{ Set => MutableSet, Map => MutableMap }
 
 /**
  * A class that looks for structural equality of expressions
diff --git a/src/main/scala/leon/solvers/combinators/SolverPool.scala b/src/main/scala/leon/solvers/combinators/SolverPoolFactory.scala
similarity index 100%
rename from src/main/scala/leon/solvers/combinators/SolverPool.scala
rename to src/main/scala/leon/solvers/combinators/SolverPoolFactory.scala
diff --git a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala b/src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
similarity index 73%
rename from src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
rename to src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
index bf49d819509cbd7b239573e0221f0c1e1e2b15fc..4ebaeb566e7622a4c37bac6d4a525011046e25c9 100644
--- a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
+++ b/src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
@@ -3,12 +3,6 @@
 package leon
 package synthesis.programsets
 
-import leon.purescala
-import purescala.Expressions._
-import purescala.Extractors._
-import purescala.Constructors._
-import purescala.Types._
-
 object UnionProgramSet {
   def apply[T](sets: Seq[ProgramSet[T]]): UnionProgramSet[T] = {
     new UnionProgramSet(sets)
diff --git a/src/main/scala/leon/transformations/InstProgSimplifier.scala b/src/main/scala/leon/transformations/ProgramSimplifier.scala
similarity index 100%
rename from src/main/scala/leon/transformations/InstProgSimplifier.scala
rename to src/main/scala/leon/transformations/ProgramSimplifier.scala
diff --git a/src/main/scala/leon/transformations/RecursionCountPhase.scala b/src/main/scala/leon/transformations/RecursionCountInstrumenter.scala
similarity index 100%
rename from src/main/scala/leon/transformations/RecursionCountPhase.scala
rename to src/main/scala/leon/transformations/RecursionCountInstrumenter.scala
diff --git a/src/main/scala/leon/transformations/StackSpacePhase.scala b/src/main/scala/leon/transformations/StackSpaceInstrumenter.scala
similarity index 100%
rename from src/main/scala/leon/transformations/StackSpacePhase.scala
rename to src/main/scala/leon/transformations/StackSpaceInstrumenter.scala