diff --git a/src/funcheck/AnalysisComponent.scala b/src/funcheck/AnalysisComponent.scala
index 3670c40d39ae1e67f5a85da061de7142d97097b0..d09ff681aab5b78757205874e87bef8f7152356e 100644
--- a/src/funcheck/AnalysisComponent.scala
+++ b/src/funcheck/AnalysisComponent.scala
@@ -6,7 +6,6 @@ import scalacheck._
 
 class AnalysisComponent(val global: Global, val pluginInstance: FunCheckPlugin)
   extends PluginComponent
-  with NameAnalyzer
   with CodeExtraction
   // with ScalaCheckIntegrator // Mirco's stuff.
 {
diff --git a/src/funcheck/CodeExtraction.scala b/src/funcheck/CodeExtraction.scala
index cd63fc299555c81cb3e88b223b3667b47aaa72ed..32e75bf1ffe9122f1798b62b8684bd6d1bc776b2 100644
--- a/src/funcheck/CodeExtraction.scala
+++ b/src/funcheck/CodeExtraction.scala
@@ -26,7 +26,7 @@ trait CodeExtraction extends Extractors {
       case None => stopIfErrors; scala.Predef.error("unreachable error.")
     }
 
-    def st2ps(tree: Tree): funcheck.purescala.TypeTrees.TypeTree = toPureScalaType(unit)(tree) match {
+    def st2ps(tree: Tree): purescala.TypeTrees.TypeTree = toPureScalaType(unit)(tree) match {
       case Some(tt) => tt
       case None => stopIfErrors; scala.Predef.error("unreachable error.")
     }
@@ -140,7 +140,7 @@ trait CodeExtraction extends Extractors {
     }
   }
 
-  def toPureScalaType(unit: CompilationUnit)(typeTree: Tree): Option[funcheck.purescala.TypeTrees.TypeTree] = {
+  def toPureScalaType(unit: CompilationUnit)(typeTree: Tree): Option[purescala.TypeTrees.TypeTree] = {
     try {
       Some(scalaType2PureScala(unit, false)(typeTree))
     } catch {
@@ -180,7 +180,7 @@ trait CodeExtraction extends Extractors {
     rec(tree)
   }
 
-  private def scalaType2PureScala(unit: CompilationUnit, silent: Boolean)(tree: Tree): funcheck.purescala.TypeTrees.TypeTree = {
+  private def scalaType2PureScala(unit: CompilationUnit, silent: Boolean)(tree: Tree): purescala.TypeTrees.TypeTree = {
     tree match {
       case tt: TypeTree if tt.tpe == IntClass.tpe => Int32Type
       case tt: TypeTree if tt.tpe == BooleanClass.tpe => BooleanType
diff --git a/src/funcheck/NameAnalyzer.scala b/src/funcheck/NameAnalyzer.scala
deleted file mode 100644
index 2421ed7f39ab986054c5836c748ea2918133c139..0000000000000000000000000000000000000000
--- a/src/funcheck/NameAnalyzer.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package funcheck
-
-import scala.tools.nsc._
-import scala.tools.nsc.plugins._
-
-import purescala.Definitions._
-import purescala.Trees._
-import purescala.TypeTrees._
-import purescala.Common._
-
-trait NameAnalyzer extends Extractors {
-  self: AnalysisComponent =>
-
-  import global._
-  import StructuralExtractors._
-  
-  def collectNames(unit: CompilationUnit): Unit = {
-
-  }
-}
diff --git a/src/purescala/Common.scala b/src/purescala/Common.scala
index a4a8273e9e0772df28005c3ff38b28c2eecdd4b9..cfbe10b3a158cd49301e058a11cfdc5d4894d772 100644
--- a/src/purescala/Common.scala
+++ b/src/purescala/Common.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object Common {
   type Identifier = String
diff --git a/src/purescala/Definitions.scala b/src/purescala/Definitions.scala
index ae1ea60395b5e2c0a944ee25a9d5cb76dfaf56cd..da78954e43d3e29a1f063e4c61b239a254472a04 100644
--- a/src/purescala/Definitions.scala
+++ b/src/purescala/Definitions.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object Definitions {
   import Common._
diff --git a/src/purescala/PrettyPrinter.scala b/src/purescala/PrettyPrinter.scala
index 6de4afa00952fb4f0f8d932fb98a2207e6d876a0..e2205cd6808e19a372c0bde87716813a12a3e206 100644
--- a/src/purescala/PrettyPrinter.scala
+++ b/src/purescala/PrettyPrinter.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 
 /** This pretty-printer uses Unicode for some operators, to make sure we
diff --git a/src/purescala/Trees.scala b/src/purescala/Trees.scala
index 1a14d5d4b60adad9fe2b05373805b11c26e4d4c4..b158d2babc3be3e16669a1c31f211e4b56859fe5 100644
--- a/src/purescala/Trees.scala
+++ b/src/purescala/Trees.scala
@@ -1,5 +1,4 @@
-package funcheck.purescala
-
+package purescala
 
 /** AST definitions for Pure Scala. */
 object Trees {
diff --git a/src/purescala/TypeTrees.scala b/src/purescala/TypeTrees.scala
index 1ff91b436cd4351bda0618838ed7387e31888ed8..f6f52a2726018df7175cbdbfc1e0a6172577084c 100644
--- a/src/purescala/TypeTrees.scala
+++ b/src/purescala/TypeTrees.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object TypeTrees {
   import Common._