From 975bce69cebbc1ffc1e6e2d3638e7d54d04f0400 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Mon, 7 Mar 2016 17:49:33 +0100
Subject: [PATCH] Apply 2016 licence

---
 library/annotation/isabelle.scala                          | 2 ++
 library/annotation/package.scala                           | 2 +-
 library/collection/List.scala                              | 2 +-
 library/collection/package.scala                           | 2 +-
 library/instrumentation/package.scala                      | 2 +-
 library/invariant/package.scala                            | 2 +-
 library/lang/Dummy.scala                                   | 2 ++
 library/lang/Either.scala                                  | 2 +-
 library/lang/Map.scala                                     | 2 ++
 library/lang/Option.scala                                  | 2 +-
 library/lang/Rational.scala                                | 2 +-
 library/lang/Real.scala                                    | 2 ++
 library/lang/Set.scala                                     | 2 ++
 library/lang/StrOps.scala                                  | 2 ++
 library/lang/package.scala                                 | 2 +-
 library/lang/synthesis/Oracle.scala                        | 2 +-
 library/lang/synthesis/package.scala                       | 2 +-
 library/lang/xlang/package.scala                           | 2 +-
 library/math/package.scala                                 | 2 ++
 library/monads/state/State.scala                           | 2 ++
 library/par/package.scala                                  | 2 +-
 library/proof/Internal.scala                               | 2 +-
 library/proof/package.scala                                | 3 ++-
 scripts/applyLicense.sh                                    | 2 +-
 src/main/java/leon/codegen/runtime/ArrayBox.java           | 2 +-
 src/main/java/leon/codegen/runtime/BigInt.java             | 2 +-
 src/main/java/leon/codegen/runtime/CaseClass.java          | 2 +-
 src/main/java/leon/codegen/runtime/Lambda.java             | 2 +-
 .../codegen/runtime/LeonCodeGenEvaluationException.java    | 2 +-
 .../leon/codegen/runtime/LeonCodeGenRuntimeException.java  | 2 +-
 .../leon/codegen/runtime/LeonCodeGenRuntimeHashing.java    | 2 +-
 .../leon/codegen/runtime/LeonCodeGenRuntimeMonitor.java    | 2 +-
 src/main/java/leon/codegen/runtime/Map.java                | 2 +-
 src/main/java/leon/codegen/runtime/Rational.java           | 2 +-
 src/main/java/leon/codegen/runtime/Real.java               | 2 +-
 src/main/java/leon/codegen/runtime/Set.java                | 2 +-
 src/main/java/leon/codegen/runtime/StrOps.java             | 2 ++
 src/main/java/leon/codegen/runtime/Tuple.java              | 2 +-
 src/main/scala/leon/GlobalOptions.scala                    | 2 +-
 src/main/scala/leon/LeonComponent.scala                    | 2 +-
 src/main/scala/leon/LeonContext.scala                      | 2 +-
 src/main/scala/leon/LeonExceptions.scala                   | 2 +-
 src/main/scala/leon/LeonOption.scala                       | 2 +-
 src/main/scala/leon/LeonPhase.scala                        | 2 +-
 src/main/scala/leon/Main.scala                             | 2 +-
 src/main/scala/leon/Pipeline.scala                         | 2 +-
 src/main/scala/leon/Printable.scala                        | 2 +-
 src/main/scala/leon/Reporter.scala                         | 2 +-
 src/main/scala/leon/codegen/CodeGenParams.scala            | 2 +-
 src/main/scala/leon/codegen/CodeGeneration.scala           | 2 +-
 src/main/scala/leon/codegen/CompilationException.scala     | 2 +-
 src/main/scala/leon/codegen/CompilationUnit.scala          | 2 +-
 src/main/scala/leon/codegen/CompiledExpression.scala       | 2 +-
 src/main/scala/leon/codegen/runtime/GenericValues.scala    | 2 +-
 src/main/scala/leon/codegen/runtime/RuntimeResources.scala | 2 +-
 src/main/scala/leon/datagen/DataGenerator.scala            | 2 +-
 src/main/scala/leon/datagen/GrammarDataGen.scala           | 2 +-
 src/main/scala/leon/datagen/NaiveDataGen.scala             | 2 +-
 src/main/scala/leon/datagen/SolverDataGen.scala            | 2 +-
 src/main/scala/leon/datagen/VanuatooDataGen.scala          | 2 +-
 src/main/scala/leon/evaluators/AngelicEvaluator.scala      | 2 +-
 src/main/scala/leon/evaluators/CodeGenEvaluator.scala      | 2 +-
 src/main/scala/leon/evaluators/ContextualEvaluator.scala   | 2 +-
 src/main/scala/leon/evaluators/DefaultEvaluator.scala      | 2 +-
 src/main/scala/leon/evaluators/DualEvaluator.scala         | 2 +-
 src/main/scala/leon/evaluators/EvaluationPhase.scala       | 2 +-
 src/main/scala/leon/evaluators/EvaluationResults.scala     | 2 +-
 src/main/scala/leon/evaluators/Evaluator.scala             | 2 +-
 src/main/scala/leon/evaluators/EvaluatorContexts.scala     | 2 +-
 src/main/scala/leon/evaluators/RecursiveEvaluator.scala    | 2 +-
 src/main/scala/leon/evaluators/ScalacEvaluator.scala       | 2 +-
 src/main/scala/leon/evaluators/StreamEvaluator.scala       | 2 +-
 src/main/scala/leon/evaluators/TracingEvaluator.scala      | 2 +-
 src/main/scala/leon/frontends/scalac/ASTExtractors.scala   | 2 +-
 src/main/scala/leon/frontends/scalac/ClassgenPhase.scala   | 2 +-
 src/main/scala/leon/frontends/scalac/CodeExtraction.scala  | 2 +-
 src/main/scala/leon/frontends/scalac/ExtractionPhase.scala | 2 +-
 .../scala/leon/frontends/scalac/FullScalaCompiler.scala    | 2 +-
 src/main/scala/leon/frontends/scalac/LeonExtraction.scala  | 2 +-
 src/main/scala/leon/frontends/scalac/SaveImports.scala     | 2 +-
 src/main/scala/leon/frontends/scalac/ScalaCompiler.scala   | 2 +-
 src/main/scala/leon/frontends/scalac/SimpleReporter.scala  | 2 +-
 src/main/scala/leon/genc/CAST.scala                        | 2 +-
 src/main/scala/leon/genc/CConverter.scala                  | 2 +-
 src/main/scala/leon/genc/CFileOutputPhase.scala            | 2 +-
 src/main/scala/leon/genc/CPrinter.scala                    | 2 +-
 src/main/scala/leon/genc/CPrinterHelper.scala              | 2 +-
 src/main/scala/leon/genc/GenerateCPhase.scala              | 2 +-
 src/main/scala/leon/grammars/BaseGrammar.scala             | 2 +-
 src/main/scala/leon/grammars/Constants.scala               | 2 +-
 src/main/scala/leon/grammars/Empty.scala                   | 2 +-
 src/main/scala/leon/grammars/EqualityGrammar.scala         | 2 +-
 src/main/scala/leon/grammars/ExpressionGrammar.scala       | 2 +-
 src/main/scala/leon/grammars/FunctionCalls.scala           | 2 +-
 src/main/scala/leon/grammars/Grammars.scala                | 2 +-
 src/main/scala/leon/grammars/NonTerminal.scala             | 2 +-
 src/main/scala/leon/grammars/OneOf.scala                   | 2 +-
 src/main/scala/leon/grammars/ProductionRule.scala          | 2 +-
 src/main/scala/leon/grammars/SafeRecursiveCalls.scala      | 2 +-
 src/main/scala/leon/grammars/SimilarTo.scala               | 2 +-
 src/main/scala/leon/grammars/Tags.scala                    | 2 +-
 src/main/scala/leon/grammars/ValueGrammar.scala            | 2 +-
 .../leon/grammars/transformers/DepthBoundedGrammar.scala   | 2 +-
 .../scala/leon/grammars/transformers/EmbeddedGrammar.scala | 2 +-
 .../leon/grammars/transformers/SizeBoundedGrammar.scala    | 2 +-
 .../scala/leon/grammars/transformers/TaggedGrammar.scala   | 2 +-
 src/main/scala/leon/grammars/transformers/Union.scala      | 2 +-
 .../scala/leon/invariant/datastructure/DisjointSets.scala  | 2 ++
 src/main/scala/leon/invariant/datastructure/Graph.scala    | 2 ++
 src/main/scala/leon/invariant/datastructure/Maps.scala     | 2 ++
 .../invariant/engine/CompositionalTimeBoundSolver.scala    | 2 ++
 .../scala/leon/invariant/engine/ConstraintTracker.scala    | 2 ++
 .../scala/leon/invariant/engine/InferInvariantsPhase.scala | 2 ++
 .../scala/leon/invariant/engine/InferenceContext.scala     | 2 ++
 src/main/scala/leon/invariant/engine/InferenceEngine.scala | 2 ++
 src/main/scala/leon/invariant/engine/InferenceReport.scala | 2 +-
 .../scala/leon/invariant/engine/RefinementEngine.scala     | 2 ++
 .../scala/leon/invariant/engine/SpecInstantiator.scala     | 2 ++
 .../scala/leon/invariant/engine/TemplateEnumerator.scala   | 2 ++
 .../leon/invariant/engine/UnfoldingTemplateSolver.scala    | 2 ++
 src/main/scala/leon/invariant/factories/AxiomFactory.scala | 2 ++
 .../scala/leon/invariant/factories/TemplateFactory.scala   | 2 ++
 .../leon/invariant/factories/TemplateInstantiator.scala    | 2 ++
 .../leon/invariant/factories/TemplateSolverFactory.scala   | 2 ++
 src/main/scala/leon/invariant/structure/Constraint.scala   | 2 ++
 src/main/scala/leon/invariant/structure/Formula.scala      | 2 ++
 .../scala/leon/invariant/structure/FunctionUtils.scala     | 2 ++
 .../leon/invariant/structure/LinearConstraintUtil.scala    | 2 ++
 .../scala/leon/invariant/templateSolvers/CegisSolver.scala | 2 ++
 .../leon/invariant/templateSolvers/ExtendedUFSolver.scala  | 2 +-
 .../leon/invariant/templateSolvers/FarkasLemmaSolver.scala | 2 ++
 .../leon/invariant/templateSolvers/NLTemplateSolver.scala  | 2 ++
 .../templateSolvers/NLTemplateSolverWithMult.scala         | 2 ++
 .../leon/invariant/templateSolvers/TemplateSolver.scala    | 2 ++
 .../leon/invariant/templateSolvers/UFADTEliminator.scala   | 2 ++
 src/main/scala/leon/invariant/util/CallGraph.scala         | 2 ++
 .../scala/leon/invariant/util/ExpressionTransformer.scala  | 2 ++
 .../scala/leon/invariant/util/LetTupleSimplification.scala | 2 ++
 src/main/scala/leon/invariant/util/Minimizer.scala         | 2 ++
 src/main/scala/leon/invariant/util/RealToInt.scala         | 2 ++
 .../leon/invariant/util/RealValuedExprEvaluator.scala      | 2 ++
 src/main/scala/leon/invariant/util/SolverUtil.scala        | 2 ++
 src/main/scala/leon/invariant/util/Stats.scala             | 2 ++
 src/main/scala/leon/invariant/util/TVarFactory.scala       | 2 ++
 src/main/scala/leon/invariant/util/TimerUtil.scala         | 2 ++
 src/main/scala/leon/invariant/util/TreeUtil.scala          | 2 ++
 src/main/scala/leon/invariant/util/Util.scala              | 2 ++
 src/main/scala/leon/package.scala                          | 2 +-
 src/main/scala/leon/purescala/CallGraph.scala              | 2 +-
 src/main/scala/leon/purescala/Common.scala                 | 2 +-
 src/main/scala/leon/purescala/Constructors.scala           | 2 +-
 src/main/scala/leon/purescala/DefOps.scala                 | 2 +-
 src/main/scala/leon/purescala/Definitions.scala            | 2 +-
 src/main/scala/leon/purescala/ExprOps.scala                | 2 +-
 src/main/scala/leon/purescala/Expressions.scala            | 2 +-
 src/main/scala/leon/purescala/Extractors.scala             | 2 +-
 src/main/scala/leon/purescala/FunctionClosure.scala        | 2 +-
 src/main/scala/leon/purescala/FunctionMapping.scala        | 2 +-
 src/main/scala/leon/purescala/MethodLifting.scala          | 2 +-
 src/main/scala/leon/purescala/PrettyPrinter.scala          | 2 +-
 src/main/scala/leon/purescala/PrinterHelpers.scala         | 2 +-
 src/main/scala/leon/purescala/PrinterOptions.scala         | 2 +-
 src/main/scala/leon/purescala/Quantification.scala         | 2 +-
 src/main/scala/leon/purescala/RestoreMethods.scala         | 2 +-
 src/main/scala/leon/purescala/ScalaPrinter.scala           | 2 +-
 src/main/scala/leon/purescala/ScopeSimplifier.scala        | 2 +-
 src/main/scala/leon/purescala/SelfPrettyPrinter.scala      | 2 ++
 src/main/scala/leon/purescala/SimplifierWithPaths.scala    | 2 +-
 src/main/scala/leon/purescala/Transformer.scala            | 2 +-
 src/main/scala/leon/purescala/TransformerWithPC.scala      | 2 +-
 src/main/scala/leon/purescala/TreeNormalizations.scala     | 2 +-
 src/main/scala/leon/purescala/TypeOps.scala                | 2 +-
 src/main/scala/leon/purescala/Types.scala                  | 2 +-
 src/main/scala/leon/purescala/package.scala                | 2 +-
 src/main/scala/leon/repair/RepairNDEvaluator.scala         | 2 +-
 src/main/scala/leon/repair/RepairPhase.scala               | 2 +-
 src/main/scala/leon/repair/RepairTrackingEvaluator.scala   | 2 +-
 src/main/scala/leon/repair/Repairman.scala                 | 2 +-
 src/main/scala/leon/repair/rules/Focus.scala               | 2 +-
 src/main/scala/leon/solvers/ADTManager.scala               | 2 +-
 src/main/scala/leon/solvers/CantResetException.scala       | 2 ++
 src/main/scala/leon/solvers/EnumerationSolver.scala        | 2 +-
 src/main/scala/leon/solvers/EvaluatingSolver.scala         | 2 ++
 src/main/scala/leon/solvers/GroundSolver.scala             | 2 +-
 src/main/scala/leon/solvers/Model.scala                    | 2 +-
 src/main/scala/leon/solvers/NaiveAssumptionSolver.scala    | 2 +-
 src/main/scala/leon/solvers/RawArray.scala                 | 2 +-
 src/main/scala/leon/solvers/SimpleSolverAPI.scala          | 2 +-
 src/main/scala/leon/solvers/Solver.scala                   | 2 +-
 src/main/scala/leon/solvers/SolverFactory.scala            | 2 +-
 src/main/scala/leon/solvers/SolverUnsupportedError.scala   | 2 +-
 src/main/scala/leon/solvers/TimeoutSolver.scala            | 2 +-
 src/main/scala/leon/solvers/TimeoutSolverFactory.scala     | 2 +-
 .../scala/leon/solvers/combinators/PortfolioSolver.scala   | 2 +-
 .../leon/solvers/combinators/PortfolioSolverFactory.scala  | 2 +-
 .../scala/leon/solvers/combinators/RewritingSolver.scala   | 2 +-
 src/main/scala/leon/solvers/combinators/SolverPool.scala   | 2 +-
 .../scala/leon/solvers/combinators/UnrollingSolver.scala   | 2 +-
 src/main/scala/leon/solvers/isabelle/AdaptationPhase.scala | 2 ++
 src/main/scala/leon/solvers/isabelle/Component.scala       | 2 ++
 src/main/scala/leon/solvers/isabelle/Functions.scala       | 2 ++
 .../scala/leon/solvers/isabelle/IsabelleEnvironment.scala  | 2 ++
 src/main/scala/leon/solvers/isabelle/IsabellePhase.scala   | 2 ++
 src/main/scala/leon/solvers/isabelle/IsabelleSolver.scala  | 2 ++
 .../leon/solvers/isabelle/IsabelleSolverFactory.scala      | 2 ++
 src/main/scala/leon/solvers/isabelle/Translator.scala      | 2 ++
 src/main/scala/leon/solvers/isabelle/Types.scala           | 2 ++
 src/main/scala/leon/solvers/isabelle/package.scala         | 2 ++
 src/main/scala/leon/solvers/package.scala                  | 2 +-
 .../solvers/smtlib/SMTLIBCVC4CounterExampleSolver.scala    | 2 +-
 .../scala/leon/solvers/smtlib/SMTLIBCVC4ProofSolver.scala  | 2 +-
 .../leon/solvers/smtlib/SMTLIBCVC4QuantifiedSolver.scala   | 2 +-
 .../leon/solvers/smtlib/SMTLIBCVC4QuantifiedTarget.scala   | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Solver.scala  | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Target.scala  | 2 +-
 .../scala/leon/solvers/smtlib/SMTLIBQuantifiedSolver.scala | 2 +-
 .../scala/leon/solvers/smtlib/SMTLIBQuantifiedTarget.scala | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBSolver.scala      | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala      | 2 +-
 .../scala/leon/solvers/smtlib/SMTLIBUnsupportedError.scala | 2 +-
 .../leon/solvers/smtlib/SMTLIBZ3QuantifiedSolver.scala     | 2 +-
 .../leon/solvers/smtlib/SMTLIBZ3QuantifiedTarget.scala     | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBZ3Solver.scala    | 2 +-
 src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala    | 2 +-
 src/main/scala/leon/solvers/string/StringSolver.scala      | 2 ++
 src/main/scala/leon/solvers/sygus/CVC4SygusSolver.scala    | 2 +-
 src/main/scala/leon/solvers/sygus/SygusSolver.scala        | 2 +-
 src/main/scala/leon/solvers/templates/LambdaManager.scala  | 2 +-
 .../leon/solvers/templates/QuantificationManager.scala     | 2 +-
 .../scala/leon/solvers/templates/TemplateEncoder.scala     | 2 +-
 .../scala/leon/solvers/templates/TemplateGenerator.scala   | 2 +-
 src/main/scala/leon/solvers/templates/TemplateInfo.scala   | 2 +-
 .../scala/leon/solvers/templates/TemplateManager.scala     | 2 +-
 src/main/scala/leon/solvers/templates/UnrollingBank.scala  | 2 +-
 src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala      | 2 +-
 src/main/scala/leon/solvers/z3/FairZ3Solver.scala          | 2 +-
 src/main/scala/leon/solvers/z3/UninterpretedZ3Solver.scala | 2 +-
 src/main/scala/leon/solvers/z3/Z3ModelReconstruction.scala | 2 +-
 src/main/scala/leon/solvers/z3/Z3StringConversion.scala    | 2 ++
 src/main/scala/leon/synthesis/Algebra.scala                | 2 +-
 src/main/scala/leon/synthesis/ConversionPhase.scala        | 2 +-
 src/main/scala/leon/synthesis/CostModel.scala              | 2 +-
 src/main/scala/leon/synthesis/ExamplesBank.scala           | 2 ++
 src/main/scala/leon/synthesis/ExamplesFinder.scala         | 2 +-
 src/main/scala/leon/synthesis/FileInterface.scala          | 2 +-
 src/main/scala/leon/synthesis/Histogram.scala              | 2 +-
 src/main/scala/leon/synthesis/InOutExample.scala           | 2 +-
 src/main/scala/leon/synthesis/LinearEquations.scala        | 2 +-
 src/main/scala/leon/synthesis/PartialSolution.scala        | 2 +-
 src/main/scala/leon/synthesis/Problem.scala                | 2 +-
 src/main/scala/leon/synthesis/Rules.scala                  | 2 +-
 src/main/scala/leon/synthesis/Search.scala                 | 2 +-
 src/main/scala/leon/synthesis/SearchContext.scala          | 2 +-
 src/main/scala/leon/synthesis/Solution.scala               | 2 +-
 src/main/scala/leon/synthesis/SourceInfo.scala             | 2 +-
 src/main/scala/leon/synthesis/SynthesisContext.scala       | 2 +-
 src/main/scala/leon/synthesis/SynthesisPhase.scala         | 2 +-
 src/main/scala/leon/synthesis/SynthesisSettings.scala      | 2 +-
 src/main/scala/leon/synthesis/Synthesizer.scala            | 2 +-
 src/main/scala/leon/synthesis/Witnesses.scala              | 2 +-
 .../leon/synthesis/disambiguation/ExamplesAdder.scala      | 3 ++-
 .../scala/leon/synthesis/disambiguation/Question.scala     | 2 ++
 .../leon/synthesis/disambiguation/QuestionBuilder.scala    | 2 ++
 src/main/scala/leon/synthesis/graph/DotGenerator.scala     | 2 +-
 src/main/scala/leon/synthesis/graph/Graph.scala            | 2 +-
 src/main/scala/leon/synthesis/package.scala                | 2 +-
 .../leon/synthesis/programsets/DirectProgramSet.scala      | 2 ++
 .../scala/leon/synthesis/programsets/JoinProgramSet.scala  | 2 ++
 src/main/scala/leon/synthesis/programsets/ProgramSet.scala | 2 ++
 .../scala/leon/synthesis/programsets/UnionProgramset.scala | 2 ++
 src/main/scala/leon/synthesis/rules/ADTDual.scala          | 2 +-
 src/main/scala/leon/synthesis/rules/ADTInduction.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/ADTLongInduction.scala | 2 +-
 src/main/scala/leon/synthesis/rules/ADTSplit.scala         | 2 +-
 src/main/scala/leon/synthesis/rules/AsChoose.scala         | 2 +-
 src/main/scala/leon/synthesis/rules/Assert.scala           | 2 +-
 src/main/scala/leon/synthesis/rules/BottomUpTegis.scala    | 2 +-
 src/main/scala/leon/synthesis/rules/CEGIS.scala            | 2 +-
 src/main/scala/leon/synthesis/rules/CEGISLike.scala        | 2 +-
 src/main/scala/leon/synthesis/rules/CEGLESS.scala          | 2 +-
 src/main/scala/leon/synthesis/rules/CaseSplit.scala        | 2 +-
 src/main/scala/leon/synthesis/rules/DetupleInput.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/DetupleOutput.scala    | 2 +-
 src/main/scala/leon/synthesis/rules/Disunification.scala   | 2 +-
 src/main/scala/leon/synthesis/rules/EqualitySplit.scala    | 2 +-
 src/main/scala/leon/synthesis/rules/EquivalentInputs.scala | 2 +-
 src/main/scala/leon/synthesis/rules/Ground.scala           | 2 +-
 src/main/scala/leon/synthesis/rules/IfSplit.scala          | 2 +-
 src/main/scala/leon/synthesis/rules/IndependentSplit.scala | 2 +-
 src/main/scala/leon/synthesis/rules/InequalitySplit.scala  | 2 +-
 src/main/scala/leon/synthesis/rules/InnerCaseSplit.scala   | 2 +-
 src/main/scala/leon/synthesis/rules/InputSplit.scala       | 2 +-
 src/main/scala/leon/synthesis/rules/IntInduction.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/IntegerEquation.scala  | 2 +-
 .../scala/leon/synthesis/rules/IntegerInequalities.scala   | 2 +-
 .../scala/leon/synthesis/rules/IntroduceRecCalls.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/OnePoint.scala         | 2 +-
 src/main/scala/leon/synthesis/rules/OptimisticGround.scala | 2 +-
 .../scala/leon/synthesis/rules/OptimisticInjection.scala   | 2 +-
 .../scala/leon/synthesis/rules/SelectiveInlining.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/StringRender.scala     | 2 +-
 src/main/scala/leon/synthesis/rules/SygusCVC4.scala        | 2 +-
 src/main/scala/leon/synthesis/rules/TEGIS.scala            | 2 +-
 src/main/scala/leon/synthesis/rules/TEGISLike.scala        | 2 +-
 src/main/scala/leon/synthesis/rules/TEGLESS.scala          | 2 +-
 .../scala/leon/synthesis/rules/UnconstrainedOutput.scala   | 2 +-
 src/main/scala/leon/synthesis/rules/Unification.scala      | 2 +-
 src/main/scala/leon/synthesis/rules/UnusedInput.scala      | 2 +-
 .../scala/leon/synthesis/strategies/BoundedStrategy.scala  | 2 +-
 .../leon/synthesis/strategies/CostBasedStrategy.scala      | 2 +-
 .../scala/leon/synthesis/strategies/ManualStrategy.scala   | 2 +-
 src/main/scala/leon/synthesis/strategies/Strategy.scala    | 2 +-
 .../leon/synthesis/strategies/TimeSlicingStrategy.scala    | 2 +-
 .../scala/leon/synthesis/strategies/WrappedStrategy.scala  | 2 +-
 src/main/scala/leon/synthesis/utils/Helpers.scala          | 2 +-
 .../synthesis/utils/SynthesisProblemExtractionPhase.scala  | 2 +-
 src/main/scala/leon/termination/ChainBuilder.scala         | 2 +-
 src/main/scala/leon/termination/ChainComparator.scala      | 2 +-
 src/main/scala/leon/termination/ChainProcessor.scala       | 2 +-
 .../scala/leon/termination/ComplexTerminationChecker.scala | 2 +-
 src/main/scala/leon/termination/LoopProcessor.scala        | 2 +-
 src/main/scala/leon/termination/ProcessingPipeline.scala   | 2 +-
 src/main/scala/leon/termination/Processor.scala            | 2 +-
 src/main/scala/leon/termination/RecursionProcessor.scala   | 2 +-
 src/main/scala/leon/termination/RelationBuilder.scala      | 2 +-
 src/main/scala/leon/termination/RelationComparator.scala   | 2 +-
 src/main/scala/leon/termination/RelationProcessor.scala    | 2 +-
 src/main/scala/leon/termination/SelfCallsProcessor.scala   | 2 +-
 .../scala/leon/termination/SimpleTerminationChecker.scala  | 2 +-
 src/main/scala/leon/termination/Strengthener.scala         | 2 +-
 src/main/scala/leon/termination/StructuralSize.scala       | 2 +-
 src/main/scala/leon/termination/TerminationChecker.scala   | 2 +-
 src/main/scala/leon/termination/TerminationPhase.scala     | 2 +-
 src/main/scala/leon/termination/TerminationReport.scala    | 2 +-
 src/main/scala/leon/transformations/DepthInstPhase.scala   | 2 ++
 .../scala/leon/transformations/InstProgSimplifier.scala    | 2 ++
 .../scala/leon/transformations/InstrumentationUtil.scala   | 2 ++
 src/main/scala/leon/transformations/IntToRealProgram.scala | 2 ++
 .../scala/leon/transformations/NonRecursiveTimePhase.scala | 2 ++
 .../transformations/NonlinearityEliminationPhase.scala     | 2 ++
 .../scala/leon/transformations/RecursionCountPhase.scala   | 2 ++
 .../leon/transformations/SerialInstrumentationPhase.scala  | 2 ++
 src/main/scala/leon/transformations/StackSpacePhase.scala  | 2 ++
 src/main/scala/leon/transformations/TimeStepsPhase.scala   | 2 ++
 src/main/scala/leon/utils/ASCIIHelpers.scala               | 2 +-
 src/main/scala/leon/utils/Benchmarks.scala                 | 2 +-
 src/main/scala/leon/utils/Bijection.scala                  | 2 +-
 src/main/scala/leon/utils/DebugSections.scala              | 2 +-
 src/main/scala/leon/utils/FileOutputPhase.scala            | 2 +-
 src/main/scala/leon/utils/FilesWatcher.scala               | 2 +-
 src/main/scala/leon/utils/FreeableIterator.scala           | 2 +-
 src/main/scala/leon/utils/GraphOps.scala                   | 2 +-
 src/main/scala/leon/utils/GraphPrinters.scala              | 2 +-
 src/main/scala/leon/utils/Graphs.scala                     | 2 +-
 src/main/scala/leon/utils/GrowableIterable.scala           | 2 ++
 src/main/scala/leon/utils/IncrementalBijection.scala       | 2 +-
 src/main/scala/leon/utils/IncrementalMap.scala             | 2 +-
 src/main/scala/leon/utils/IncrementalSeq.scala             | 2 +-
 src/main/scala/leon/utils/IncrementalSet.scala             | 2 +-
 src/main/scala/leon/utils/IncrementalState.scala           | 2 ++
 src/main/scala/leon/utils/InliningPhase.scala              | 2 +-
 src/main/scala/leon/utils/InterruptManager.scala           | 2 +-
 src/main/scala/leon/utils/Interruptible.scala              | 2 +-
 src/main/scala/leon/utils/Library.scala                    | 2 +-
 src/main/scala/leon/utils/ModelEnumerator.scala            | 2 ++
 src/main/scala/leon/utils/OracleTraverser.scala            | 2 +-
 src/main/scala/leon/utils/Positions.scala                  | 2 +-
 src/main/scala/leon/utils/PreprocessingPhase.scala         | 2 +-
 src/main/scala/leon/utils/PrintTreePhase.scala             | 2 +-
 src/main/scala/leon/utils/SCC.scala                        | 2 +-
 src/main/scala/leon/utils/SearchSpace.scala                | 2 +-
 src/main/scala/leon/utils/SeqUtils.scala                   | 2 +-
 src/main/scala/leon/utils/Simplifiers.scala                | 2 +-
 src/main/scala/leon/utils/StreamUtils.scala                | 2 +-
 src/main/scala/leon/utils/TemporaryInputPhase.scala        | 2 +-
 src/main/scala/leon/utils/TimeoutFor.scala                 | 2 +-
 src/main/scala/leon/utils/Timer.scala                      | 2 +-
 src/main/scala/leon/utils/TypingPhase.scala                | 2 +-
 src/main/scala/leon/utils/UniqueCounter.scala              | 2 +-
 src/main/scala/leon/utils/UnitElimination.scala            | 2 +-
 src/main/scala/leon/utils/package.scala                    | 2 ++
 src/main/scala/leon/verification/DefaultTactic.scala       | 2 +-
 src/main/scala/leon/verification/InductionTactic.scala     | 2 +-
 src/main/scala/leon/verification/InjectAsserts.scala       | 2 +-
 src/main/scala/leon/verification/Tactic.scala              | 2 +-
 .../scala/leon/verification/VerificationCondition.scala    | 2 +-
 src/main/scala/leon/verification/VerificationContext.scala | 2 +-
 src/main/scala/leon/verification/VerificationPhase.scala   | 2 +-
 src/main/scala/leon/verification/VerificationReport.scala  | 2 +-
 src/main/scala/leon/xlang/ArrayTransformation.scala        | 2 +-
 src/main/scala/leon/xlang/EpsilonElimination.scala         | 2 +-
 src/main/scala/leon/xlang/ExprOps.scala                    | 2 +-
 src/main/scala/leon/xlang/Expressions.scala                | 2 +-
 src/main/scala/leon/xlang/FixReportLabels.scala            | 2 +-
 src/main/scala/leon/xlang/ImperativeCodeElimination.scala  | 2 +-
 src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala    | 2 +-
 src/main/scala/leon/xlang/XLangDesugaringPhase.scala       | 2 +-
 .../regression/frontends/error/simple/ArrayEquals1.scala   | 2 ++
 .../regression/frontends/error/simple/ArrayEquals2.scala   | 2 ++
 .../regression/frontends/error/simple/Asserts.scala        | 2 +-
 .../regression/frontends/error/simple/ConvertBigInt.scala  | 2 +-
 .../regression/frontends/error/simple/InstanceOf1.scala    | 2 +-
 .../regression/frontends/error/simple/LiteralBigInt.scala  | 2 +-
 .../regression/frontends/error/simple/NotEquals.scala      | 2 +-
 .../regression/frontends/passing/ClassFields.scala         | 2 ++
 .../resources/regression/frontends/passing/Fields.scala    | 2 +-
 .../regression/frontends/passing/ImplicitDefs.scala        | 2 ++
 .../regression/frontends/passing/ImplicitDefs2.scala       | 2 ++
 .../resources/regression/frontends/passing/Operators.scala | 2 +-
 .../resources/regression/frontends/passing/OptParams.scala | 2 +-
 .../resources/regression/frontends/passing/Overrides.scala | 2 ++
 .../regression/frontends/passing/bigintExtr.scala          | 2 ++
 src/test/resources/regression/genc/invalid/AbsFun.scala    | 2 ++
 .../resources/regression/genc/invalid/LinearSearch.scala   | 2 ++
 .../regression/genc/unverified/BinarySearch.scala          | 2 ++
 .../regression/genc/unverified/BinarySearchFun.scala       | 2 ++
 src/test/resources/regression/genc/unverified/MaxSum.scala | 2 ++
 src/test/resources/regression/genc/valid/AbsArray.scala    | 2 ++
 src/test/resources/regression/genc/valid/CaseClass.scala   | 2 ++
 .../resources/regression/genc/valid/ExpressionOrder.scala  | 2 ++
 .../resources/regression/genc/valid/IntegralColor.scala    | 2 ++
 .../genc/valid/RecursionAndNestedFunctions.scala           | 2 ++
 src/test/resources/regression/genc/valid/TupleArray.scala  | 2 ++
 .../resources/regression/orb/combined/InsertionSort.scala  | 2 ++
 src/test/resources/regression/orb/depth/BinaryTrie.scala   | 2 ++
 src/test/resources/regression/orb/depth/Folds.scala        | 2 ++
 .../resources/regression/orb/depth/ListOperations.scala    | 2 ++
 .../resources/regression/orb/depth/PropLogicDepth.scala    | 2 ++
 .../regression/orb/numerical/ConcatVariationsAbs.scala     | 2 ++
 src/test/resources/regression/orb/numerical/QueueAbs.scala | 2 ++
 .../resources/regression/orb/numerical/SimpleLoop.scala    | 2 ++
 src/test/resources/regression/orb/numerical/see-saw.scala  | 2 ++
 src/test/resources/regression/orb/stack/BinaryTrie.scala   | 2 ++
 .../resources/regression/orb/stack/ListOperations.scala    | 2 ++
 .../resources/regression/orb/stack/SpeedBenchmarks.scala   | 2 ++
 src/test/resources/regression/orb/timing/BinaryTrie.scala  | 2 ++
 .../resources/regression/orb/timing/ConcatVariations.scala | 2 ++
 .../resources/regression/orb/timing/ListOperations.scala   | 2 ++
 .../regression/orb/timing/PropositionalLogic.scala         | 2 ++
 src/test/resources/regression/orb/timing/SimpleMap.scala   | 2 ++
 src/test/resources/regression/performance/cegis/Add.scala  | 2 +-
 .../resources/regression/performance/cegis/Distinct.scala  | 2 +-
 .../resources/regression/performance/cegis/Hole1.scala     | 2 +-
 .../resources/regression/performance/cegis/Length.scala    | 2 +-
 src/test/resources/regression/performance/cegis/Mult.scala | 2 +-
 .../resources/regression/performance/cegis/Squared.scala   | 2 +-
 src/test/resources/regression/repair/Compiler1.scala       | 2 +-
 src/test/resources/regression/repair/Heap3.scala           | 6 +++---
 src/test/resources/regression/repair/Heap4.scala           | 7 ++++---
 src/test/resources/regression/repair/List1.scala           | 2 +-
 src/test/resources/regression/repair/ListEasy.scala        | 2 +-
 src/test/resources/regression/repair/MergeSort2.scala      | 2 +-
 src/test/resources/regression/synthesis/Church/Add.scala   | 2 +-
 .../resources/regression/synthesis/Church/Distinct.scala   | 2 +-
 src/test/resources/regression/synthesis/Church/Mult.scala  | 2 +-
 .../resources/regression/synthesis/Church/Squared.scala    | 2 +-
 .../resources/regression/synthesis/Examples/Length.scala   | 2 +-
 src/test/resources/regression/synthesis/Holes/Hole1.scala  | 2 +-
 src/test/resources/regression/synthesis/List/Delete.scala  | 2 +-
 src/test/resources/regression/synthesis/List/Diff.scala    | 2 +-
 src/test/resources/regression/synthesis/List/Insert.scala  | 2 +-
 src/test/resources/regression/synthesis/List/Split1.scala  | 2 ++
 src/test/resources/regression/synthesis/List/Split2.scala  | 2 ++
 src/test/resources/regression/synthesis/List/Split3.scala  | 2 ++
 src/test/resources/regression/synthesis/List/Union.scala   | 2 +-
 .../resources/regression/synthesis/Misc/HolesBug.scala     | 2 ++
 src/test/resources/regression/synthesis/Misc/Unapply.scala | 2 ++
 .../resources/regression/synthesis/SortedList/Delete.scala | 2 ++
 .../resources/regression/synthesis/SortedList/Diff.scala   | 2 ++
 .../regression/synthesis/SortedList/Insert1.scala          | 2 ++
 .../regression/synthesis/SortedList/Insert2.scala          | 2 ++
 .../regression/synthesis/SortedList/InsertSort.scala       | 2 ++
 .../resources/regression/synthesis/SortedList/Union.scala  | 2 ++
 .../regression/synthesis/StrictSortedList/Delete.scala     | 2 ++
 .../regression/synthesis/StrictSortedList/Insert.scala     | 2 ++
 .../regression/synthesis/StrictSortedList/Union.scala      | 2 ++
 .../regression/termination/looping/LambdaCalculus.scala    | 2 ++
 .../regression/termination/looping/Numeric1.scala          | 2 +-
 .../regression/termination/looping/Numeric2.scala          | 2 +-
 .../regression/termination/looping/Numeric3.scala          | 2 +-
 .../resources/regression/termination/looping/OddEven.scala | 2 ++
 .../resources/regression/termination/looping/Queue.scala   | 2 ++
 .../termination/looping/Termination_failling1.scala        | 2 +-
 .../regression/termination/looping/UniversalEquality.scala | 2 ++
 .../regression/termination/looping/WrongFibonacci.scala    | 2 ++
 .../regression/termination/valid/CountTowardsZero.scala    | 2 ++
 .../resources/regression/termination/valid/Fibonacci.scala | 2 +-
 .../regression/termination/valid/HOTermination.scala       | 2 +-
 .../regression/termination/valid/ListWithSize.scala        | 2 +-
 src/test/resources/regression/termination/valid/NNF.scala  | 2 ++
 .../resources/regression/termination/valid/Numeric1.scala  | 2 +-
 .../resources/regression/termination/valid/Queue.scala     | 2 ++
 .../resources/regression/termination/valid/QuickSort.scala | 2 +-
 .../regression/termination/valid/RedBlackTree.scala        | 2 +-
 .../regression/termination/valid/SimpInterpret.scala       | 2 +-
 .../termination/valid/Termination_passing1.scala           | 2 +-
 .../regression/transformations/SimplifyLets.scala          | 2 +-
 .../regression/transformations/SimplifyPaths.scala         | 2 +-
 .../verification/isabelle/error/FunctionsWrong.scala       | 2 ++
 .../verification/isabelle/error/MutualWrong.scala          | 2 ++
 .../verification/isabelle/error/TypesWrong.scala           | 2 ++
 .../regression/verification/isabelle/unknown/Casts.scala   | 2 ++
 .../regression/verification/isabelle/unknown/Mutual.scala  | 2 ++
 .../regression/verification/isabelle/valid/Datatypes.scala | 2 ++
 .../regression/verification/isabelle/valid/Lists.scala     | 2 ++
 .../regression/verification/isabelle/valid/Nats.scala      | 2 ++
 .../verification/isabelle/valid/Overlapping.scala          | 2 ++
 .../verification/isabelle/valid/Quantifiers.scala          | 2 ++
 .../regression/verification/isabelle/valid/Reals.scala     | 2 ++
 .../regression/verification/isabelle/valid/Unapply.scala   | 2 ++
 .../regression/verification/newsolvers/invalid/Acc.scala   | 2 ++
 .../newsolvers/invalid/AddingNegativeNumbers.scala         | 2 +-
 .../newsolvers/invalid/AddingPositiveNumbers.scala         | 2 +-
 .../verification/newsolvers/invalid/Array1.scala           | 2 +-
 .../verification/newsolvers/invalid/Array2.scala           | 2 +-
 .../verification/newsolvers/invalid/Array3.scala           | 2 +-
 .../verification/newsolvers/invalid/Array4.scala           | 2 +-
 .../verification/newsolvers/invalid/Asserts1.scala         | 2 +-
 .../verification/newsolvers/invalid/BVDivision.scala       | 2 ++
 .../verification/newsolvers/invalid/BVDivision2.scala      | 2 ++
 .../verification/newsolvers/invalid/BigArray.scala         | 2 +-
 .../verification/newsolvers/invalid/Division.scala         | 2 ++
 .../verification/newsolvers/invalid/EnsuringBoolean.scala  | 2 +-
 .../verification/newsolvers/invalid/FiniteSort.scala       | 2 +-
 .../verification/newsolvers/invalid/Generics.scala         | 2 +-
 .../verification/newsolvers/invalid/Generics2.scala        | 2 +-
 .../verification/newsolvers/invalid/InsertionSort.scala    | 2 +-
 .../verification/newsolvers/invalid/ListOperations.scala   | 2 +-
 .../verification/newsolvers/invalid/MyTuple1.scala         | 2 +-
 .../verification/newsolvers/invalid/MyTuple2.scala         | 2 +-
 .../verification/newsolvers/invalid/MyTuple3.scala         | 2 +-
 .../verification/newsolvers/invalid/PositiveMap.scala      | 2 +-
 .../newsolvers/invalid/PropositionalLogic.scala            | 2 +-
 .../verification/newsolvers/invalid/RedBlackTree.scala     | 2 +-
 .../regression/verification/newsolvers/invalid/Unit1.scala | 2 +-
 .../regression/verification/newsolvers/valid/Acc.scala     | 2 ++
 .../newsolvers/valid/AddingPositiveNumbers.scala           | 2 +-
 .../verification/newsolvers/valid/AmortizedQueue.scala     | 2 +-
 .../verification/newsolvers/valid/ArrayLiterals.scala      | 2 +-
 .../verification/newsolvers/valid/ArrayUpdated.scala       | 2 +-
 .../verification/newsolvers/valid/Asserts1.scala           | 2 ++
 .../verification/newsolvers/valid/AssociativeList.scala    | 2 +-
 .../verification/newsolvers/valid/BestRealTypes.scala      | 2 +-
 .../verification/newsolvers/valid/BitsTricks.scala         | 2 ++
 .../verification/newsolvers/valid/CaseObject1.scala        | 2 +-
 .../regression/verification/newsolvers/valid/Field1.scala  | 2 +-
 .../regression/verification/newsolvers/valid/Field2.scala  | 2 +-
 .../verification/newsolvers/valid/FiniteSort.scala         | 2 +-
 .../verification/newsolvers/valid/FoolProofAdder.scala     | 2 ++
 .../verification/newsolvers/valid/Generics.scala           | 2 +-
 .../verification/newsolvers/valid/Generics1.scala          | 2 +-
 .../regression/verification/newsolvers/valid/Heaps.scala   | 2 +-
 .../verification/newsolvers/valid/InsertionSort.scala      | 2 +-
 .../verification/newsolvers/valid/InstanceOf1.scala        | 2 +-
 .../verification/newsolvers/valid/ListOperations.scala     | 2 +-
 .../verification/newsolvers/valid/LiteralMaps.scala        | 4 ++--
 .../verification/newsolvers/valid/MergeSort.scala          | 2 +-
 .../regression/verification/newsolvers/valid/MyMap.scala   | 2 +-
 .../regression/verification/newsolvers/valid/MySet.scala   | 2 +-
 .../verification/newsolvers/valid/MyTuple1.scala           | 2 +-
 .../verification/newsolvers/valid/MyTuple2.scala           | 2 +-
 .../verification/newsolvers/valid/MyTuple3.scala           | 2 +-
 .../verification/newsolvers/valid/MyTuple4.scala           | 2 +-
 .../verification/newsolvers/valid/MyTuple5.scala           | 2 +-
 .../verification/newsolvers/valid/MyTuple6.scala           | 2 +-
 .../regression/verification/newsolvers/valid/Nat.scala     | 2 +-
 .../verification/newsolvers/valid/NotEquals.scala          | 2 ++
 .../verification/newsolvers/valid/PositiveMap.scala        | 2 +-
 .../verification/newsolvers/valid/PropositionalLogic.scala | 2 +-
 .../verification/newsolvers/valid/RedBlackTree.scala       | 2 +-
 .../verification/newsolvers/valid/SearchLinkedList.scala   | 2 +-
 .../verification/newsolvers/valid/Subtyping1.scala         | 2 +-
 .../verification/newsolvers/valid/Subtyping2.scala         | 2 +-
 .../regression/verification/newsolvers/valid/Unit1.scala   | 2 +-
 .../regression/verification/newsolvers/valid/Unit2.scala   | 2 +-
 .../regression/verification/purescala/invalid/Acc.scala    | 2 +-
 .../purescala/invalid/AddingNegativeNumbers.scala          | 2 +-
 .../purescala/invalid/AddingPositiveNumbers.scala          | 2 +-
 .../regression/verification/purescala/invalid/Array1.scala | 2 +-
 .../regression/verification/purescala/invalid/Array2.scala | 2 +-
 .../regression/verification/purescala/invalid/Array3.scala | 2 +-
 .../regression/verification/purescala/invalid/Array4.scala | 2 +-
 .../regression/verification/purescala/invalid/Array5.scala | 2 +-
 .../regression/verification/purescala/invalid/Array6.scala | 2 +-
 .../regression/verification/purescala/invalid/Array7.scala | 2 +-
 .../verification/purescala/invalid/Asserts1.scala          | 2 +-
 .../verification/purescala/invalid/BVDivision2.scala       | 2 ++
 .../verification/purescala/invalid/BVDivisionByZero.scala  | 2 ++
 .../verification/purescala/invalid/BVRemainderByZero.scala | 2 ++
 .../verification/purescala/invalid/BigArray.scala          | 2 +-
 .../purescala/invalid/BinarySearchTreeQuant.scala          | 2 ++
 .../verification/purescala/invalid/BraunTree.scala         | 2 +-
 .../verification/purescala/invalid/CallByName1.scala       | 2 ++
 .../verification/purescala/invalid/CharCompare.scala       | 2 ++
 .../verification/purescala/invalid/Choose1.scala           | 2 +-
 .../verification/purescala/invalid/DivisionByZero.scala    | 2 ++
 .../verification/purescala/invalid/EnsuringBoolean.scala   | 2 +-
 .../verification/purescala/invalid/Existentials.scala      | 2 ++
 .../verification/purescala/invalid/FieldInheritance.scala  | 2 ++
 .../verification/purescala/invalid/FiniteSort.scala        | 2 +-
 .../verification/purescala/invalid/ForallAssoc.scala       | 2 ++
 .../verification/purescala/invalid/Generics.scala          | 2 +-
 .../verification/purescala/invalid/Generics2.scala         | 2 +-
 .../verification/purescala/invalid/HOInvocations.scala     | 2 +-
 .../verification/purescala/invalid/HOInvocations2.scala    | 2 ++
 .../verification/purescala/invalid/InsertionSort.scala     | 2 +-
 .../verification/purescala/invalid/ListOperations.scala    | 2 +-
 .../regression/verification/purescala/invalid/Lists.scala  | 2 +-
 .../verification/purescala/invalid/MatchExh.scala          | 2 ++
 .../regression/verification/purescala/invalid/Mean.scala   | 2 +-
 .../verification/purescala/invalid/ModuloByZero.scala      | 2 ++
 .../verification/purescala/invalid/Monotonic.scala         | 2 ++
 .../verification/purescala/invalid/MyTuple1.scala          | 2 +-
 .../verification/purescala/invalid/MyTuple2.scala          | 2 +-
 .../verification/purescala/invalid/MyTuple3.scala          | 2 +-
 .../verification/purescala/invalid/Nested15.scala          | 4 +++-
 .../verification/purescala/invalid/Overrides.scala         | 2 ++
 .../verification/purescala/invalid/PositiveMap.scala       | 2 +-
 .../verification/purescala/invalid/PositiveMap2.scala      | 2 ++
 .../verification/purescala/invalid/Postcondition.scala     | 2 ++
 .../verification/purescala/invalid/PreInSpecs.scala        | 2 ++
 .../purescala/invalid/PropositionalLogic.scala             | 2 +-
 .../purescala/invalid/RealDivisionByZero.scala             | 2 ++
 .../verification/purescala/invalid/RealNonDiscrete.scala   | 2 ++
 .../verification/purescala/invalid/RedBlackTree.scala      | 2 +-
 .../verification/purescala/invalid/RemainderByZero.scala   | 2 ++
 .../purescala/invalid/SimpleQuantification.scala           | 2 ++
 .../verification/purescala/invalid/TestLazinessOfAnd.scala | 2 ++
 .../verification/purescala/invalid/Unapply1.scala          | 2 ++
 .../verification/purescala/invalid/Unapply2.scala          | 2 ++
 .../regression/verification/purescala/invalid/Unit1.scala  | 2 +-
 .../regression/verification/purescala/valid/Acc.scala      | 2 +-
 .../purescala/valid/AddingPositiveNumbers.scala            | 2 +-
 .../verification/purescala/valid/AmortizedQueue.scala      | 2 +-
 .../verification/purescala/valid/Anonymous.scala           | 2 +-
 .../regression/verification/purescala/valid/Array1.scala   | 2 +-
 .../regression/verification/purescala/valid/Array2.scala   | 2 +-
 .../regression/verification/purescala/valid/Array3.scala   | 2 +-
 .../verification/purescala/valid/ArrayLiterals.scala       | 2 +-
 .../verification/purescala/valid/ArrayUpdated.scala        | 2 +-
 .../regression/verification/purescala/valid/Asserts1.scala | 2 +-
 .../verification/purescala/valid/AssociativeList.scala     | 2 +-
 .../verification/purescala/valid/BVDivSemantics.scala      | 2 ++
 .../verification/purescala/valid/BVDivisionByZero.scala    | 2 ++
 .../verification/purescala/valid/BVDivisionByZero2.scala   | 2 ++
 .../verification/purescala/valid/BasicReal.scala           | 2 ++
 .../verification/purescala/valid/BestRealTypes.scala       | 2 +-
 .../purescala/valid/BinarySearchTreeQuant.scala            | 2 ++
 .../verification/purescala/valid/BitsTricks.scala          | 2 +-
 .../verification/purescala/valid/CallByName1.scala         | 2 ++
 .../verification/purescala/valid/CaseObject1.scala         | 2 +-
 .../regression/verification/purescala/valid/Choose1.scala  | 2 +-
 .../regression/verification/purescala/valid/Choose2.scala  | 2 +-
 .../regression/verification/purescala/valid/Client.scala   | 2 ++
 .../regression/verification/purescala/valid/Closures.scala | 2 +-
 .../verification/purescala/valid/Closures2.scala           | 2 +-
 .../verification/purescala/valid/Composition.scala         | 2 ++
 .../verification/purescala/valid/DivisionByZero.scala      | 2 ++
 .../verification/purescala/valid/Existentials.scala        | 2 ++
 .../regression/verification/purescala/valid/Extern1.scala  | 2 ++
 .../regression/verification/purescala/valid/Extern2.scala  | 2 ++
 .../regression/verification/purescala/valid/Field1.scala   | 2 +-
 .../regression/verification/purescala/valid/Field2.scala   | 2 +-
 .../verification/purescala/valid/FieldInheritance.scala    | 2 ++
 .../verification/purescala/valid/FiniteSort.scala          | 2 +-
 .../regression/verification/purescala/valid/FlatMap.scala  | 2 +-
 .../verification/purescala/valid/FoldAssociative.scala     | 2 +-
 .../verification/purescala/valid/FoolProofAdder.scala      | 2 +-
 .../verification/purescala/valid/ForallAssoc.scala         | 2 ++
 .../regression/verification/purescala/valid/Formulas.scala | 2 ++
 .../regression/verification/purescala/valid/Generics.scala | 2 +-
 .../verification/purescala/valid/Generics1.scala           | 2 +-
 .../verification/purescala/valid/HOInvocations.scala       | 2 +-
 .../verification/purescala/valid/HOInvocations2.scala      | 2 ++
 .../regression/verification/purescala/valid/Heaps.scala    | 2 +-
 .../verification/purescala/valid/InsertionSort.scala       | 2 +-
 .../verification/purescala/valid/InstanceOf1.scala         | 2 +-
 .../regression/verification/purescala/valid/Justify.scala  | 2 ++
 .../verification/purescala/valid/LambdaEquality.scala      | 2 ++
 .../regression/verification/purescala/valid/Lambdas.scala  | 2 +-
 .../verification/purescala/valid/ListOperations.scala      | 2 +-
 .../regression/verification/purescala/valid/Lists1.scala   | 2 +-
 .../regression/verification/purescala/valid/Lists2.scala   | 2 +-
 .../regression/verification/purescala/valid/Lists3.scala   | 2 +-
 .../regression/verification/purescala/valid/Lists4.scala   | 2 +-
 .../regression/verification/purescala/valid/Lists5.scala   | 2 +-
 .../regression/verification/purescala/valid/Lists6.scala   | 2 +-
 .../verification/purescala/valid/LiteralMaps.scala         | 2 +-
 .../verification/purescala/valid/MapGetOrElse2.scala       | 2 ++
 .../verification/purescala/valid/MapGetPlus.scala          | 2 ++
 .../regression/verification/purescala/valid/MatchExh.scala | 2 ++
 .../regression/verification/purescala/valid/Mean.scala     | 2 +-
 .../verification/purescala/valid/MergeSort.scala           | 2 +-
 .../regression/verification/purescala/valid/Methods.scala  | 2 ++
 .../regression/verification/purescala/valid/Monads1.scala  | 2 +-
 .../regression/verification/purescala/valid/Monads2.scala  | 2 +-
 .../regression/verification/purescala/valid/Monads3.scala  | 2 +-
 .../verification/purescala/valid/Monotonic.scala           | 2 ++
 .../regression/verification/purescala/valid/MyMap.scala    | 2 +-
 .../regression/verification/purescala/valid/MySet.scala    | 2 +-
 .../regression/verification/purescala/valid/MyTuple1.scala | 2 +-
 .../regression/verification/purescala/valid/MyTuple2.scala | 2 +-
 .../regression/verification/purescala/valid/MyTuple3.scala | 2 +-
 .../regression/verification/purescala/valid/MyTuple4.scala | 2 +-
 .../regression/verification/purescala/valid/MyTuple5.scala | 2 +-
 .../regression/verification/purescala/valid/MyTuple6.scala | 2 +-
 .../regression/verification/purescala/valid/Nat.scala      | 2 +-
 .../regression/verification/purescala/valid/Nested1.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested10.scala | 2 +-
 .../regression/verification/purescala/valid/Nested11.scala | 2 +-
 .../regression/verification/purescala/valid/Nested12.scala | 2 +-
 .../regression/verification/purescala/valid/Nested13.scala | 2 +-
 .../regression/verification/purescala/valid/Nested14.scala | 2 +-
 .../regression/verification/purescala/valid/Nested15.scala | 4 +++-
 .../regression/verification/purescala/valid/Nested2.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested3.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested4.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested5.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested6.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested7.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested8.scala  | 2 +-
 .../regression/verification/purescala/valid/Nested9.scala  | 2 +-
 .../verification/purescala/valid/NotEquals.scala           | 2 +-
 .../verification/purescala/valid/Overrides.scala           | 2 ++
 .../verification/purescala/valid/ParBalance.scala          | 2 +-
 .../verification/purescala/valid/PositiveMap.scala         | 2 +-
 .../verification/purescala/valid/PositiveMap2.scala        | 2 ++
 .../verification/purescala/valid/Postcondition.scala       | 2 ++
 .../verification/purescala/valid/PreInSpecs.scala          | 2 ++
 .../verification/purescala/valid/Predicate.scala           | 2 ++
 .../verification/purescala/valid/PropositionalLogic.scala  | 2 +-
 .../verification/purescala/valid/RealDivisionByZero.scala  | 2 ++
 .../verification/purescala/valid/RedBlackTree.scala        | 2 +-
 .../verification/purescala/valid/SearchLinkedList.scala    | 2 +-
 .../regression/verification/purescala/valid/Sets1.scala    | 2 +-
 .../regression/verification/purescala/valid/Sets2.scala    | 2 +-
 .../purescala/valid/SimpleQuantification.scala             | 2 ++
 .../verification/purescala/valid/Subtyping1.scala          | 2 +-
 .../verification/purescala/valid/Subtyping2.scala          | 2 +-
 .../purescala/valid/TransitiveQuantification.scala         | 2 ++
 .../regression/verification/purescala/valid/Trees1.scala   | 2 +-
 .../regression/verification/purescala/valid/Unapply.scala  | 2 ++
 .../regression/verification/purescala/valid/Unit1.scala    | 2 +-
 .../regression/verification/purescala/valid/Unit2.scala    | 2 +-
 .../regression/verification/xlang/invalid/Array1.scala     | 2 +-
 .../regression/verification/xlang/invalid/Array2.scala     | 2 +-
 .../regression/verification/xlang/invalid/Array3.scala     | 2 +-
 .../regression/verification/xlang/invalid/Assert1.scala    | 2 +-
 .../regression/verification/xlang/invalid/Assert2.scala    | 2 +-
 .../regression/verification/xlang/invalid/Asserts2.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon1.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon2.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon3.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon4.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon5.scala   | 2 +-
 .../regression/verification/xlang/invalid/Epsilon6.scala   | 2 +-
 .../regression/verification/xlang/invalid/IfExpr1.scala    | 2 +-
 .../regression/verification/xlang/invalid/IfExpr2.scala    | 2 +-
 .../verification/xlang/invalid/NestedFunState1.scala       | 2 ++
 .../verification/xlang/invalid/NestedFunState2.scala       | 2 +-
 .../regression/verification/xlang/valid/Arithmetic.scala   | 2 +-
 .../regression/verification/xlang/valid/Array1.scala       | 2 +-
 .../regression/verification/xlang/valid/Array2.scala       | 2 +-
 .../regression/verification/xlang/valid/Array3.scala       | 2 +-
 .../regression/verification/xlang/valid/Array4.scala       | 2 +-
 .../regression/verification/xlang/valid/Array5.scala       | 2 +-
 .../regression/verification/xlang/valid/Array6.scala       | 2 +-
 .../regression/verification/xlang/valid/Array7.scala       | 2 +-
 .../regression/verification/xlang/valid/ArrayNested1.scala | 2 ++
 .../regression/verification/xlang/valid/ArrayNested2.scala | 2 ++
 .../regression/verification/xlang/valid/Assert1.scala      | 2 +-
 .../regression/verification/xlang/valid/Assert2.scala      | 2 +-
 .../regression/verification/xlang/valid/Assert3.scala      | 2 +-
 .../regression/verification/xlang/valid/Assign1.scala      | 2 +-
 .../regression/verification/xlang/valid/Epsilon1.scala     | 2 +-
 .../regression/verification/xlang/valid/Epsilon2.scala     | 2 +-
 .../regression/verification/xlang/valid/Epsilon3.scala     | 2 +-
 .../regression/verification/xlang/valid/Epsilon4.scala     | 2 +-
 .../regression/verification/xlang/valid/Epsilon5.scala     | 2 +-
 .../xlang/valid/FunInvocEvaluationOrder1.scala             | 2 ++
 .../xlang/valid/FunInvocEvaluationOrder2.scala             | 2 ++
 .../xlang/valid/FunInvocEvaluationOrder3.scala             | 2 ++
 .../regression/verification/xlang/valid/IfExpr1.scala      | 2 +-
 .../regression/verification/xlang/valid/IfExpr2.scala      | 2 +-
 .../regression/verification/xlang/valid/IfExpr3.scala      | 2 +-
 .../regression/verification/xlang/valid/IfExpr4.scala      | 2 +-
 .../verification/xlang/valid/NestedFunState1.scala         | 2 +-
 .../verification/xlang/valid/NestedFunState2.scala         | 2 +-
 .../verification/xlang/valid/NestedFunState3.scala         | 3 ++-
 .../verification/xlang/valid/NestedFunState4.scala         | 2 ++
 .../verification/xlang/valid/NestedFunState5.scala         | 2 ++
 .../verification/xlang/valid/NestedFunState6.scala         | 2 ++
 .../verification/xlang/valid/NestedFunState7.scala         | 2 ++
 .../regression/verification/xlang/valid/NestedOld1.scala   | 2 ++
 .../regression/verification/xlang/valid/NestedOld2.scala   | 2 ++
 .../regression/verification/xlang/valid/NestedVar.scala    | 2 +-
 .../regression/verification/xlang/valid/Sequencing1.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing2.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing3.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing4.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing5.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing6.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing7.scala  | 2 ++
 .../regression/verification/xlang/valid/Sequencing8.scala  | 2 ++
 .../regression/verification/xlang/valid/ShortCircuit.scala | 2 ++
 .../regression/verification/xlang/valid/While1.scala       | 2 +-
 .../regression/verification/xlang/valid/While2.scala       | 2 +-
 .../regression/verification/xlang/valid/While3.scala       | 2 +-
 .../regression/verification/xlang/valid/WhileAsFun1.scala  | 3 ++-
 .../regression/verification/xlang/valid/WhileAsFun2.scala  | 3 ++-
 .../xlang/valid/WhileConditionSubexpression.scala          | 2 ++
 src/test/resources/regression/xlang/error/Array1.scala     | 2 +-
 .../resources/regression/xlang/error/ArrayAliasing6.scala  | 2 +-
 .../resources/regression/xlang/error/ArrayAliasing8.scala  | 2 +-
 .../resources/regression/xlang/error/ArrayAliasing9.scala  | 2 +-
 src/test/scala/leon/genc/GenCSuite.scala                   | 2 +-
 .../integration/evaluators/CodegenEvaluatorSuite.scala     | 2 +-
 .../scala/leon/integration/evaluators/EvaluatorSuite.scala | 2 +-
 .../scala/leon/integration/purescala/CallGraphSuite.scala  | 2 +-
 .../scala/leon/integration/purescala/DataGenSuite.scala    | 2 +-
 .../scala/leon/integration/purescala/DefOpsSuite.scala     | 2 +-
 .../scala/leon/integration/purescala/ExprOpsSuite.scala    | 2 +-
 .../scala/leon/integration/purescala/InliningSuite.scala   | 2 +-
 .../leon/integration/purescala/SimplifyPathsSuite.scala    | 2 +-
 .../leon/integration/solvers/EnumerationSolverSuite.scala  | 2 +-
 .../scala/leon/integration/solvers/FairZ3SolverTests.scala | 2 +-
 .../leon/integration/solvers/GlobalVariablesSuite.scala    | 2 +-
 .../scala/leon/integration/solvers/LeonSolverSuite.scala   | 2 ++
 .../leon/integration/solvers/ModelEnumerationSuite.scala   | 2 +-
 src/test/scala/leon/integration/solvers/SolversSuite.scala | 2 +-
 .../scala/leon/integration/solvers/StringSolverSuite.scala | 2 ++
 .../leon/integration/solvers/TimeoutSolverSuite.scala      | 2 +-
 .../leon/integration/solvers/UnrollingSolverSuite.scala    | 2 +-
 src/test/scala/leon/isabelle/IsabelleLibrarySuite.scala    | 2 ++
 .../scala/leon/isabelle/IsabelleVerificationSuite.scala    | 2 ++
 .../scala/leon/regression/frontends/FrontEndsSuite.scala   | 2 +-
 .../leon/regression/orb/OrbInstrumentationTestSuite.scala  | 2 +-
 .../scala/leon/regression/orb/OrbRegressionSuite.scala     | 2 +-
 src/test/scala/leon/regression/repair/RepairSuite.scala    | 2 +-
 .../leon/regression/synthesis/StablePrintingSuite.scala    | 2 +-
 .../regression/synthesis/SynthesisRegressionSuite.scala    | 2 +-
 .../scala/leon/regression/synthesis/SynthesisSuite.scala   | 2 +-
 .../leon/regression/termination/TerminationSuite.scala     | 2 +-
 .../scala/leon/regression/testcases/TestCasesCompile.scala | 2 +-
 .../regression/verification/LibraryVerificationSuite.scala | 2 +-
 .../leon/regression/verification/NewSolversSuite.scala     | 2 +-
 .../leon/regression/verification/VerificationSuite.scala   | 2 +-
 .../regression/verification/XLangVerificationSuite.scala   | 2 +-
 .../purescala/PureScalaVerificationSuite.scala             | 2 +-
 src/test/scala/leon/test/LeonRegressionSuite.scala         | 2 +-
 src/test/scala/leon/test/LeonTestSuite.scala               | 2 +-
 src/test/scala/leon/test/LeonTestSuiteWithProgram.scala    | 2 +-
 src/test/scala/leon/test/TestSilentReporter.scala          | 2 +-
 src/test/scala/leon/test/helpers/ExpressionsDSL.scala      | 2 ++
 src/test/scala/leon/test/helpers/WithLikelyEq.scala        | 2 +-
 src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala   | 2 +-
 src/test/scala/leon/unit/purescala/ExprOpsSuite.scala      | 2 +-
 src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala | 2 +-
 .../leon/unit/purescala/TreeNormalizationsSuite.scala      | 2 +-
 src/test/scala/leon/unit/purescala/TreeTestsSuite.scala    | 2 +-
 src/test/scala/leon/unit/purescala/TypeOpsSuite.scala      | 2 +-
 src/test/scala/leon/unit/solvers/SolverPoolSuite.scala     | 2 +-
 src/test/scala/leon/unit/synthesis/AlgebraSuite.scala      | 2 +-
 .../scala/leon/unit/synthesis/LinearEquationsSuite.scala   | 2 +-
 src/test/scala/leon/unit/utils/GraphsSuite.scala           | 2 +-
 src/test/scala/leon/unit/utils/StreamsSuite.scala          | 2 +-
 src/test/scala/leon/unit/utils/UtilsSuite.scala            | 2 +-
 867 files changed, 1127 insertions(+), 627 deletions(-)
 mode change 100755 => 100644 src/test/resources/regression/orb/depth/BinaryTrie.scala
 mode change 100755 => 100644 src/test/resources/regression/orb/depth/Folds.scala
 mode change 100755 => 100644 src/test/resources/regression/orb/numerical/SimpleLoop.scala

diff --git a/library/annotation/isabelle.scala b/library/annotation/isabelle.scala
index bfb4b39ec..db1c94cdc 100644
--- a/library/annotation/isabelle.scala
+++ b/library/annotation/isabelle.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.annotation
 
 import scala.annotation.StaticAnnotation
diff --git a/library/annotation/package.scala b/library/annotation/package.scala
index 0e844188f..fc4012a94 100644
--- a/library/annotation/package.scala
+++ b/library/annotation/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/collection/List.scala b/library/collection/List.scala
index 74a0f0c66..69c30d39f 100644
--- a/library/collection/List.scala
+++ b/library/collection/List.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.collection
 
diff --git a/library/collection/package.scala b/library/collection/package.scala
index 8a5ae1707..db83501a2 100644
--- a/library/collection/package.scala
+++ b/library/collection/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/instrumentation/package.scala b/library/instrumentation/package.scala
index a6e7545c0..dc8ee71bd 100644
--- a/library/instrumentation/package.scala
+++ b/library/instrumentation/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/invariant/package.scala b/library/invariant/package.scala
index 0cc7919d0..e6534f423 100644
--- a/library/invariant/package.scala
+++ b/library/invariant/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/lang/Dummy.scala b/library/lang/Dummy.scala
index 41dbe4f90..9c8811796 100644
--- a/library/lang/Dummy.scala
+++ b/library/lang/Dummy.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang
 
 case class Dummy[T]()
diff --git a/library/lang/Either.scala b/library/lang/Either.scala
index 9cc2ea4e9..67caad70d 100644
--- a/library/lang/Either.scala
+++ b/library/lang/Either.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang
 
diff --git a/library/lang/Map.scala b/library/lang/Map.scala
index aff6f26f8..2a08449cc 100644
--- a/library/lang/Map.scala
+++ b/library/lang/Map.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang
 import leon.annotation._
 
diff --git a/library/lang/Option.scala b/library/lang/Option.scala
index a6f09db68..b1fed6d4d 100644
--- a/library/lang/Option.scala
+++ b/library/lang/Option.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang
 
diff --git a/library/lang/Rational.scala b/library/lang/Rational.scala
index fcdb64cc1..4699f08be 100644
--- a/library/lang/Rational.scala
+++ b/library/lang/Rational.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang
 
diff --git a/library/lang/Real.scala b/library/lang/Real.scala
index 9d600b3b6..450cfb246 100644
--- a/library/lang/Real.scala
+++ b/library/lang/Real.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang
 import leon.annotation._
 
diff --git a/library/lang/Set.scala b/library/lang/Set.scala
index 8f4595d33..d27fd18bb 100644
--- a/library/lang/Set.scala
+++ b/library/lang/Set.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang
 import leon.annotation._
 
diff --git a/library/lang/StrOps.scala b/library/lang/StrOps.scala
index 723ce5be8..6628fdd55 100644
--- a/library/lang/StrOps.scala
+++ b/library/lang/StrOps.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang
 
 import leon.annotation._
diff --git a/library/lang/package.scala b/library/lang/package.scala
index ab713a588..6da0ba224 100644
--- a/library/lang/package.scala
+++ b/library/lang/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/lang/synthesis/Oracle.scala b/library/lang/synthesis/Oracle.scala
index 7af697638..399b52b8d 100644
--- a/library/lang/synthesis/Oracle.scala
+++ b/library/lang/synthesis/Oracle.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang.synthesis
 
diff --git a/library/lang/synthesis/package.scala b/library/lang/synthesis/package.scala
index cb5699279..07635f1a6 100644
--- a/library/lang/synthesis/package.scala
+++ b/library/lang/synthesis/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang
 
diff --git a/library/lang/xlang/package.scala b/library/lang/xlang/package.scala
index 75efd0103..c394f9508 100644
--- a/library/lang/xlang/package.scala
+++ b/library/lang/xlang/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.lang
 
diff --git a/library/math/package.scala b/library/math/package.scala
index 8eb5f3479..51fe7fdb2 100644
--- a/library/math/package.scala
+++ b/library/math/package.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 import leon.annotation._
 
diff --git a/library/monads/state/State.scala b/library/monads/state/State.scala
index ad47c2464..7bb12881c 100644
--- a/library/monads/state/State.scala
+++ b/library/monads/state/State.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.monads.state
 
 import leon.collection._
diff --git a/library/par/package.scala b/library/par/package.scala
index 5842210fc..1c542dd48 100644
--- a/library/par/package.scala
+++ b/library/par/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/library/proof/Internal.scala b/library/proof/Internal.scala
index 0962c371c..5dcd34867 100644
--- a/library/proof/Internal.scala
+++ b/library/proof/Internal.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 package leon.proof
 
 import leon.lang._
diff --git a/library/proof/package.scala b/library/proof/package.scala
index 3f0978649..46ac15883 100644
--- a/library/proof/package.scala
+++ b/library/proof/package.scala
@@ -1,4 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 
 import leon.annotation._
diff --git a/scripts/applyLicense.sh b/scripts/applyLicense.sh
index f949a4bec..781901c5c 100755
--- a/scripts/applyLicense.sh
+++ b/scripts/applyLicense.sh
@@ -1,4 +1,4 @@
-printf "/* Copyright 2009-2015 EPFL, Lausanne */\n\n" > /tmp/Leon-license
+printf "/* Copyright 2009-2016 EPFL, Lausanne */\n\n" > /tmp/Leon-license
 
 for f in $(find {src,library} -name "*.java" -o -name "*.scala") ;do
   if [ -f $f ]; then
diff --git a/src/main/java/leon/codegen/runtime/ArrayBox.java b/src/main/java/leon/codegen/runtime/ArrayBox.java
index b4dee4255..0da4e64ca 100644
--- a/src/main/java/leon/codegen/runtime/ArrayBox.java
+++ b/src/main/java/leon/codegen/runtime/ArrayBox.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/BigInt.java b/src/main/java/leon/codegen/runtime/BigInt.java
index f2b99a6d9..c4e3412b3 100644
--- a/src/main/java/leon/codegen/runtime/BigInt.java
+++ b/src/main/java/leon/codegen/runtime/BigInt.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/CaseClass.java b/src/main/java/leon/codegen/runtime/CaseClass.java
index 9f159b7e2..aeeb14a1b 100644
--- a/src/main/java/leon/codegen/runtime/CaseClass.java
+++ b/src/main/java/leon/codegen/runtime/CaseClass.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/Lambda.java b/src/main/java/leon/codegen/runtime/Lambda.java
index a6abbef37..edb740d48 100644
--- a/src/main/java/leon/codegen/runtime/Lambda.java
+++ b/src/main/java/leon/codegen/runtime/Lambda.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/LeonCodeGenEvaluationException.java b/src/main/java/leon/codegen/runtime/LeonCodeGenEvaluationException.java
index 775616596..69da9c5ea 100644
--- a/src/main/java/leon/codegen/runtime/LeonCodeGenEvaluationException.java
+++ b/src/main/java/leon/codegen/runtime/LeonCodeGenEvaluationException.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeException.java b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeException.java
index 77d05d97d..63abf63a5 100644
--- a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeException.java
+++ b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeException.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeHashing.java b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeHashing.java
index b3f21df76..feb40c3bd 100644
--- a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeHashing.java
+++ b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeHashing.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeMonitor.java b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeMonitor.java
index c289a6bea..c89d49705 100644
--- a/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeMonitor.java
+++ b/src/main/java/leon/codegen/runtime/LeonCodeGenRuntimeMonitor.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/Map.java b/src/main/java/leon/codegen/runtime/Map.java
index 000cc073b..19c94b4c2 100644
--- a/src/main/java/leon/codegen/runtime/Map.java
+++ b/src/main/java/leon/codegen/runtime/Map.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/Rational.java b/src/main/java/leon/codegen/runtime/Rational.java
index fc409434b..2d09905d4 100644
--- a/src/main/java/leon/codegen/runtime/Rational.java
+++ b/src/main/java/leon/codegen/runtime/Rational.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/Real.java b/src/main/java/leon/codegen/runtime/Real.java
index 9d80935eb..84aefb241 100644
--- a/src/main/java/leon/codegen/runtime/Real.java
+++ b/src/main/java/leon/codegen/runtime/Real.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/Set.java b/src/main/java/leon/codegen/runtime/Set.java
index 522dbe658..42cadce43 100644
--- a/src/main/java/leon/codegen/runtime/Set.java
+++ b/src/main/java/leon/codegen/runtime/Set.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/java/leon/codegen/runtime/StrOps.java b/src/main/java/leon/codegen/runtime/StrOps.java
index 34abc12d7..0c258b3cb 100644
--- a/src/main/java/leon/codegen/runtime/StrOps.java
+++ b/src/main/java/leon/codegen/runtime/StrOps.java
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.codegen.runtime;
 
 import org.apache.commons.lang3.StringEscapeUtils;
diff --git a/src/main/java/leon/codegen/runtime/Tuple.java b/src/main/java/leon/codegen/runtime/Tuple.java
index 3b72931da..0b0405f04 100644
--- a/src/main/java/leon/codegen/runtime/Tuple.java
+++ b/src/main/java/leon/codegen/runtime/Tuple.java
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime;
 
diff --git a/src/main/scala/leon/GlobalOptions.scala b/src/main/scala/leon/GlobalOptions.scala
index 4973852c2..63648ca33 100644
--- a/src/main/scala/leon/GlobalOptions.scala
+++ b/src/main/scala/leon/GlobalOptions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/LeonComponent.scala b/src/main/scala/leon/LeonComponent.scala
index 74a8865a8..0b33fde09 100644
--- a/src/main/scala/leon/LeonComponent.scala
+++ b/src/main/scala/leon/LeonComponent.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/LeonContext.scala b/src/main/scala/leon/LeonContext.scala
index 229891418..f46e53d04 100644
--- a/src/main/scala/leon/LeonContext.scala
+++ b/src/main/scala/leon/LeonContext.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/LeonExceptions.scala b/src/main/scala/leon/LeonExceptions.scala
index eeaadd09a..ad526d782 100644
--- a/src/main/scala/leon/LeonExceptions.scala
+++ b/src/main/scala/leon/LeonExceptions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/LeonOption.scala b/src/main/scala/leon/LeonOption.scala
index f079399f9..642092d0f 100644
--- a/src/main/scala/leon/LeonOption.scala
+++ b/src/main/scala/leon/LeonOption.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/LeonPhase.scala b/src/main/scala/leon/LeonPhase.scala
index ea8c25316..92ab88473 100644
--- a/src/main/scala/leon/LeonPhase.scala
+++ b/src/main/scala/leon/LeonPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/Main.scala b/src/main/scala/leon/Main.scala
index f8cfa690e..a29fb8721 100644
--- a/src/main/scala/leon/Main.scala
+++ b/src/main/scala/leon/Main.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/Pipeline.scala b/src/main/scala/leon/Pipeline.scala
index 24875b4a6..de3800ca7 100644
--- a/src/main/scala/leon/Pipeline.scala
+++ b/src/main/scala/leon/Pipeline.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/Printable.scala b/src/main/scala/leon/Printable.scala
index cbe2e8ed9..e55272e57 100644
--- a/src/main/scala/leon/Printable.scala
+++ b/src/main/scala/leon/Printable.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/Reporter.scala b/src/main/scala/leon/Reporter.scala
index 5013809fb..7330ca605 100644
--- a/src/main/scala/leon/Reporter.scala
+++ b/src/main/scala/leon/Reporter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/codegen/CodeGenParams.scala b/src/main/scala/leon/codegen/CodeGenParams.scala
index be0bf64b5..ff9962765 100644
--- a/src/main/scala/leon/codegen/CodeGenParams.scala
+++ b/src/main/scala/leon/codegen/CodeGenParams.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen
diff --git a/src/main/scala/leon/codegen/CodeGeneration.scala b/src/main/scala/leon/codegen/CodeGeneration.scala
index a33ec69e5..0e2a3fe23 100644
--- a/src/main/scala/leon/codegen/CodeGeneration.scala
+++ b/src/main/scala/leon/codegen/CodeGeneration.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen
diff --git a/src/main/scala/leon/codegen/CompilationException.scala b/src/main/scala/leon/codegen/CompilationException.scala
index 9cb392ce8..a782e5c1f 100644
--- a/src/main/scala/leon/codegen/CompilationException.scala
+++ b/src/main/scala/leon/codegen/CompilationException.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen
diff --git a/src/main/scala/leon/codegen/CompilationUnit.scala b/src/main/scala/leon/codegen/CompilationUnit.scala
index 9cef8cd04..1bc3600fb 100644
--- a/src/main/scala/leon/codegen/CompilationUnit.scala
+++ b/src/main/scala/leon/codegen/CompilationUnit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen
diff --git a/src/main/scala/leon/codegen/CompiledExpression.scala b/src/main/scala/leon/codegen/CompiledExpression.scala
index 6467a2068..d6cb9a11e 100644
--- a/src/main/scala/leon/codegen/CompiledExpression.scala
+++ b/src/main/scala/leon/codegen/CompiledExpression.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen
diff --git a/src/main/scala/leon/codegen/runtime/GenericValues.scala b/src/main/scala/leon/codegen/runtime/GenericValues.scala
index 710371fea..58ecf8547 100644
--- a/src/main/scala/leon/codegen/runtime/GenericValues.scala
+++ b/src/main/scala/leon/codegen/runtime/GenericValues.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package codegen.runtime
diff --git a/src/main/scala/leon/codegen/runtime/RuntimeResources.scala b/src/main/scala/leon/codegen/runtime/RuntimeResources.scala
index 38c5bbaa1..f18f23b3f 100644
--- a/src/main/scala/leon/codegen/runtime/RuntimeResources.scala
+++ b/src/main/scala/leon/codegen/runtime/RuntimeResources.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.codegen.runtime
 
diff --git a/src/main/scala/leon/datagen/DataGenerator.scala b/src/main/scala/leon/datagen/DataGenerator.scala
index f2c1193f0..ea6aac313 100644
--- a/src/main/scala/leon/datagen/DataGenerator.scala
+++ b/src/main/scala/leon/datagen/DataGenerator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package datagen
diff --git a/src/main/scala/leon/datagen/GrammarDataGen.scala b/src/main/scala/leon/datagen/GrammarDataGen.scala
index 04541e78a..22cf17f6e 100644
--- a/src/main/scala/leon/datagen/GrammarDataGen.scala
+++ b/src/main/scala/leon/datagen/GrammarDataGen.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package datagen
diff --git a/src/main/scala/leon/datagen/NaiveDataGen.scala b/src/main/scala/leon/datagen/NaiveDataGen.scala
index 121c42b8c..e40359e68 100644
--- a/src/main/scala/leon/datagen/NaiveDataGen.scala
+++ b/src/main/scala/leon/datagen/NaiveDataGen.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package datagen
diff --git a/src/main/scala/leon/datagen/SolverDataGen.scala b/src/main/scala/leon/datagen/SolverDataGen.scala
index 3b20e3e35..3a222bd6b 100644
--- a/src/main/scala/leon/datagen/SolverDataGen.scala
+++ b/src/main/scala/leon/datagen/SolverDataGen.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package datagen
diff --git a/src/main/scala/leon/datagen/VanuatooDataGen.scala b/src/main/scala/leon/datagen/VanuatooDataGen.scala
index 197540050..0b533e631 100644
--- a/src/main/scala/leon/datagen/VanuatooDataGen.scala
+++ b/src/main/scala/leon/datagen/VanuatooDataGen.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package datagen
diff --git a/src/main/scala/leon/evaluators/AngelicEvaluator.scala b/src/main/scala/leon/evaluators/AngelicEvaluator.scala
index 57f233cf4..8230aa858 100644
--- a/src/main/scala/leon/evaluators/AngelicEvaluator.scala
+++ b/src/main/scala/leon/evaluators/AngelicEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
index 59e9be418..8521094fa 100644
--- a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
+++ b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/ContextualEvaluator.scala b/src/main/scala/leon/evaluators/ContextualEvaluator.scala
index 51205fc5c..90d1ac970 100644
--- a/src/main/scala/leon/evaluators/ContextualEvaluator.scala
+++ b/src/main/scala/leon/evaluators/ContextualEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/DefaultEvaluator.scala b/src/main/scala/leon/evaluators/DefaultEvaluator.scala
index 985b29885..b62446c8d 100644
--- a/src/main/scala/leon/evaluators/DefaultEvaluator.scala
+++ b/src/main/scala/leon/evaluators/DefaultEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/DualEvaluator.scala b/src/main/scala/leon/evaluators/DualEvaluator.scala
index 7976dbfc2..a59559185 100644
--- a/src/main/scala/leon/evaluators/DualEvaluator.scala
+++ b/src/main/scala/leon/evaluators/DualEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/EvaluationPhase.scala b/src/main/scala/leon/evaluators/EvaluationPhase.scala
index 79ae30a5b..a06d1b39a 100644
--- a/src/main/scala/leon/evaluators/EvaluationPhase.scala
+++ b/src/main/scala/leon/evaluators/EvaluationPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/EvaluationResults.scala b/src/main/scala/leon/evaluators/EvaluationResults.scala
index b9cbecdde..f7da29504 100644
--- a/src/main/scala/leon/evaluators/EvaluationResults.scala
+++ b/src/main/scala/leon/evaluators/EvaluationResults.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/Evaluator.scala b/src/main/scala/leon/evaluators/Evaluator.scala
index 400409577..a15febb65 100644
--- a/src/main/scala/leon/evaluators/Evaluator.scala
+++ b/src/main/scala/leon/evaluators/Evaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/EvaluatorContexts.scala b/src/main/scala/leon/evaluators/EvaluatorContexts.scala
index a63ee6483..859e960d5 100644
--- a/src/main/scala/leon/evaluators/EvaluatorContexts.scala
+++ b/src/main/scala/leon/evaluators/EvaluatorContexts.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/RecursiveEvaluator.scala b/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
index b101f9de4..f752b1895 100644
--- a/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
+++ b/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/ScalacEvaluator.scala b/src/main/scala/leon/evaluators/ScalacEvaluator.scala
index 63bb9f6fa..db855fbcd 100644
--- a/src/main/scala/leon/evaluators/ScalacEvaluator.scala
+++ b/src/main/scala/leon/evaluators/ScalacEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/StreamEvaluator.scala b/src/main/scala/leon/evaluators/StreamEvaluator.scala
index 3fff6e523..16d42e892 100644
--- a/src/main/scala/leon/evaluators/StreamEvaluator.scala
+++ b/src/main/scala/leon/evaluators/StreamEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/evaluators/TracingEvaluator.scala b/src/main/scala/leon/evaluators/TracingEvaluator.scala
index 4c0b1f39c..4c9f81f2f 100644
--- a/src/main/scala/leon/evaluators/TracingEvaluator.scala
+++ b/src/main/scala/leon/evaluators/TracingEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package evaluators
diff --git a/src/main/scala/leon/frontends/scalac/ASTExtractors.scala b/src/main/scala/leon/frontends/scalac/ASTExtractors.scala
index b0885825c..cdbfc205c 100644
--- a/src/main/scala/leon/frontends/scalac/ASTExtractors.scala
+++ b/src/main/scala/leon/frontends/scalac/ASTExtractors.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/ClassgenPhase.scala b/src/main/scala/leon/frontends/scalac/ClassgenPhase.scala
index 959028bf4..c7f5823ae 100644
--- a/src/main/scala/leon/frontends/scalac/ClassgenPhase.scala
+++ b/src/main/scala/leon/frontends/scalac/ClassgenPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
index 65ea83c7f..497cbb4f9 100644
--- a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
+++ b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/ExtractionPhase.scala b/src/main/scala/leon/frontends/scalac/ExtractionPhase.scala
index ffb4fa90c..3a338b9f0 100644
--- a/src/main/scala/leon/frontends/scalac/ExtractionPhase.scala
+++ b/src/main/scala/leon/frontends/scalac/ExtractionPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/FullScalaCompiler.scala b/src/main/scala/leon/frontends/scalac/FullScalaCompiler.scala
index 2ae74e202..72e98e015 100644
--- a/src/main/scala/leon/frontends/scalac/FullScalaCompiler.scala
+++ b/src/main/scala/leon/frontends/scalac/FullScalaCompiler.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/LeonExtraction.scala b/src/main/scala/leon/frontends/scalac/LeonExtraction.scala
index 3bc1a0d05..10ca2cb97 100644
--- a/src/main/scala/leon/frontends/scalac/LeonExtraction.scala
+++ b/src/main/scala/leon/frontends/scalac/LeonExtraction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/SaveImports.scala b/src/main/scala/leon/frontends/scalac/SaveImports.scala
index b9e557ff7..bed944f38 100644
--- a/src/main/scala/leon/frontends/scalac/SaveImports.scala
+++ b/src/main/scala/leon/frontends/scalac/SaveImports.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/ScalaCompiler.scala b/src/main/scala/leon/frontends/scalac/ScalaCompiler.scala
index a98bd86fb..0ae89a463 100644
--- a/src/main/scala/leon/frontends/scalac/ScalaCompiler.scala
+++ b/src/main/scala/leon/frontends/scalac/ScalaCompiler.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/frontends/scalac/SimpleReporter.scala b/src/main/scala/leon/frontends/scalac/SimpleReporter.scala
index c203ee63c..79a3495c6 100644
--- a/src/main/scala/leon/frontends/scalac/SimpleReporter.scala
+++ b/src/main/scala/leon/frontends/scalac/SimpleReporter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package frontends.scalac
diff --git a/src/main/scala/leon/genc/CAST.scala b/src/main/scala/leon/genc/CAST.scala
index 9a9242859..a05f3beb9 100644
--- a/src/main/scala/leon/genc/CAST.scala
+++ b/src/main/scala/leon/genc/CAST.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/genc/CConverter.scala b/src/main/scala/leon/genc/CConverter.scala
index e7795adbe..ea3130d4c 100644
--- a/src/main/scala/leon/genc/CConverter.scala
+++ b/src/main/scala/leon/genc/CConverter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/genc/CFileOutputPhase.scala b/src/main/scala/leon/genc/CFileOutputPhase.scala
index f2b779718..2e687e0b7 100644
--- a/src/main/scala/leon/genc/CFileOutputPhase.scala
+++ b/src/main/scala/leon/genc/CFileOutputPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/genc/CPrinter.scala b/src/main/scala/leon/genc/CPrinter.scala
index eec404f0c..9c38fcf81 100644
--- a/src/main/scala/leon/genc/CPrinter.scala
+++ b/src/main/scala/leon/genc/CPrinter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/genc/CPrinterHelper.scala b/src/main/scala/leon/genc/CPrinterHelper.scala
index 5c32df8b7..a173aa24b 100644
--- a/src/main/scala/leon/genc/CPrinterHelper.scala
+++ b/src/main/scala/leon/genc/CPrinterHelper.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/genc/GenerateCPhase.scala b/src/main/scala/leon/genc/GenerateCPhase.scala
index c30d32274..2d66adbc9 100644
--- a/src/main/scala/leon/genc/GenerateCPhase.scala
+++ b/src/main/scala/leon/genc/GenerateCPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/main/scala/leon/grammars/BaseGrammar.scala b/src/main/scala/leon/grammars/BaseGrammar.scala
index e7acd8279..b10b5a92a 100644
--- a/src/main/scala/leon/grammars/BaseGrammar.scala
+++ b/src/main/scala/leon/grammars/BaseGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/Constants.scala b/src/main/scala/leon/grammars/Constants.scala
index 81c553460..5decc853c 100644
--- a/src/main/scala/leon/grammars/Constants.scala
+++ b/src/main/scala/leon/grammars/Constants.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/Empty.scala b/src/main/scala/leon/grammars/Empty.scala
index 737f9cdf3..ebf35ab52 100644
--- a/src/main/scala/leon/grammars/Empty.scala
+++ b/src/main/scala/leon/grammars/Empty.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/EqualityGrammar.scala b/src/main/scala/leon/grammars/EqualityGrammar.scala
index a2f9c4136..2120fdde0 100644
--- a/src/main/scala/leon/grammars/EqualityGrammar.scala
+++ b/src/main/scala/leon/grammars/EqualityGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/ExpressionGrammar.scala b/src/main/scala/leon/grammars/ExpressionGrammar.scala
index 1c1feaa64..3e3d3c898 100644
--- a/src/main/scala/leon/grammars/ExpressionGrammar.scala
+++ b/src/main/scala/leon/grammars/ExpressionGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/FunctionCalls.scala b/src/main/scala/leon/grammars/FunctionCalls.scala
index 65836341e..27d9c5197 100644
--- a/src/main/scala/leon/grammars/FunctionCalls.scala
+++ b/src/main/scala/leon/grammars/FunctionCalls.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/Grammars.scala b/src/main/scala/leon/grammars/Grammars.scala
index 1a9fb92dd..762ea5325 100644
--- a/src/main/scala/leon/grammars/Grammars.scala
+++ b/src/main/scala/leon/grammars/Grammars.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/NonTerminal.scala b/src/main/scala/leon/grammars/NonTerminal.scala
index 600189ffa..c57283f26 100644
--- a/src/main/scala/leon/grammars/NonTerminal.scala
+++ b/src/main/scala/leon/grammars/NonTerminal.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/OneOf.scala b/src/main/scala/leon/grammars/OneOf.scala
index 76bd6434a..3e77de8fa 100644
--- a/src/main/scala/leon/grammars/OneOf.scala
+++ b/src/main/scala/leon/grammars/OneOf.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/ProductionRule.scala b/src/main/scala/leon/grammars/ProductionRule.scala
index 5b97beeff..ad7404847 100644
--- a/src/main/scala/leon/grammars/ProductionRule.scala
+++ b/src/main/scala/leon/grammars/ProductionRule.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/SafeRecursiveCalls.scala b/src/main/scala/leon/grammars/SafeRecursiveCalls.scala
index b00d490fb..858cc6efc 100644
--- a/src/main/scala/leon/grammars/SafeRecursiveCalls.scala
+++ b/src/main/scala/leon/grammars/SafeRecursiveCalls.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/SimilarTo.scala b/src/main/scala/leon/grammars/SimilarTo.scala
index 3a7708e9a..4d2ee3f45 100644
--- a/src/main/scala/leon/grammars/SimilarTo.scala
+++ b/src/main/scala/leon/grammars/SimilarTo.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/Tags.scala b/src/main/scala/leon/grammars/Tags.scala
index 4a6b6fca4..3686fd462 100644
--- a/src/main/scala/leon/grammars/Tags.scala
+++ b/src/main/scala/leon/grammars/Tags.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/ValueGrammar.scala b/src/main/scala/leon/grammars/ValueGrammar.scala
index d3c422017..c97ed9a14 100644
--- a/src/main/scala/leon/grammars/ValueGrammar.scala
+++ b/src/main/scala/leon/grammars/ValueGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/transformers/DepthBoundedGrammar.scala b/src/main/scala/leon/grammars/transformers/DepthBoundedGrammar.scala
index 80e2c2c5c..10a7f314c 100644
--- a/src/main/scala/leon/grammars/transformers/DepthBoundedGrammar.scala
+++ b/src/main/scala/leon/grammars/transformers/DepthBoundedGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/transformers/EmbeddedGrammar.scala b/src/main/scala/leon/grammars/transformers/EmbeddedGrammar.scala
index f81474d80..cb5bff3f5 100644
--- a/src/main/scala/leon/grammars/transformers/EmbeddedGrammar.scala
+++ b/src/main/scala/leon/grammars/transformers/EmbeddedGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/transformers/SizeBoundedGrammar.scala b/src/main/scala/leon/grammars/transformers/SizeBoundedGrammar.scala
index f71608603..b506ac82b 100644
--- a/src/main/scala/leon/grammars/transformers/SizeBoundedGrammar.scala
+++ b/src/main/scala/leon/grammars/transformers/SizeBoundedGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/transformers/TaggedGrammar.scala b/src/main/scala/leon/grammars/transformers/TaggedGrammar.scala
index 70e14d1f8..2d0d73fd3 100644
--- a/src/main/scala/leon/grammars/transformers/TaggedGrammar.scala
+++ b/src/main/scala/leon/grammars/transformers/TaggedGrammar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/grammars/transformers/Union.scala b/src/main/scala/leon/grammars/transformers/Union.scala
index 471625ac3..ab61004fa 100644
--- a/src/main/scala/leon/grammars/transformers/Union.scala
+++ b/src/main/scala/leon/grammars/transformers/Union.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package grammars
diff --git a/src/main/scala/leon/invariant/datastructure/DisjointSets.scala b/src/main/scala/leon/invariant/datastructure/DisjointSets.scala
index 003bb31d1..d9bb73e39 100644
--- a/src/main/scala/leon/invariant/datastructure/DisjointSets.scala
+++ b/src/main/scala/leon/invariant/datastructure/DisjointSets.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.datastructure
 
diff --git a/src/main/scala/leon/invariant/datastructure/Graph.scala b/src/main/scala/leon/invariant/datastructure/Graph.scala
index e8c8a7296..8af783f52 100644
--- a/src/main/scala/leon/invariant/datastructure/Graph.scala
+++ b/src/main/scala/leon/invariant/datastructure/Graph.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.datastructure
 
diff --git a/src/main/scala/leon/invariant/datastructure/Maps.scala b/src/main/scala/leon/invariant/datastructure/Maps.scala
index ca2dcb98e..7bd237a74 100644
--- a/src/main/scala/leon/invariant/datastructure/Maps.scala
+++ b/src/main/scala/leon/invariant/datastructure/Maps.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.datastructure
 
diff --git a/src/main/scala/leon/invariant/engine/CompositionalTimeBoundSolver.scala b/src/main/scala/leon/invariant/engine/CompositionalTimeBoundSolver.scala
index 1992607fa..e35ab42fb 100644
--- a/src/main/scala/leon/invariant/engine/CompositionalTimeBoundSolver.scala
+++ b/src/main/scala/leon/invariant/engine/CompositionalTimeBoundSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/ConstraintTracker.scala b/src/main/scala/leon/invariant/engine/ConstraintTracker.scala
index 6c7d1e2ec..488ce7e3a 100644
--- a/src/main/scala/leon/invariant/engine/ConstraintTracker.scala
+++ b/src/main/scala/leon/invariant/engine/ConstraintTracker.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/InferInvariantsPhase.scala b/src/main/scala/leon/invariant/engine/InferInvariantsPhase.scala
index 78fc476dd..e6c62ee93 100644
--- a/src/main/scala/leon/invariant/engine/InferInvariantsPhase.scala
+++ b/src/main/scala/leon/invariant/engine/InferInvariantsPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/InferenceContext.scala b/src/main/scala/leon/invariant/engine/InferenceContext.scala
index 904ae7728..fa7b78c16 100644
--- a/src/main/scala/leon/invariant/engine/InferenceContext.scala
+++ b/src/main/scala/leon/invariant/engine/InferenceContext.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/InferenceEngine.scala b/src/main/scala/leon/invariant/engine/InferenceEngine.scala
index 3e7f2fa3f..ff7c2ab11 100644
--- a/src/main/scala/leon/invariant/engine/InferenceEngine.scala
+++ b/src/main/scala/leon/invariant/engine/InferenceEngine.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/InferenceReport.scala b/src/main/scala/leon/invariant/engine/InferenceReport.scala
index 4b0fb349f..b782aa5e0 100644
--- a/src/main/scala/leon/invariant/engine/InferenceReport.scala
+++ b/src/main/scala/leon/invariant/engine/InferenceReport.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package invariant.engine
diff --git a/src/main/scala/leon/invariant/engine/RefinementEngine.scala b/src/main/scala/leon/invariant/engine/RefinementEngine.scala
index 9502cefad..3d849ac46 100644
--- a/src/main/scala/leon/invariant/engine/RefinementEngine.scala
+++ b/src/main/scala/leon/invariant/engine/RefinementEngine.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/SpecInstantiator.scala b/src/main/scala/leon/invariant/engine/SpecInstantiator.scala
index 1398270d0..dfd5292f4 100644
--- a/src/main/scala/leon/invariant/engine/SpecInstantiator.scala
+++ b/src/main/scala/leon/invariant/engine/SpecInstantiator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 import z3.scala._
diff --git a/src/main/scala/leon/invariant/engine/TemplateEnumerator.scala b/src/main/scala/leon/invariant/engine/TemplateEnumerator.scala
index 1e717dbc1..e830d91b2 100644
--- a/src/main/scala/leon/invariant/engine/TemplateEnumerator.scala
+++ b/src/main/scala/leon/invariant/engine/TemplateEnumerator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/engine/UnfoldingTemplateSolver.scala b/src/main/scala/leon/invariant/engine/UnfoldingTemplateSolver.scala
index 15063dd35..7634da75a 100644
--- a/src/main/scala/leon/invariant/engine/UnfoldingTemplateSolver.scala
+++ b/src/main/scala/leon/invariant/engine/UnfoldingTemplateSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.engine
 
diff --git a/src/main/scala/leon/invariant/factories/AxiomFactory.scala b/src/main/scala/leon/invariant/factories/AxiomFactory.scala
index ebc33562c..126e3d1db 100644
--- a/src/main/scala/leon/invariant/factories/AxiomFactory.scala
+++ b/src/main/scala/leon/invariant/factories/AxiomFactory.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.factories
 
diff --git a/src/main/scala/leon/invariant/factories/TemplateFactory.scala b/src/main/scala/leon/invariant/factories/TemplateFactory.scala
index ea0f0c633..c57f279fc 100644
--- a/src/main/scala/leon/invariant/factories/TemplateFactory.scala
+++ b/src/main/scala/leon/invariant/factories/TemplateFactory.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.factories
 
diff --git a/src/main/scala/leon/invariant/factories/TemplateInstantiator.scala b/src/main/scala/leon/invariant/factories/TemplateInstantiator.scala
index dc7caf9b3..ea810b828 100644
--- a/src/main/scala/leon/invariant/factories/TemplateInstantiator.scala
+++ b/src/main/scala/leon/invariant/factories/TemplateInstantiator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.factories
 
diff --git a/src/main/scala/leon/invariant/factories/TemplateSolverFactory.scala b/src/main/scala/leon/invariant/factories/TemplateSolverFactory.scala
index 96c8d212a..888c579bf 100644
--- a/src/main/scala/leon/invariant/factories/TemplateSolverFactory.scala
+++ b/src/main/scala/leon/invariant/factories/TemplateSolverFactory.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.factories
 
diff --git a/src/main/scala/leon/invariant/structure/Constraint.scala b/src/main/scala/leon/invariant/structure/Constraint.scala
index 513bfd968..e55481b35 100644
--- a/src/main/scala/leon/invariant/structure/Constraint.scala
+++ b/src/main/scala/leon/invariant/structure/Constraint.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.structure
 
diff --git a/src/main/scala/leon/invariant/structure/Formula.scala b/src/main/scala/leon/invariant/structure/Formula.scala
index 588cf86ea..da56f3a8e 100644
--- a/src/main/scala/leon/invariant/structure/Formula.scala
+++ b/src/main/scala/leon/invariant/structure/Formula.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.structure
 
diff --git a/src/main/scala/leon/invariant/structure/FunctionUtils.scala b/src/main/scala/leon/invariant/structure/FunctionUtils.scala
index ccee2b16f..3d5601689 100644
--- a/src/main/scala/leon/invariant/structure/FunctionUtils.scala
+++ b/src/main/scala/leon/invariant/structure/FunctionUtils.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.structure
 
diff --git a/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala b/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
index aee689be4..ee95d67c7 100644
--- a/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
+++ b/src/main/scala/leon/invariant/structure/LinearConstraintUtil.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.structure
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/CegisSolver.scala b/src/main/scala/leon/invariant/templateSolvers/CegisSolver.scala
index a3eca287b..a08e4fef0 100644
--- a/src/main/scala/leon/invariant/templateSolvers/CegisSolver.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/CegisSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/ExtendedUFSolver.scala b/src/main/scala/leon/invariant/templateSolvers/ExtendedUFSolver.scala
index 9a9c1b0b4..f81d340c7 100644
--- a/src/main/scala/leon/invariant/templateSolvers/ExtendedUFSolver.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/ExtendedUFSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package invariant.templateSolvers
diff --git a/src/main/scala/leon/invariant/templateSolvers/FarkasLemmaSolver.scala b/src/main/scala/leon/invariant/templateSolvers/FarkasLemmaSolver.scala
index 62eabca92..4964c9666 100644
--- a/src/main/scala/leon/invariant/templateSolvers/FarkasLemmaSolver.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/FarkasLemmaSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolver.scala b/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolver.scala
index f0da67891..7a5dd39a9 100644
--- a/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolver.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolverWithMult.scala b/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolverWithMult.scala
index 40ecbf14c..787463301 100644
--- a/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolverWithMult.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/NLTemplateSolverWithMult.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/TemplateSolver.scala b/src/main/scala/leon/invariant/templateSolvers/TemplateSolver.scala
index e42817a1e..c46228f3c 100644
--- a/src/main/scala/leon/invariant/templateSolvers/TemplateSolver.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/TemplateSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/templateSolvers/UFADTEliminator.scala b/src/main/scala/leon/invariant/templateSolvers/UFADTEliminator.scala
index 4edc0f59a..2ad934ed1 100644
--- a/src/main/scala/leon/invariant/templateSolvers/UFADTEliminator.scala
+++ b/src/main/scala/leon/invariant/templateSolvers/UFADTEliminator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.templateSolvers
 
diff --git a/src/main/scala/leon/invariant/util/CallGraph.scala b/src/main/scala/leon/invariant/util/CallGraph.scala
index 7f4973874..ede408c37 100644
--- a/src/main/scala/leon/invariant/util/CallGraph.scala
+++ b/src/main/scala/leon/invariant/util/CallGraph.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/ExpressionTransformer.scala b/src/main/scala/leon/invariant/util/ExpressionTransformer.scala
index 5de31ddac..465d69545 100644
--- a/src/main/scala/leon/invariant/util/ExpressionTransformer.scala
+++ b/src/main/scala/leon/invariant/util/ExpressionTransformer.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/LetTupleSimplification.scala b/src/main/scala/leon/invariant/util/LetTupleSimplification.scala
index d560f5bc2..72b814904 100644
--- a/src/main/scala/leon/invariant/util/LetTupleSimplification.scala
+++ b/src/main/scala/leon/invariant/util/LetTupleSimplification.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/Minimizer.scala b/src/main/scala/leon/invariant/util/Minimizer.scala
index 267f66bae..ddf7c01dd 100644
--- a/src/main/scala/leon/invariant/util/Minimizer.scala
+++ b/src/main/scala/leon/invariant/util/Minimizer.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/RealToInt.scala b/src/main/scala/leon/invariant/util/RealToInt.scala
index 6c1860160..e42c80477 100644
--- a/src/main/scala/leon/invariant/util/RealToInt.scala
+++ b/src/main/scala/leon/invariant/util/RealToInt.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/RealValuedExprEvaluator.scala b/src/main/scala/leon/invariant/util/RealValuedExprEvaluator.scala
index d591de245..2c94f7c65 100644
--- a/src/main/scala/leon/invariant/util/RealValuedExprEvaluator.scala
+++ b/src/main/scala/leon/invariant/util/RealValuedExprEvaluator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/SolverUtil.scala b/src/main/scala/leon/invariant/util/SolverUtil.scala
index a9ff8b0f1..e0f3fe000 100644
--- a/src/main/scala/leon/invariant/util/SolverUtil.scala
+++ b/src/main/scala/leon/invariant/util/SolverUtil.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/Stats.scala b/src/main/scala/leon/invariant/util/Stats.scala
index eb5dc6efd..9b957d3ac 100644
--- a/src/main/scala/leon/invariant/util/Stats.scala
+++ b/src/main/scala/leon/invariant/util/Stats.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/TVarFactory.scala b/src/main/scala/leon/invariant/util/TVarFactory.scala
index 7fdebb008..cafad81b8 100644
--- a/src/main/scala/leon/invariant/util/TVarFactory.scala
+++ b/src/main/scala/leon/invariant/util/TVarFactory.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/TimerUtil.scala b/src/main/scala/leon/invariant/util/TimerUtil.scala
index 77e9b5201..22dfffa24 100644
--- a/src/main/scala/leon/invariant/util/TimerUtil.scala
+++ b/src/main/scala/leon/invariant/util/TimerUtil.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/TreeUtil.scala b/src/main/scala/leon/invariant/util/TreeUtil.scala
index 88dabc505..b99d09125 100644
--- a/src/main/scala/leon/invariant/util/TreeUtil.scala
+++ b/src/main/scala/leon/invariant/util/TreeUtil.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/invariant/util/Util.scala b/src/main/scala/leon/invariant/util/Util.scala
index c660b0650..472bc1192 100644
--- a/src/main/scala/leon/invariant/util/Util.scala
+++ b/src/main/scala/leon/invariant/util/Util.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package invariant.util
 
diff --git a/src/main/scala/leon/package.scala b/src/main/scala/leon/package.scala
index 147109724..8a6a6904f 100644
--- a/src/main/scala/leon/package.scala
+++ b/src/main/scala/leon/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 /** Core package of the Leon system 
   *
diff --git a/src/main/scala/leon/purescala/CallGraph.scala b/src/main/scala/leon/purescala/CallGraph.scala
index edeaab269..63fe2c570 100644
--- a/src/main/scala/leon/purescala/CallGraph.scala
+++ b/src/main/scala/leon/purescala/CallGraph.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Common.scala b/src/main/scala/leon/purescala/Common.scala
index d43bb4c8a..848ded806 100644
--- a/src/main/scala/leon/purescala/Common.scala
+++ b/src/main/scala/leon/purescala/Common.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Constructors.scala b/src/main/scala/leon/purescala/Constructors.scala
index 95218cb28..24c0f000c 100644
--- a/src/main/scala/leon/purescala/Constructors.scala
+++ b/src/main/scala/leon/purescala/Constructors.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/DefOps.scala b/src/main/scala/leon/purescala/DefOps.scala
index c79282c53..ef9fc37b3 100644
--- a/src/main/scala/leon/purescala/DefOps.scala
+++ b/src/main/scala/leon/purescala/DefOps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.purescala
 
diff --git a/src/main/scala/leon/purescala/Definitions.scala b/src/main/scala/leon/purescala/Definitions.scala
index 2178a07af..484745ae0 100644
--- a/src/main/scala/leon/purescala/Definitions.scala
+++ b/src/main/scala/leon/purescala/Definitions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/ExprOps.scala b/src/main/scala/leon/purescala/ExprOps.scala
index c632a6d69..9724d846c 100644
--- a/src/main/scala/leon/purescala/ExprOps.scala
+++ b/src/main/scala/leon/purescala/ExprOps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Expressions.scala b/src/main/scala/leon/purescala/Expressions.scala
index cff87c5f6..6d6382709 100644
--- a/src/main/scala/leon/purescala/Expressions.scala
+++ b/src/main/scala/leon/purescala/Expressions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.purescala
 
diff --git a/src/main/scala/leon/purescala/Extractors.scala b/src/main/scala/leon/purescala/Extractors.scala
index 6c45aa705..c7d8a1a40 100644
--- a/src/main/scala/leon/purescala/Extractors.scala
+++ b/src/main/scala/leon/purescala/Extractors.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/FunctionClosure.scala b/src/main/scala/leon/purescala/FunctionClosure.scala
index ff8feb33e..1ffaccef7 100644
--- a/src/main/scala/leon/purescala/FunctionClosure.scala
+++ b/src/main/scala/leon/purescala/FunctionClosure.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/FunctionMapping.scala b/src/main/scala/leon/purescala/FunctionMapping.scala
index 34a9c2d80..cee6df3d2 100644
--- a/src/main/scala/leon/purescala/FunctionMapping.scala
+++ b/src/main/scala/leon/purescala/FunctionMapping.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/MethodLifting.scala b/src/main/scala/leon/purescala/MethodLifting.scala
index 0e9e11d17..6743da68b 100644
--- a/src/main/scala/leon/purescala/MethodLifting.scala
+++ b/src/main/scala/leon/purescala/MethodLifting.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/PrettyPrinter.scala b/src/main/scala/leon/purescala/PrettyPrinter.scala
index 05622598a..88f6fd70c 100644
--- a/src/main/scala/leon/purescala/PrettyPrinter.scala
+++ b/src/main/scala/leon/purescala/PrettyPrinter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/PrinterHelpers.scala b/src/main/scala/leon/purescala/PrinterHelpers.scala
index 17ae02e0c..9cc470697 100644
--- a/src/main/scala/leon/purescala/PrinterHelpers.scala
+++ b/src/main/scala/leon/purescala/PrinterHelpers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/PrinterOptions.scala b/src/main/scala/leon/purescala/PrinterOptions.scala
index 22c4c0247..b44b5a905 100644
--- a/src/main/scala/leon/purescala/PrinterOptions.scala
+++ b/src/main/scala/leon/purescala/PrinterOptions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Quantification.scala b/src/main/scala/leon/purescala/Quantification.scala
index 21608b0fa..079be92d1 100644
--- a/src/main/scala/leon/purescala/Quantification.scala
+++ b/src/main/scala/leon/purescala/Quantification.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/RestoreMethods.scala b/src/main/scala/leon/purescala/RestoreMethods.scala
index 7b18cde50..5c0abc5e5 100644
--- a/src/main/scala/leon/purescala/RestoreMethods.scala
+++ b/src/main/scala/leon/purescala/RestoreMethods.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/ScalaPrinter.scala b/src/main/scala/leon/purescala/ScalaPrinter.scala
index 11f0c187e..03c50eb2e 100644
--- a/src/main/scala/leon/purescala/ScalaPrinter.scala
+++ b/src/main/scala/leon/purescala/ScalaPrinter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/ScopeSimplifier.scala b/src/main/scala/leon/purescala/ScopeSimplifier.scala
index e06055dc4..4e149303a 100644
--- a/src/main/scala/leon/purescala/ScopeSimplifier.scala
+++ b/src/main/scala/leon/purescala/ScopeSimplifier.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/SelfPrettyPrinter.scala b/src/main/scala/leon/purescala/SelfPrettyPrinter.scala
index e34b0a4a3..c9f86a404 100644
--- a/src/main/scala/leon/purescala/SelfPrettyPrinter.scala
+++ b/src/main/scala/leon/purescala/SelfPrettyPrinter.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.purescala
 
 import leon.purescala
diff --git a/src/main/scala/leon/purescala/SimplifierWithPaths.scala b/src/main/scala/leon/purescala/SimplifierWithPaths.scala
index dc4dfce46..a53b3b176 100644
--- a/src/main/scala/leon/purescala/SimplifierWithPaths.scala
+++ b/src/main/scala/leon/purescala/SimplifierWithPaths.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Transformer.scala b/src/main/scala/leon/purescala/Transformer.scala
index bddbe0325..c44d56a67 100644
--- a/src/main/scala/leon/purescala/Transformer.scala
+++ b/src/main/scala/leon/purescala/Transformer.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/TransformerWithPC.scala b/src/main/scala/leon/purescala/TransformerWithPC.scala
index 3fc618d67..9411bf68d 100644
--- a/src/main/scala/leon/purescala/TransformerWithPC.scala
+++ b/src/main/scala/leon/purescala/TransformerWithPC.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/TreeNormalizations.scala b/src/main/scala/leon/purescala/TreeNormalizations.scala
index d3dff445c..4f5f5ffa9 100644
--- a/src/main/scala/leon/purescala/TreeNormalizations.scala
+++ b/src/main/scala/leon/purescala/TreeNormalizations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/TypeOps.scala b/src/main/scala/leon/purescala/TypeOps.scala
index 7ebfa291f..99da89dbc 100644
--- a/src/main/scala/leon/purescala/TypeOps.scala
+++ b/src/main/scala/leon/purescala/TypeOps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/Types.scala b/src/main/scala/leon/purescala/Types.scala
index 6f2518d54..0ee936c81 100644
--- a/src/main/scala/leon/purescala/Types.scala
+++ b/src/main/scala/leon/purescala/Types.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package purescala
diff --git a/src/main/scala/leon/purescala/package.scala b/src/main/scala/leon/purescala/package.scala
index 03ab3061f..669bc61a1 100644
--- a/src/main/scala/leon/purescala/package.scala
+++ b/src/main/scala/leon/purescala/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/repair/RepairNDEvaluator.scala b/src/main/scala/leon/repair/RepairNDEvaluator.scala
index 56e846747..7859f7957 100644
--- a/src/main/scala/leon/repair/RepairNDEvaluator.scala
+++ b/src/main/scala/leon/repair/RepairNDEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package repair
diff --git a/src/main/scala/leon/repair/RepairPhase.scala b/src/main/scala/leon/repair/RepairPhase.scala
index 1481b0e78..aff7747ad 100644
--- a/src/main/scala/leon/repair/RepairPhase.scala
+++ b/src/main/scala/leon/repair/RepairPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package repair
diff --git a/src/main/scala/leon/repair/RepairTrackingEvaluator.scala b/src/main/scala/leon/repair/RepairTrackingEvaluator.scala
index 429b34c19..67707d6cf 100644
--- a/src/main/scala/leon/repair/RepairTrackingEvaluator.scala
+++ b/src/main/scala/leon/repair/RepairTrackingEvaluator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.repair
 
diff --git a/src/main/scala/leon/repair/Repairman.scala b/src/main/scala/leon/repair/Repairman.scala
index 65b6aee97..07bdeb6ca 100644
--- a/src/main/scala/leon/repair/Repairman.scala
+++ b/src/main/scala/leon/repair/Repairman.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package repair
diff --git a/src/main/scala/leon/repair/rules/Focus.scala b/src/main/scala/leon/repair/rules/Focus.scala
index a4b8a71ef..f62a7bdcd 100644
--- a/src/main/scala/leon/repair/rules/Focus.scala
+++ b/src/main/scala/leon/repair/rules/Focus.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package repair
diff --git a/src/main/scala/leon/solvers/ADTManager.scala b/src/main/scala/leon/solvers/ADTManager.scala
index fada59c17..b52be838a 100644
--- a/src/main/scala/leon/solvers/ADTManager.scala
+++ b/src/main/scala/leon/solvers/ADTManager.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/CantResetException.scala b/src/main/scala/leon/solvers/CantResetException.scala
index 51646c8fe..d92b3617d 100644
--- a/src/main/scala/leon/solvers/CantResetException.scala
+++ b/src/main/scala/leon/solvers/CantResetException.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers
 
 class CantResetException(s: Solver) extends Exception(s"Unable to reset solver $s")
diff --git a/src/main/scala/leon/solvers/EnumerationSolver.scala b/src/main/scala/leon/solvers/EnumerationSolver.scala
index a9bbe8b45..79f53ef91 100644
--- a/src/main/scala/leon/solvers/EnumerationSolver.scala
+++ b/src/main/scala/leon/solvers/EnumerationSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/EvaluatingSolver.scala b/src/main/scala/leon/solvers/EvaluatingSolver.scala
index 75dcb5631..835d352ed 100644
--- a/src/main/scala/leon/solvers/EvaluatingSolver.scala
+++ b/src/main/scala/leon/solvers/EvaluatingSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package solvers
 
diff --git a/src/main/scala/leon/solvers/GroundSolver.scala b/src/main/scala/leon/solvers/GroundSolver.scala
index f38ddd188..130f8d86b 100644
--- a/src/main/scala/leon/solvers/GroundSolver.scala
+++ b/src/main/scala/leon/solvers/GroundSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/Model.scala b/src/main/scala/leon/solvers/Model.scala
index 59b6c9064..78b5b0501 100644
--- a/src/main/scala/leon/solvers/Model.scala
+++ b/src/main/scala/leon/solvers/Model.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/NaiveAssumptionSolver.scala b/src/main/scala/leon/solvers/NaiveAssumptionSolver.scala
index da1dfa766..a0dd48a7c 100644
--- a/src/main/scala/leon/solvers/NaiveAssumptionSolver.scala
+++ b/src/main/scala/leon/solvers/NaiveAssumptionSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/RawArray.scala b/src/main/scala/leon/solvers/RawArray.scala
index a527a98fa..60212d0e6 100644
--- a/src/main/scala/leon/solvers/RawArray.scala
+++ b/src/main/scala/leon/solvers/RawArray.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/SimpleSolverAPI.scala b/src/main/scala/leon/solvers/SimpleSolverAPI.scala
index e5e7c7dd3..8f7c4b404 100644
--- a/src/main/scala/leon/solvers/SimpleSolverAPI.scala
+++ b/src/main/scala/leon/solvers/SimpleSolverAPI.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/Solver.scala b/src/main/scala/leon/solvers/Solver.scala
index c8e4bd9b9..e1c9525ae 100644
--- a/src/main/scala/leon/solvers/Solver.scala
+++ b/src/main/scala/leon/solvers/Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/SolverFactory.scala b/src/main/scala/leon/solvers/SolverFactory.scala
index 18b8a72a1..865651579 100644
--- a/src/main/scala/leon/solvers/SolverFactory.scala
+++ b/src/main/scala/leon/solvers/SolverFactory.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/SolverUnsupportedError.scala b/src/main/scala/leon/solvers/SolverUnsupportedError.scala
index 2efc8ea39..8d42223c8 100644
--- a/src/main/scala/leon/solvers/SolverUnsupportedError.scala
+++ b/src/main/scala/leon/solvers/SolverUnsupportedError.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/TimeoutSolver.scala b/src/main/scala/leon/solvers/TimeoutSolver.scala
index 723b48886..90ce09b79 100644
--- a/src/main/scala/leon/solvers/TimeoutSolver.scala
+++ b/src/main/scala/leon/solvers/TimeoutSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/TimeoutSolverFactory.scala b/src/main/scala/leon/solvers/TimeoutSolverFactory.scala
index b5a042147..f3f8ca200 100644
--- a/src/main/scala/leon/solvers/TimeoutSolverFactory.scala
+++ b/src/main/scala/leon/solvers/TimeoutSolverFactory.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/combinators/PortfolioSolver.scala b/src/main/scala/leon/solvers/combinators/PortfolioSolver.scala
index 4bfc179a1..f374344e5 100644
--- a/src/main/scala/leon/solvers/combinators/PortfolioSolver.scala
+++ b/src/main/scala/leon/solvers/combinators/PortfolioSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/combinators/PortfolioSolverFactory.scala b/src/main/scala/leon/solvers/combinators/PortfolioSolverFactory.scala
index 7c29a16d0..f6a700431 100644
--- a/src/main/scala/leon/solvers/combinators/PortfolioSolverFactory.scala
+++ b/src/main/scala/leon/solvers/combinators/PortfolioSolverFactory.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/combinators/RewritingSolver.scala b/src/main/scala/leon/solvers/combinators/RewritingSolver.scala
index 0419d7d6e..ff0c8bf6f 100644
--- a/src/main/scala/leon/solvers/combinators/RewritingSolver.scala
+++ b/src/main/scala/leon/solvers/combinators/RewritingSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/combinators/SolverPool.scala b/src/main/scala/leon/solvers/combinators/SolverPool.scala
index 296e6b713..2d38591f6 100644
--- a/src/main/scala/leon/solvers/combinators/SolverPool.scala
+++ b/src/main/scala/leon/solvers/combinators/SolverPool.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/combinators/UnrollingSolver.scala b/src/main/scala/leon/solvers/combinators/UnrollingSolver.scala
index e00faa54c..2e896736f 100644
--- a/src/main/scala/leon/solvers/combinators/UnrollingSolver.scala
+++ b/src/main/scala/leon/solvers/combinators/UnrollingSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/isabelle/AdaptationPhase.scala b/src/main/scala/leon/solvers/isabelle/AdaptationPhase.scala
index ace759b4e..d0b342b81 100644
--- a/src/main/scala/leon/solvers/isabelle/AdaptationPhase.scala
+++ b/src/main/scala/leon/solvers/isabelle/AdaptationPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import leon._
diff --git a/src/main/scala/leon/solvers/isabelle/Component.scala b/src/main/scala/leon/solvers/isabelle/Component.scala
index 4f66f3a6d..55e2eef1e 100644
--- a/src/main/scala/leon/solvers/isabelle/Component.scala
+++ b/src/main/scala/leon/solvers/isabelle/Component.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import java.nio.file.Paths
diff --git a/src/main/scala/leon/solvers/isabelle/Functions.scala b/src/main/scala/leon/solvers/isabelle/Functions.scala
index bad4b96ac..9e221e988 100644
--- a/src/main/scala/leon/solvers/isabelle/Functions.scala
+++ b/src/main/scala/leon/solvers/isabelle/Functions.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala b/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala
index fa7b3d034..944a2e249 100644
--- a/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala
+++ b/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import java.io.FileWriter
diff --git a/src/main/scala/leon/solvers/isabelle/IsabellePhase.scala b/src/main/scala/leon/solvers/isabelle/IsabellePhase.scala
index 47edf6b7f..3cfe02990 100644
--- a/src/main/scala/leon/solvers/isabelle/IsabellePhase.scala
+++ b/src/main/scala/leon/solvers/isabelle/IsabellePhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/IsabelleSolver.scala b/src/main/scala/leon/solvers/isabelle/IsabelleSolver.scala
index 3b3e81860..9bf81247d 100644
--- a/src/main/scala/leon/solvers/isabelle/IsabelleSolver.scala
+++ b/src/main/scala/leon/solvers/isabelle/IsabelleSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/IsabelleSolverFactory.scala b/src/main/scala/leon/solvers/isabelle/IsabelleSolverFactory.scala
index 190224cb6..0e356aa55 100644
--- a/src/main/scala/leon/solvers/isabelle/IsabelleSolverFactory.scala
+++ b/src/main/scala/leon/solvers/isabelle/IsabelleSolverFactory.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/Translator.scala b/src/main/scala/leon/solvers/isabelle/Translator.scala
index c0c9446f1..79c4cfea7 100644
--- a/src/main/scala/leon/solvers/isabelle/Translator.scala
+++ b/src/main/scala/leon/solvers/isabelle/Translator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/Types.scala b/src/main/scala/leon/solvers/isabelle/Types.scala
index 7d2b4d1d8..268a1b788 100644
--- a/src/main/scala/leon/solvers/isabelle/Types.scala
+++ b/src/main/scala/leon/solvers/isabelle/Types.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.isabelle
 
 import scala.concurrent._
diff --git a/src/main/scala/leon/solvers/isabelle/package.scala b/src/main/scala/leon/solvers/isabelle/package.scala
index 26f01fb5c..490469653 100644
--- a/src/main/scala/leon/solvers/isabelle/package.scala
+++ b/src/main/scala/leon/solvers/isabelle/package.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package solvers.isabelle
 
diff --git a/src/main/scala/leon/solvers/package.scala b/src/main/scala/leon/solvers/package.scala
index e08e536da..34215c07e 100644
--- a/src/main/scala/leon/solvers/package.scala
+++ b/src/main/scala/leon/solvers/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4CounterExampleSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4CounterExampleSolver.scala
index 3a64bd197..973546c68 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4CounterExampleSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4CounterExampleSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.smtlib
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4ProofSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4ProofSolver.scala
index eaf78aca5..8c16d013f 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4ProofSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4ProofSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.smtlib
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedSolver.scala
index 16068794f..39d83d7c7 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.smtlib
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedTarget.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedTarget.scala
index 737b8535c..b67140f4b 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedTarget.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4QuantifiedTarget.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Solver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Solver.scala
index b71af967f..4c17f8089 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Solver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.smtlib
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Target.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Target.scala
index 03cf3aef3..d9deb8790 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Target.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBCVC4Target.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedSolver.scala
index f98b4f7e4..d4819cfba 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedTarget.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedTarget.scala
index d52ac0704..980d87fa8 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedTarget.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBQuantifiedTarget.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBSolver.scala
index 72ecfb9d3..78b9ccbd9 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala
index cc0c50987..242f32121 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBUnsupportedError.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBUnsupportedError.scala
index 0a48c2988..3575f9fd3 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBUnsupportedError.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBUnsupportedError.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedSolver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedSolver.scala
index aa78b97f0..083e07f34 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedSolver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.smtlib
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedTarget.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedTarget.scala
index f3c7cb69e..fbd4b581c 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedTarget.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3QuantifiedTarget.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Solver.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Solver.scala
index dc56d76d7..58a88d1a6 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Solver.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala
index f9f8e386c..5744e1a10 100644
--- a/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala
+++ b/src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/string/StringSolver.scala b/src/main/scala/leon/solvers/string/StringSolver.scala
index d681d500f..bc9ee8419 100644
--- a/src/main/scala/leon/solvers/string/StringSolver.scala
+++ b/src/main/scala/leon/solvers/string/StringSolver.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.solvers.string
 
 import leon.purescala.Common._
diff --git a/src/main/scala/leon/solvers/sygus/CVC4SygusSolver.scala b/src/main/scala/leon/solvers/sygus/CVC4SygusSolver.scala
index 0771504fa..564dc67fe 100644
--- a/src/main/scala/leon/solvers/sygus/CVC4SygusSolver.scala
+++ b/src/main/scala/leon/solvers/sygus/CVC4SygusSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/sygus/SygusSolver.scala b/src/main/scala/leon/solvers/sygus/SygusSolver.scala
index 6d2c76789..816872492 100644
--- a/src/main/scala/leon/solvers/sygus/SygusSolver.scala
+++ b/src/main/scala/leon/solvers/sygus/SygusSolver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/LambdaManager.scala b/src/main/scala/leon/solvers/templates/LambdaManager.scala
index a63fdd7a6..f80a143a5 100644
--- a/src/main/scala/leon/solvers/templates/LambdaManager.scala
+++ b/src/main/scala/leon/solvers/templates/LambdaManager.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/QuantificationManager.scala b/src/main/scala/leon/solvers/templates/QuantificationManager.scala
index 85a2add27..d10b786e5 100644
--- a/src/main/scala/leon/solvers/templates/QuantificationManager.scala
+++ b/src/main/scala/leon/solvers/templates/QuantificationManager.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/TemplateEncoder.scala b/src/main/scala/leon/solvers/templates/TemplateEncoder.scala
index 16d7b3cdc..c2a2051b1 100644
--- a/src/main/scala/leon/solvers/templates/TemplateEncoder.scala
+++ b/src/main/scala/leon/solvers/templates/TemplateEncoder.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/TemplateGenerator.scala b/src/main/scala/leon/solvers/templates/TemplateGenerator.scala
index 4556f7dd6..d2717f5ef 100644
--- a/src/main/scala/leon/solvers/templates/TemplateGenerator.scala
+++ b/src/main/scala/leon/solvers/templates/TemplateGenerator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/TemplateInfo.scala b/src/main/scala/leon/solvers/templates/TemplateInfo.scala
index dfdd664cb..455704dc4 100644
--- a/src/main/scala/leon/solvers/templates/TemplateInfo.scala
+++ b/src/main/scala/leon/solvers/templates/TemplateInfo.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/TemplateManager.scala b/src/main/scala/leon/solvers/templates/TemplateManager.scala
index c81abc384..2bb0cbbd0 100644
--- a/src/main/scala/leon/solvers/templates/TemplateManager.scala
+++ b/src/main/scala/leon/solvers/templates/TemplateManager.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/templates/UnrollingBank.scala b/src/main/scala/leon/solvers/templates/UnrollingBank.scala
index 1866fc72b..acee03b73 100644
--- a/src/main/scala/leon/solvers/templates/UnrollingBank.scala
+++ b/src/main/scala/leon/solvers/templates/UnrollingBank.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala b/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
index 84715bb73..01a86e2b9 100644
--- a/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
+++ b/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.z3
diff --git a/src/main/scala/leon/solvers/z3/FairZ3Solver.scala b/src/main/scala/leon/solvers/z3/FairZ3Solver.scala
index ee6197774..d87559f93 100644
--- a/src/main/scala/leon/solvers/z3/FairZ3Solver.scala
+++ b/src/main/scala/leon/solvers/z3/FairZ3Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers
diff --git a/src/main/scala/leon/solvers/z3/UninterpretedZ3Solver.scala b/src/main/scala/leon/solvers/z3/UninterpretedZ3Solver.scala
index f755f2a4a..6f40151cf 100644
--- a/src/main/scala/leon/solvers/z3/UninterpretedZ3Solver.scala
+++ b/src/main/scala/leon/solvers/z3/UninterpretedZ3Solver.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.z3
diff --git a/src/main/scala/leon/solvers/z3/Z3ModelReconstruction.scala b/src/main/scala/leon/solvers/z3/Z3ModelReconstruction.scala
index 4383f8f31..a626199f1 100644
--- a/src/main/scala/leon/solvers/z3/Z3ModelReconstruction.scala
+++ b/src/main/scala/leon/solvers/z3/Z3ModelReconstruction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package solvers.z3
diff --git a/src/main/scala/leon/solvers/z3/Z3StringConversion.scala b/src/main/scala/leon/solvers/z3/Z3StringConversion.scala
index 75e7cc902..fa262caa6 100644
--- a/src/main/scala/leon/solvers/z3/Z3StringConversion.scala
+++ b/src/main/scala/leon/solvers/z3/Z3StringConversion.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package solvers
 package z3
diff --git a/src/main/scala/leon/synthesis/Algebra.scala b/src/main/scala/leon/synthesis/Algebra.scala
index 92ee346e0..3ba54147d 100644
--- a/src/main/scala/leon/synthesis/Algebra.scala
+++ b/src/main/scala/leon/synthesis/Algebra.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.synthesis
 
diff --git a/src/main/scala/leon/synthesis/ConversionPhase.scala b/src/main/scala/leon/synthesis/ConversionPhase.scala
index ce9f1525f..d6329768e 100644
--- a/src/main/scala/leon/synthesis/ConversionPhase.scala
+++ b/src/main/scala/leon/synthesis/ConversionPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/CostModel.scala b/src/main/scala/leon/synthesis/CostModel.scala
index 8449d37a5..781940e71 100644
--- a/src/main/scala/leon/synthesis/CostModel.scala
+++ b/src/main/scala/leon/synthesis/CostModel.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/ExamplesBank.scala b/src/main/scala/leon/synthesis/ExamplesBank.scala
index 89e018b5e..1da37b350 100644
--- a/src/main/scala/leon/synthesis/ExamplesBank.scala
+++ b/src/main/scala/leon/synthesis/ExamplesBank.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis
 
diff --git a/src/main/scala/leon/synthesis/ExamplesFinder.scala b/src/main/scala/leon/synthesis/ExamplesFinder.scala
index cfd3cf6d5..7079f9054 100644
--- a/src/main/scala/leon/synthesis/ExamplesFinder.scala
+++ b/src/main/scala/leon/synthesis/ExamplesFinder.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/FileInterface.scala b/src/main/scala/leon/synthesis/FileInterface.scala
index cba6629da..f40255815 100644
--- a/src/main/scala/leon/synthesis/FileInterface.scala
+++ b/src/main/scala/leon/synthesis/FileInterface.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Histogram.scala b/src/main/scala/leon/synthesis/Histogram.scala
index 9982e117f..7950d1ce7 100644
--- a/src/main/scala/leon/synthesis/Histogram.scala
+++ b/src/main/scala/leon/synthesis/Histogram.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.synthesis
 
diff --git a/src/main/scala/leon/synthesis/InOutExample.scala b/src/main/scala/leon/synthesis/InOutExample.scala
index 3340816aa..244515d3a 100644
--- a/src/main/scala/leon/synthesis/InOutExample.scala
+++ b/src/main/scala/leon/synthesis/InOutExample.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/LinearEquations.scala b/src/main/scala/leon/synthesis/LinearEquations.scala
index 546bcd3d9..3069c90ae 100644
--- a/src/main/scala/leon/synthesis/LinearEquations.scala
+++ b/src/main/scala/leon/synthesis/LinearEquations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/PartialSolution.scala b/src/main/scala/leon/synthesis/PartialSolution.scala
index 974011636..4f46997a8 100644
--- a/src/main/scala/leon/synthesis/PartialSolution.scala
+++ b/src/main/scala/leon/synthesis/PartialSolution.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Problem.scala b/src/main/scala/leon/synthesis/Problem.scala
index d59d956e9..f60b5fc5a 100644
--- a/src/main/scala/leon/synthesis/Problem.scala
+++ b/src/main/scala/leon/synthesis/Problem.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Rules.scala b/src/main/scala/leon/synthesis/Rules.scala
index f3019de65..f55c670f4 100644
--- a/src/main/scala/leon/synthesis/Rules.scala
+++ b/src/main/scala/leon/synthesis/Rules.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Search.scala b/src/main/scala/leon/synthesis/Search.scala
index cb7ecf048..225495cac 100644
--- a/src/main/scala/leon/synthesis/Search.scala
+++ b/src/main/scala/leon/synthesis/Search.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/SearchContext.scala b/src/main/scala/leon/synthesis/SearchContext.scala
index c782f35ed..201dcaf21 100644
--- a/src/main/scala/leon/synthesis/SearchContext.scala
+++ b/src/main/scala/leon/synthesis/SearchContext.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Solution.scala b/src/main/scala/leon/synthesis/Solution.scala
index 428df1ee6..d57045254 100644
--- a/src/main/scala/leon/synthesis/Solution.scala
+++ b/src/main/scala/leon/synthesis/Solution.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/SourceInfo.scala b/src/main/scala/leon/synthesis/SourceInfo.scala
index 70f116d5f..666c589c3 100644
--- a/src/main/scala/leon/synthesis/SourceInfo.scala
+++ b/src/main/scala/leon/synthesis/SourceInfo.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/SynthesisContext.scala b/src/main/scala/leon/synthesis/SynthesisContext.scala
index 1d0a6b5e9..a872f304b 100644
--- a/src/main/scala/leon/synthesis/SynthesisContext.scala
+++ b/src/main/scala/leon/synthesis/SynthesisContext.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/SynthesisPhase.scala b/src/main/scala/leon/synthesis/SynthesisPhase.scala
index 2385f5079..422d90be2 100644
--- a/src/main/scala/leon/synthesis/SynthesisPhase.scala
+++ b/src/main/scala/leon/synthesis/SynthesisPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/SynthesisSettings.scala b/src/main/scala/leon/synthesis/SynthesisSettings.scala
index f7951c464..5bbff9444 100644
--- a/src/main/scala/leon/synthesis/SynthesisSettings.scala
+++ b/src/main/scala/leon/synthesis/SynthesisSettings.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Synthesizer.scala b/src/main/scala/leon/synthesis/Synthesizer.scala
index 2d40c6fd4..196637f6f 100644
--- a/src/main/scala/leon/synthesis/Synthesizer.scala
+++ b/src/main/scala/leon/synthesis/Synthesizer.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/Witnesses.scala b/src/main/scala/leon/synthesis/Witnesses.scala
index 60b1f5ea3..884eee9f0 100644
--- a/src/main/scala/leon/synthesis/Witnesses.scala
+++ b/src/main/scala/leon/synthesis/Witnesses.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.synthesis
 
diff --git a/src/main/scala/leon/synthesis/disambiguation/ExamplesAdder.scala b/src/main/scala/leon/synthesis/disambiguation/ExamplesAdder.scala
index f6359768e..7c73a5b91 100644
--- a/src/main/scala/leon/synthesis/disambiguation/ExamplesAdder.scala
+++ b/src/main/scala/leon/synthesis/disambiguation/ExamplesAdder.scala
@@ -1,4 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis
 package disambiguation
diff --git a/src/main/scala/leon/synthesis/disambiguation/Question.scala b/src/main/scala/leon/synthesis/disambiguation/Question.scala
index eed7bfc1a..985efaed1 100644
--- a/src/main/scala/leon/synthesis/disambiguation/Question.scala
+++ b/src/main/scala/leon/synthesis/disambiguation/Question.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis.disambiguation
 
diff --git a/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala b/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala
index 81f98f864..ccbdd8f15 100644
--- a/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala
+++ b/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis.disambiguation
 
diff --git a/src/main/scala/leon/synthesis/graph/DotGenerator.scala b/src/main/scala/leon/synthesis/graph/DotGenerator.scala
index f6ccf140c..d1ba7a040 100644
--- a/src/main/scala/leon/synthesis/graph/DotGenerator.scala
+++ b/src/main/scala/leon/synthesis/graph/DotGenerator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.synthesis
 package graph
diff --git a/src/main/scala/leon/synthesis/graph/Graph.scala b/src/main/scala/leon/synthesis/graph/Graph.scala
index 2af026aaa..c3bdc2b67 100644
--- a/src/main/scala/leon/synthesis/graph/Graph.scala
+++ b/src/main/scala/leon/synthesis/graph/Graph.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/package.scala b/src/main/scala/leon/synthesis/package.scala
index 3cb5f5417..50bb935c0 100644
--- a/src/main/scala/leon/synthesis/package.scala
+++ b/src/main/scala/leon/synthesis/package.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 
diff --git a/src/main/scala/leon/synthesis/programsets/DirectProgramSet.scala b/src/main/scala/leon/synthesis/programsets/DirectProgramSet.scala
index 2887c57fc..692bc2189 100644
--- a/src/main/scala/leon/synthesis/programsets/DirectProgramSet.scala
+++ b/src/main/scala/leon/synthesis/programsets/DirectProgramSet.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.synthesis.programsets
 
 import leon.purescala
diff --git a/src/main/scala/leon/synthesis/programsets/JoinProgramSet.scala b/src/main/scala/leon/synthesis/programsets/JoinProgramSet.scala
index c0147227a..90c9dc99a 100644
--- a/src/main/scala/leon/synthesis/programsets/JoinProgramSet.scala
+++ b/src/main/scala/leon/synthesis/programsets/JoinProgramSet.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis.programsets
 
diff --git a/src/main/scala/leon/synthesis/programsets/ProgramSet.scala b/src/main/scala/leon/synthesis/programsets/ProgramSet.scala
index ebfcf8fa1..2e2b1ab2f 100644
--- a/src/main/scala/leon/synthesis/programsets/ProgramSet.scala
+++ b/src/main/scala/leon/synthesis/programsets/ProgramSet.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.synthesis.programsets
 
 import leon.purescala
diff --git a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala b/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
index f57c53053..bf49d8195 100644
--- a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
+++ b/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package synthesis.programsets
 
diff --git a/src/main/scala/leon/synthesis/rules/ADTDual.scala b/src/main/scala/leon/synthesis/rules/ADTDual.scala
index ed7c0652b..40ab91bc6 100644
--- a/src/main/scala/leon/synthesis/rules/ADTDual.scala
+++ b/src/main/scala/leon/synthesis/rules/ADTDual.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/ADTInduction.scala b/src/main/scala/leon/synthesis/rules/ADTInduction.scala
index 2c0bd4439..90738c698 100644
--- a/src/main/scala/leon/synthesis/rules/ADTInduction.scala
+++ b/src/main/scala/leon/synthesis/rules/ADTInduction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/ADTLongInduction.scala b/src/main/scala/leon/synthesis/rules/ADTLongInduction.scala
index 3d031db44..d14c2b0f8 100644
--- a/src/main/scala/leon/synthesis/rules/ADTLongInduction.scala
+++ b/src/main/scala/leon/synthesis/rules/ADTLongInduction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/ADTSplit.scala b/src/main/scala/leon/synthesis/rules/ADTSplit.scala
index 956340e86..93e1488ae 100644
--- a/src/main/scala/leon/synthesis/rules/ADTSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/ADTSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/AsChoose.scala b/src/main/scala/leon/synthesis/rules/AsChoose.scala
index 88b553701..7f231b85d 100644
--- a/src/main/scala/leon/synthesis/rules/AsChoose.scala
+++ b/src/main/scala/leon/synthesis/rules/AsChoose.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/Assert.scala b/src/main/scala/leon/synthesis/rules/Assert.scala
index d2cdb5b69..0acdc209e 100644
--- a/src/main/scala/leon/synthesis/rules/Assert.scala
+++ b/src/main/scala/leon/synthesis/rules/Assert.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/BottomUpTegis.scala b/src/main/scala/leon/synthesis/rules/BottomUpTegis.scala
index 2f4eee0d6..5dbcbb3a1 100644
--- a/src/main/scala/leon/synthesis/rules/BottomUpTegis.scala
+++ b/src/main/scala/leon/synthesis/rules/BottomUpTegis.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/CEGIS.scala b/src/main/scala/leon/synthesis/rules/CEGIS.scala
index cef8eb560..aad3d9cc3 100644
--- a/src/main/scala/leon/synthesis/rules/CEGIS.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGIS.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/CEGISLike.scala b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
index b3ce025da..913e54a49 100644
--- a/src/main/scala/leon/synthesis/rules/CEGISLike.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/CEGLESS.scala b/src/main/scala/leon/synthesis/rules/CEGLESS.scala
index 8f30f229f..52d6af00f 100644
--- a/src/main/scala/leon/synthesis/rules/CEGLESS.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGLESS.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/CaseSplit.scala b/src/main/scala/leon/synthesis/rules/CaseSplit.scala
index 543d6d753..fd820f96d 100644
--- a/src/main/scala/leon/synthesis/rules/CaseSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/CaseSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/DetupleInput.scala b/src/main/scala/leon/synthesis/rules/DetupleInput.scala
index 3c38a0170..0c5385358 100644
--- a/src/main/scala/leon/synthesis/rules/DetupleInput.scala
+++ b/src/main/scala/leon/synthesis/rules/DetupleInput.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/DetupleOutput.scala b/src/main/scala/leon/synthesis/rules/DetupleOutput.scala
index b3c9a81e1..a1d219340 100644
--- a/src/main/scala/leon/synthesis/rules/DetupleOutput.scala
+++ b/src/main/scala/leon/synthesis/rules/DetupleOutput.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/Disunification.scala b/src/main/scala/leon/synthesis/rules/Disunification.scala
index 82a05717a..a380dec53 100644
--- a/src/main/scala/leon/synthesis/rules/Disunification.scala
+++ b/src/main/scala/leon/synthesis/rules/Disunification.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/EqualitySplit.scala b/src/main/scala/leon/synthesis/rules/EqualitySplit.scala
index afabdad92..6f6eea54f 100644
--- a/src/main/scala/leon/synthesis/rules/EqualitySplit.scala
+++ b/src/main/scala/leon/synthesis/rules/EqualitySplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/EquivalentInputs.scala b/src/main/scala/leon/synthesis/rules/EquivalentInputs.scala
index d010a6ac0..2ee67ad7f 100644
--- a/src/main/scala/leon/synthesis/rules/EquivalentInputs.scala
+++ b/src/main/scala/leon/synthesis/rules/EquivalentInputs.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/Ground.scala b/src/main/scala/leon/synthesis/rules/Ground.scala
index e5eb75463..588f94c18 100644
--- a/src/main/scala/leon/synthesis/rules/Ground.scala
+++ b/src/main/scala/leon/synthesis/rules/Ground.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IfSplit.scala b/src/main/scala/leon/synthesis/rules/IfSplit.scala
index 0ff4cf4fd..9b97898b9 100644
--- a/src/main/scala/leon/synthesis/rules/IfSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/IfSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IndependentSplit.scala b/src/main/scala/leon/synthesis/rules/IndependentSplit.scala
index dfb788c23..fa8eceb3a 100644
--- a/src/main/scala/leon/synthesis/rules/IndependentSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/IndependentSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/InequalitySplit.scala b/src/main/scala/leon/synthesis/rules/InequalitySplit.scala
index b71d99b72..db41c6c3b 100644
--- a/src/main/scala/leon/synthesis/rules/InequalitySplit.scala
+++ b/src/main/scala/leon/synthesis/rules/InequalitySplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/InnerCaseSplit.scala b/src/main/scala/leon/synthesis/rules/InnerCaseSplit.scala
index 858a10a96..dff8b6f23 100644
--- a/src/main/scala/leon/synthesis/rules/InnerCaseSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/InnerCaseSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/InputSplit.scala b/src/main/scala/leon/synthesis/rules/InputSplit.scala
index 9d74e4896..293c9767d 100644
--- a/src/main/scala/leon/synthesis/rules/InputSplit.scala
+++ b/src/main/scala/leon/synthesis/rules/InputSplit.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IntInduction.scala b/src/main/scala/leon/synthesis/rules/IntInduction.scala
index eeabfff0c..bfebd3929 100644
--- a/src/main/scala/leon/synthesis/rules/IntInduction.scala
+++ b/src/main/scala/leon/synthesis/rules/IntInduction.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IntegerEquation.scala b/src/main/scala/leon/synthesis/rules/IntegerEquation.scala
index a668f26fc..f51d90075 100644
--- a/src/main/scala/leon/synthesis/rules/IntegerEquation.scala
+++ b/src/main/scala/leon/synthesis/rules/IntegerEquation.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IntegerInequalities.scala b/src/main/scala/leon/synthesis/rules/IntegerInequalities.scala
index 5537dc8d5..dfb1fa8d6 100644
--- a/src/main/scala/leon/synthesis/rules/IntegerInequalities.scala
+++ b/src/main/scala/leon/synthesis/rules/IntegerInequalities.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/IntroduceRecCalls.scala b/src/main/scala/leon/synthesis/rules/IntroduceRecCalls.scala
index 8fdb03c55..18fe97478 100644
--- a/src/main/scala/leon/synthesis/rules/IntroduceRecCalls.scala
+++ b/src/main/scala/leon/synthesis/rules/IntroduceRecCalls.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/OnePoint.scala b/src/main/scala/leon/synthesis/rules/OnePoint.scala
index 3afcaf572..8665eaf33 100644
--- a/src/main/scala/leon/synthesis/rules/OnePoint.scala
+++ b/src/main/scala/leon/synthesis/rules/OnePoint.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/OptimisticGround.scala b/src/main/scala/leon/synthesis/rules/OptimisticGround.scala
index f99ae625a..775b496be 100644
--- a/src/main/scala/leon/synthesis/rules/OptimisticGround.scala
+++ b/src/main/scala/leon/synthesis/rules/OptimisticGround.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/OptimisticInjection.scala b/src/main/scala/leon/synthesis/rules/OptimisticInjection.scala
index 5d3a84f30..599fbd5df 100644
--- a/src/main/scala/leon/synthesis/rules/OptimisticInjection.scala
+++ b/src/main/scala/leon/synthesis/rules/OptimisticInjection.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/SelectiveInlining.scala b/src/main/scala/leon/synthesis/rules/SelectiveInlining.scala
index 634470cc0..446938213 100644
--- a/src/main/scala/leon/synthesis/rules/SelectiveInlining.scala
+++ b/src/main/scala/leon/synthesis/rules/SelectiveInlining.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/StringRender.scala b/src/main/scala/leon/synthesis/rules/StringRender.scala
index 1244dc6df..7085ed7d9 100644
--- a/src/main/scala/leon/synthesis/rules/StringRender.scala
+++ b/src/main/scala/leon/synthesis/rules/StringRender.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/SygusCVC4.scala b/src/main/scala/leon/synthesis/rules/SygusCVC4.scala
index 72c267b28..d458de88c 100644
--- a/src/main/scala/leon/synthesis/rules/SygusCVC4.scala
+++ b/src/main/scala/leon/synthesis/rules/SygusCVC4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/TEGIS.scala b/src/main/scala/leon/synthesis/rules/TEGIS.scala
index 3d496d059..242502a16 100644
--- a/src/main/scala/leon/synthesis/rules/TEGIS.scala
+++ b/src/main/scala/leon/synthesis/rules/TEGIS.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/TEGISLike.scala b/src/main/scala/leon/synthesis/rules/TEGISLike.scala
index 9d5c48211..a085ad436 100644
--- a/src/main/scala/leon/synthesis/rules/TEGISLike.scala
+++ b/src/main/scala/leon/synthesis/rules/TEGISLike.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/TEGLESS.scala b/src/main/scala/leon/synthesis/rules/TEGLESS.scala
index f56b26b26..dfc38ed16 100644
--- a/src/main/scala/leon/synthesis/rules/TEGLESS.scala
+++ b/src/main/scala/leon/synthesis/rules/TEGLESS.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/UnconstrainedOutput.scala b/src/main/scala/leon/synthesis/rules/UnconstrainedOutput.scala
index eb3d83ed8..089c3da45 100644
--- a/src/main/scala/leon/synthesis/rules/UnconstrainedOutput.scala
+++ b/src/main/scala/leon/synthesis/rules/UnconstrainedOutput.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/Unification.scala b/src/main/scala/leon/synthesis/rules/Unification.scala
index cd4f5cdf6..419d25650 100644
--- a/src/main/scala/leon/synthesis/rules/Unification.scala
+++ b/src/main/scala/leon/synthesis/rules/Unification.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/rules/UnusedInput.scala b/src/main/scala/leon/synthesis/rules/UnusedInput.scala
index 4570501d7..a72dfb633 100644
--- a/src/main/scala/leon/synthesis/rules/UnusedInput.scala
+++ b/src/main/scala/leon/synthesis/rules/UnusedInput.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/BoundedStrategy.scala b/src/main/scala/leon/synthesis/strategies/BoundedStrategy.scala
index 2c58a5d31..72074c595 100644
--- a/src/main/scala/leon/synthesis/strategies/BoundedStrategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/BoundedStrategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/CostBasedStrategy.scala b/src/main/scala/leon/synthesis/strategies/CostBasedStrategy.scala
index e309593fe..de1f7d410 100644
--- a/src/main/scala/leon/synthesis/strategies/CostBasedStrategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/CostBasedStrategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/ManualStrategy.scala b/src/main/scala/leon/synthesis/strategies/ManualStrategy.scala
index fbaf1815f..809c48786 100644
--- a/src/main/scala/leon/synthesis/strategies/ManualStrategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/ManualStrategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/Strategy.scala b/src/main/scala/leon/synthesis/strategies/Strategy.scala
index b9142229d..5b6253bd9 100644
--- a/src/main/scala/leon/synthesis/strategies/Strategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/Strategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/TimeSlicingStrategy.scala b/src/main/scala/leon/synthesis/strategies/TimeSlicingStrategy.scala
index 4001a31ad..2ed3b56f2 100644
--- a/src/main/scala/leon/synthesis/strategies/TimeSlicingStrategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/TimeSlicingStrategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/strategies/WrappedStrategy.scala b/src/main/scala/leon/synthesis/strategies/WrappedStrategy.scala
index 1b013392b..8e281ea3d 100644
--- a/src/main/scala/leon/synthesis/strategies/WrappedStrategy.scala
+++ b/src/main/scala/leon/synthesis/strategies/WrappedStrategy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/utils/Helpers.scala b/src/main/scala/leon/synthesis/utils/Helpers.scala
index 14b7e2fb3..87d9c587c 100644
--- a/src/main/scala/leon/synthesis/utils/Helpers.scala
+++ b/src/main/scala/leon/synthesis/utils/Helpers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/synthesis/utils/SynthesisProblemExtractionPhase.scala b/src/main/scala/leon/synthesis/utils/SynthesisProblemExtractionPhase.scala
index c3df2a382..4bbd5ad69 100644
--- a/src/main/scala/leon/synthesis/utils/SynthesisProblemExtractionPhase.scala
+++ b/src/main/scala/leon/synthesis/utils/SynthesisProblemExtractionPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package synthesis
diff --git a/src/main/scala/leon/termination/ChainBuilder.scala b/src/main/scala/leon/termination/ChainBuilder.scala
index 0c6106127..77b15659c 100644
--- a/src/main/scala/leon/termination/ChainBuilder.scala
+++ b/src/main/scala/leon/termination/ChainBuilder.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/ChainComparator.scala b/src/main/scala/leon/termination/ChainComparator.scala
index 0c3cbd875..a2c18e171 100644
--- a/src/main/scala/leon/termination/ChainComparator.scala
+++ b/src/main/scala/leon/termination/ChainComparator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/ChainProcessor.scala b/src/main/scala/leon/termination/ChainProcessor.scala
index 799e51db6..c01fa9fb3 100644
--- a/src/main/scala/leon/termination/ChainProcessor.scala
+++ b/src/main/scala/leon/termination/ChainProcessor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/ComplexTerminationChecker.scala b/src/main/scala/leon/termination/ComplexTerminationChecker.scala
index 83638aa84..6d634f088 100644
--- a/src/main/scala/leon/termination/ComplexTerminationChecker.scala
+++ b/src/main/scala/leon/termination/ComplexTerminationChecker.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/LoopProcessor.scala b/src/main/scala/leon/termination/LoopProcessor.scala
index 790db9106..e71c52821 100644
--- a/src/main/scala/leon/termination/LoopProcessor.scala
+++ b/src/main/scala/leon/termination/LoopProcessor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/ProcessingPipeline.scala b/src/main/scala/leon/termination/ProcessingPipeline.scala
index 92a11c645..30cc87f55 100644
--- a/src/main/scala/leon/termination/ProcessingPipeline.scala
+++ b/src/main/scala/leon/termination/ProcessingPipeline.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/Processor.scala b/src/main/scala/leon/termination/Processor.scala
index 3f7be09f1..1d0527127 100644
--- a/src/main/scala/leon/termination/Processor.scala
+++ b/src/main/scala/leon/termination/Processor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/RecursionProcessor.scala b/src/main/scala/leon/termination/RecursionProcessor.scala
index 72c64f62a..d8d31e2a3 100644
--- a/src/main/scala/leon/termination/RecursionProcessor.scala
+++ b/src/main/scala/leon/termination/RecursionProcessor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/RelationBuilder.scala b/src/main/scala/leon/termination/RelationBuilder.scala
index d2edc6228..127b64ec0 100644
--- a/src/main/scala/leon/termination/RelationBuilder.scala
+++ b/src/main/scala/leon/termination/RelationBuilder.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/RelationComparator.scala b/src/main/scala/leon/termination/RelationComparator.scala
index c147f12aa..0d72d5021 100644
--- a/src/main/scala/leon/termination/RelationComparator.scala
+++ b/src/main/scala/leon/termination/RelationComparator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/RelationProcessor.scala b/src/main/scala/leon/termination/RelationProcessor.scala
index d71a6fa3a..1044e1be2 100644
--- a/src/main/scala/leon/termination/RelationProcessor.scala
+++ b/src/main/scala/leon/termination/RelationProcessor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/SelfCallsProcessor.scala b/src/main/scala/leon/termination/SelfCallsProcessor.scala
index 320c230c2..6a1475022 100644
--- a/src/main/scala/leon/termination/SelfCallsProcessor.scala
+++ b/src/main/scala/leon/termination/SelfCallsProcessor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/SimpleTerminationChecker.scala b/src/main/scala/leon/termination/SimpleTerminationChecker.scala
index 297d92d2a..a5864eeb4 100644
--- a/src/main/scala/leon/termination/SimpleTerminationChecker.scala
+++ b/src/main/scala/leon/termination/SimpleTerminationChecker.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/Strengthener.scala b/src/main/scala/leon/termination/Strengthener.scala
index e6c53a472..75a466001 100644
--- a/src/main/scala/leon/termination/Strengthener.scala
+++ b/src/main/scala/leon/termination/Strengthener.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/StructuralSize.scala b/src/main/scala/leon/termination/StructuralSize.scala
index 50de827c1..e075c374e 100644
--- a/src/main/scala/leon/termination/StructuralSize.scala
+++ b/src/main/scala/leon/termination/StructuralSize.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/TerminationChecker.scala b/src/main/scala/leon/termination/TerminationChecker.scala
index 6b8f5abb6..efe8bf438 100644
--- a/src/main/scala/leon/termination/TerminationChecker.scala
+++ b/src/main/scala/leon/termination/TerminationChecker.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/TerminationPhase.scala b/src/main/scala/leon/termination/TerminationPhase.scala
index 15f2dbe5a..d5b07f276 100644
--- a/src/main/scala/leon/termination/TerminationPhase.scala
+++ b/src/main/scala/leon/termination/TerminationPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/termination/TerminationReport.scala b/src/main/scala/leon/termination/TerminationReport.scala
index 57c3c03ae..7a10fe411 100644
--- a/src/main/scala/leon/termination/TerminationReport.scala
+++ b/src/main/scala/leon/termination/TerminationReport.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package termination
diff --git a/src/main/scala/leon/transformations/DepthInstPhase.scala b/src/main/scala/leon/transformations/DepthInstPhase.scala
index 3788602f6..96d47147e 100644
--- a/src/main/scala/leon/transformations/DepthInstPhase.scala
+++ b/src/main/scala/leon/transformations/DepthInstPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/InstProgSimplifier.scala b/src/main/scala/leon/transformations/InstProgSimplifier.scala
index ebb1abe00..635cb80bd 100644
--- a/src/main/scala/leon/transformations/InstProgSimplifier.scala
+++ b/src/main/scala/leon/transformations/InstProgSimplifier.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/InstrumentationUtil.scala b/src/main/scala/leon/transformations/InstrumentationUtil.scala
index 8e4c10451..5c26b194a 100644
--- a/src/main/scala/leon/transformations/InstrumentationUtil.scala
+++ b/src/main/scala/leon/transformations/InstrumentationUtil.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/IntToRealProgram.scala b/src/main/scala/leon/transformations/IntToRealProgram.scala
index f585cf042..fa09f9dca 100644
--- a/src/main/scala/leon/transformations/IntToRealProgram.scala
+++ b/src/main/scala/leon/transformations/IntToRealProgram.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/NonRecursiveTimePhase.scala b/src/main/scala/leon/transformations/NonRecursiveTimePhase.scala
index d315bd76d..7df3f03f0 100644
--- a/src/main/scala/leon/transformations/NonRecursiveTimePhase.scala
+++ b/src/main/scala/leon/transformations/NonRecursiveTimePhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/NonlinearityEliminationPhase.scala b/src/main/scala/leon/transformations/NonlinearityEliminationPhase.scala
index 6d740de6a..6422049cd 100644
--- a/src/main/scala/leon/transformations/NonlinearityEliminationPhase.scala
+++ b/src/main/scala/leon/transformations/NonlinearityEliminationPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/RecursionCountPhase.scala b/src/main/scala/leon/transformations/RecursionCountPhase.scala
index ad08c8d9d..729a8d45a 100644
--- a/src/main/scala/leon/transformations/RecursionCountPhase.scala
+++ b/src/main/scala/leon/transformations/RecursionCountPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/SerialInstrumentationPhase.scala b/src/main/scala/leon/transformations/SerialInstrumentationPhase.scala
index cee20aca2..7dc8b28e3 100644
--- a/src/main/scala/leon/transformations/SerialInstrumentationPhase.scala
+++ b/src/main/scala/leon/transformations/SerialInstrumentationPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/StackSpacePhase.scala b/src/main/scala/leon/transformations/StackSpacePhase.scala
index d80cb20dc..51c36bb93 100644
--- a/src/main/scala/leon/transformations/StackSpacePhase.scala
+++ b/src/main/scala/leon/transformations/StackSpacePhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/transformations/TimeStepsPhase.scala b/src/main/scala/leon/transformations/TimeStepsPhase.scala
index d43e7641c..9180978ba 100644
--- a/src/main/scala/leon/transformations/TimeStepsPhase.scala
+++ b/src/main/scala/leon/transformations/TimeStepsPhase.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package transformations
 
diff --git a/src/main/scala/leon/utils/ASCIIHelpers.scala b/src/main/scala/leon/utils/ASCIIHelpers.scala
index a2750e423..0b5a746f5 100644
--- a/src/main/scala/leon/utils/ASCIIHelpers.scala
+++ b/src/main/scala/leon/utils/ASCIIHelpers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/Benchmarks.scala b/src/main/scala/leon/utils/Benchmarks.scala
index 71d948949..92c0e398c 100644
--- a/src/main/scala/leon/utils/Benchmarks.scala
+++ b/src/main/scala/leon/utils/Benchmarks.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Bijection.scala b/src/main/scala/leon/utils/Bijection.scala
index 380799d25..fecf8a756 100644
--- a/src/main/scala/leon/utils/Bijection.scala
+++ b/src/main/scala/leon/utils/Bijection.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/DebugSections.scala b/src/main/scala/leon/utils/DebugSections.scala
index b3133d700..7e454e7ea 100644
--- a/src/main/scala/leon/utils/DebugSections.scala
+++ b/src/main/scala/leon/utils/DebugSections.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/FileOutputPhase.scala b/src/main/scala/leon/utils/FileOutputPhase.scala
index 3862d9385..6f2fc3753 100644
--- a/src/main/scala/leon/utils/FileOutputPhase.scala
+++ b/src/main/scala/leon/utils/FileOutputPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/FilesWatcher.scala b/src/main/scala/leon/utils/FilesWatcher.scala
index ca4a6727e..b4e579f5a 100644
--- a/src/main/scala/leon/utils/FilesWatcher.scala
+++ b/src/main/scala/leon/utils/FilesWatcher.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/FreeableIterator.scala b/src/main/scala/leon/utils/FreeableIterator.scala
index b288dcae4..ad2942c93 100644
--- a/src/main/scala/leon/utils/FreeableIterator.scala
+++ b/src/main/scala/leon/utils/FreeableIterator.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/GraphOps.scala b/src/main/scala/leon/utils/GraphOps.scala
index 3fede60e6..576694d68 100644
--- a/src/main/scala/leon/utils/GraphOps.scala
+++ b/src/main/scala/leon/utils/GraphOps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/GraphPrinters.scala b/src/main/scala/leon/utils/GraphPrinters.scala
index b86882f2d..c5fb26a09 100644
--- a/src/main/scala/leon/utils/GraphPrinters.scala
+++ b/src/main/scala/leon/utils/GraphPrinters.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Graphs.scala b/src/main/scala/leon/utils/Graphs.scala
index 1910c2aa2..9ac99b670 100644
--- a/src/main/scala/leon/utils/Graphs.scala
+++ b/src/main/scala/leon/utils/Graphs.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/GrowableIterable.scala b/src/main/scala/leon/utils/GrowableIterable.scala
index 5720f4967..89c03107d 100644
--- a/src/main/scala/leon/utils/GrowableIterable.scala
+++ b/src/main/scala/leon/utils/GrowableIterable.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.utils
 
 import scala.collection.mutable.ArrayBuffer
diff --git a/src/main/scala/leon/utils/IncrementalBijection.scala b/src/main/scala/leon/utils/IncrementalBijection.scala
index d90d68ec6..6dab6d670 100644
--- a/src/main/scala/leon/utils/IncrementalBijection.scala
+++ b/src/main/scala/leon/utils/IncrementalBijection.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/IncrementalMap.scala b/src/main/scala/leon/utils/IncrementalMap.scala
index b07d8adc1..aeaf32e09 100644
--- a/src/main/scala/leon/utils/IncrementalMap.scala
+++ b/src/main/scala/leon/utils/IncrementalMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/IncrementalSeq.scala b/src/main/scala/leon/utils/IncrementalSeq.scala
index fbf042868..7c7846c94 100644
--- a/src/main/scala/leon/utils/IncrementalSeq.scala
+++ b/src/main/scala/leon/utils/IncrementalSeq.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/IncrementalSet.scala b/src/main/scala/leon/utils/IncrementalSet.scala
index 311e55096..e0f8c9c53 100644
--- a/src/main/scala/leon/utils/IncrementalSet.scala
+++ b/src/main/scala/leon/utils/IncrementalSet.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/IncrementalState.scala b/src/main/scala/leon/utils/IncrementalState.scala
index 32f6b7c2b..a4df1acbe 100644
--- a/src/main/scala/leon/utils/IncrementalState.scala
+++ b/src/main/scala/leon/utils/IncrementalState.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.utils
 
 trait IncrementalState {
diff --git a/src/main/scala/leon/utils/InliningPhase.scala b/src/main/scala/leon/utils/InliningPhase.scala
index d69bbb9c3..22b75e162 100644
--- a/src/main/scala/leon/utils/InliningPhase.scala
+++ b/src/main/scala/leon/utils/InliningPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/InterruptManager.scala b/src/main/scala/leon/utils/InterruptManager.scala
index 40d8dd183..175018750 100644
--- a/src/main/scala/leon/utils/InterruptManager.scala
+++ b/src/main/scala/leon/utils/InterruptManager.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Interruptible.scala b/src/main/scala/leon/utils/Interruptible.scala
index a57cb7a39..8132c004c 100644
--- a/src/main/scala/leon/utils/Interruptible.scala
+++ b/src/main/scala/leon/utils/Interruptible.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Library.scala b/src/main/scala/leon/utils/Library.scala
index 0ddd21078..18dc12938 100644
--- a/src/main/scala/leon/utils/Library.scala
+++ b/src/main/scala/leon/utils/Library.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/ModelEnumerator.scala b/src/main/scala/leon/utils/ModelEnumerator.scala
index 7494e0c46..75fd2a0a3 100644
--- a/src/main/scala/leon/utils/ModelEnumerator.scala
+++ b/src/main/scala/leon/utils/ModelEnumerator.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 package utils
 
diff --git a/src/main/scala/leon/utils/OracleTraverser.scala b/src/main/scala/leon/utils/OracleTraverser.scala
index 507d2246e..0044dc695 100644
--- a/src/main/scala/leon/utils/OracleTraverser.scala
+++ b/src/main/scala/leon/utils/OracleTraverser.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Positions.scala b/src/main/scala/leon/utils/Positions.scala
index b97a58d56..74f999656 100644
--- a/src/main/scala/leon/utils/Positions.scala
+++ b/src/main/scala/leon/utils/Positions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/PreprocessingPhase.scala b/src/main/scala/leon/utils/PreprocessingPhase.scala
index 72103a4f7..3a0eaab30 100644
--- a/src/main/scala/leon/utils/PreprocessingPhase.scala
+++ b/src/main/scala/leon/utils/PreprocessingPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/PrintTreePhase.scala b/src/main/scala/leon/utils/PrintTreePhase.scala
index 90e12ee1c..87003c14d 100644
--- a/src/main/scala/leon/utils/PrintTreePhase.scala
+++ b/src/main/scala/leon/utils/PrintTreePhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/SCC.scala b/src/main/scala/leon/utils/SCC.scala
index dbde69fc1..7f5212d54 100644
--- a/src/main/scala/leon/utils/SCC.scala
+++ b/src/main/scala/leon/utils/SCC.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/SearchSpace.scala b/src/main/scala/leon/utils/SearchSpace.scala
index b013077c9..b514b72ff 100644
--- a/src/main/scala/leon/utils/SearchSpace.scala
+++ b/src/main/scala/leon/utils/SearchSpace.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/SeqUtils.scala b/src/main/scala/leon/utils/SeqUtils.scala
index ada749912..e55c1ac27 100644
--- a/src/main/scala/leon/utils/SeqUtils.scala
+++ b/src/main/scala/leon/utils/SeqUtils.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/Simplifiers.scala b/src/main/scala/leon/utils/Simplifiers.scala
index 4438b3840..26a62b298 100644
--- a/src/main/scala/leon/utils/Simplifiers.scala
+++ b/src/main/scala/leon/utils/Simplifiers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/StreamUtils.scala b/src/main/scala/leon/utils/StreamUtils.scala
index 521e98aa6..32c8e7c4b 100644
--- a/src/main/scala/leon/utils/StreamUtils.scala
+++ b/src/main/scala/leon/utils/StreamUtils.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/TemporaryInputPhase.scala b/src/main/scala/leon/utils/TemporaryInputPhase.scala
index 11b6efb68..bf5101b4c 100644
--- a/src/main/scala/leon/utils/TemporaryInputPhase.scala
+++ b/src/main/scala/leon/utils/TemporaryInputPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/TimeoutFor.scala b/src/main/scala/leon/utils/TimeoutFor.scala
index 7b11a9757..fa2b9aeca 100644
--- a/src/main/scala/leon/utils/TimeoutFor.scala
+++ b/src/main/scala/leon/utils/TimeoutFor.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/Timer.scala b/src/main/scala/leon/utils/Timer.scala
index 203f7b773..db5070e0d 100644
--- a/src/main/scala/leon/utils/Timer.scala
+++ b/src/main/scala/leon/utils/Timer.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/TypingPhase.scala b/src/main/scala/leon/utils/TypingPhase.scala
index 203c81e12..ca4e3a72b 100644
--- a/src/main/scala/leon/utils/TypingPhase.scala
+++ b/src/main/scala/leon/utils/TypingPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/UniqueCounter.scala b/src/main/scala/leon/utils/UniqueCounter.scala
index 7c7862747..e3c6ae0a1 100644
--- a/src/main/scala/leon/utils/UniqueCounter.scala
+++ b/src/main/scala/leon/utils/UniqueCounter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.utils
 
diff --git a/src/main/scala/leon/utils/UnitElimination.scala b/src/main/scala/leon/utils/UnitElimination.scala
index 45fa8bea4..d5aa0069e 100644
--- a/src/main/scala/leon/utils/UnitElimination.scala
+++ b/src/main/scala/leon/utils/UnitElimination.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package utils
diff --git a/src/main/scala/leon/utils/package.scala b/src/main/scala/leon/utils/package.scala
index 56ee940d2..09dc22742 100644
--- a/src/main/scala/leon/utils/package.scala
+++ b/src/main/scala/leon/utils/package.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon
 
 /** Various utilities used throughout the Leon system */
diff --git a/src/main/scala/leon/verification/DefaultTactic.scala b/src/main/scala/leon/verification/DefaultTactic.scala
index 244b38b30..9905d96ad 100644
--- a/src/main/scala/leon/verification/DefaultTactic.scala
+++ b/src/main/scala/leon/verification/DefaultTactic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/InductionTactic.scala b/src/main/scala/leon/verification/InductionTactic.scala
index dd437c224..d1ae3b0f9 100644
--- a/src/main/scala/leon/verification/InductionTactic.scala
+++ b/src/main/scala/leon/verification/InductionTactic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/InjectAsserts.scala b/src/main/scala/leon/verification/InjectAsserts.scala
index aa88b39de..faa5701f7 100644
--- a/src/main/scala/leon/verification/InjectAsserts.scala
+++ b/src/main/scala/leon/verification/InjectAsserts.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/Tactic.scala b/src/main/scala/leon/verification/Tactic.scala
index 8f539708d..008a03f5a 100644
--- a/src/main/scala/leon/verification/Tactic.scala
+++ b/src/main/scala/leon/verification/Tactic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/VerificationCondition.scala b/src/main/scala/leon/verification/VerificationCondition.scala
index 299307a87..1cbbf2103 100644
--- a/src/main/scala/leon/verification/VerificationCondition.scala
+++ b/src/main/scala/leon/verification/VerificationCondition.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.verification
 
diff --git a/src/main/scala/leon/verification/VerificationContext.scala b/src/main/scala/leon/verification/VerificationContext.scala
index 2aaa910ab..be8f9efe5 100644
--- a/src/main/scala/leon/verification/VerificationContext.scala
+++ b/src/main/scala/leon/verification/VerificationContext.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/VerificationPhase.scala b/src/main/scala/leon/verification/VerificationPhase.scala
index b9da4addb..c4b1427f0 100644
--- a/src/main/scala/leon/verification/VerificationPhase.scala
+++ b/src/main/scala/leon/verification/VerificationPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/verification/VerificationReport.scala b/src/main/scala/leon/verification/VerificationReport.scala
index d8184447b..847a23a2a 100644
--- a/src/main/scala/leon/verification/VerificationReport.scala
+++ b/src/main/scala/leon/verification/VerificationReport.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package verification
diff --git a/src/main/scala/leon/xlang/ArrayTransformation.scala b/src/main/scala/leon/xlang/ArrayTransformation.scala
index c283a1be7..7c66bc3eb 100644
--- a/src/main/scala/leon/xlang/ArrayTransformation.scala
+++ b/src/main/scala/leon/xlang/ArrayTransformation.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.xlang
 
diff --git a/src/main/scala/leon/xlang/EpsilonElimination.scala b/src/main/scala/leon/xlang/EpsilonElimination.scala
index 51b23be1b..5ab872b84 100644
--- a/src/main/scala/leon/xlang/EpsilonElimination.scala
+++ b/src/main/scala/leon/xlang/EpsilonElimination.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.xlang
 
diff --git a/src/main/scala/leon/xlang/ExprOps.scala b/src/main/scala/leon/xlang/ExprOps.scala
index 0f2a4db3d..a5013e5f8 100644
--- a/src/main/scala/leon/xlang/ExprOps.scala
+++ b/src/main/scala/leon/xlang/ExprOps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/main/scala/leon/xlang/Expressions.scala b/src/main/scala/leon/xlang/Expressions.scala
index 0f1dd6b98..802fa217f 100644
--- a/src/main/scala/leon/xlang/Expressions.scala
+++ b/src/main/scala/leon/xlang/Expressions.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/main/scala/leon/xlang/FixReportLabels.scala b/src/main/scala/leon/xlang/FixReportLabels.scala
index 187f45b49..7615ec437 100644
--- a/src/main/scala/leon/xlang/FixReportLabels.scala
+++ b/src/main/scala/leon/xlang/FixReportLabels.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/main/scala/leon/xlang/ImperativeCodeElimination.scala b/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
index 506cb86ce..89a5ad4cd 100644
--- a/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
+++ b/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala b/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
index 9c4330ca7..fc7c3f76b 100644
--- a/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
+++ b/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/main/scala/leon/xlang/XLangDesugaringPhase.scala b/src/main/scala/leon/xlang/XLangDesugaringPhase.scala
index 59dd32177..51c2721d0 100644
--- a/src/main/scala/leon/xlang/XLangDesugaringPhase.scala
+++ b/src/main/scala/leon/xlang/XLangDesugaringPhase.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package xlang
diff --git a/src/test/resources/regression/frontends/error/simple/ArrayEquals1.scala b/src/test/resources/regression/frontends/error/simple/ArrayEquals1.scala
index 39a9c4b2b..a0c3bd956 100644
--- a/src/test/resources/regression/frontends/error/simple/ArrayEquals1.scala
+++ b/src/test/resources/regression/frontends/error/simple/ArrayEquals1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang._
 
 object ArrayEqual1 {
diff --git a/src/test/resources/regression/frontends/error/simple/ArrayEquals2.scala b/src/test/resources/regression/frontends/error/simple/ArrayEquals2.scala
index 2035e0d45..15557c92b 100644
--- a/src/test/resources/regression/frontends/error/simple/ArrayEquals2.scala
+++ b/src/test/resources/regression/frontends/error/simple/ArrayEquals2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.lang._
 
 object ArrayEqual2 {
diff --git a/src/test/resources/regression/frontends/error/simple/Asserts.scala b/src/test/resources/regression/frontends/error/simple/Asserts.scala
index 3540c98dd..c841a166c 100644
--- a/src/test/resources/regression/frontends/error/simple/Asserts.scala
+++ b/src/test/resources/regression/frontends/error/simple/Asserts.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala b/src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala
index 655842702..b55bfc3f5 100644
--- a/src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala
+++ b/src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object ConvertBigInt {
 
diff --git a/src/test/resources/regression/frontends/error/simple/InstanceOf1.scala b/src/test/resources/regression/frontends/error/simple/InstanceOf1.scala
index d9cd815f2..3136bcc0b 100644
--- a/src/test/resources/regression/frontends/error/simple/InstanceOf1.scala
+++ b/src/test/resources/regression/frontends/error/simple/InstanceOf1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object InstanceOf1 {
 
diff --git a/src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala b/src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala
index e13bce4aa..68c1232f4 100644
--- a/src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala
+++ b/src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object LiteralBigInt {
 
diff --git a/src/test/resources/regression/frontends/error/simple/NotEquals.scala b/src/test/resources/regression/frontends/error/simple/NotEquals.scala
index 7a6d2f701..497e7d553 100644
--- a/src/test/resources/regression/frontends/error/simple/NotEquals.scala
+++ b/src/test/resources/regression/frontends/error/simple/NotEquals.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object NotEquals {
 
diff --git a/src/test/resources/regression/frontends/passing/ClassFields.scala b/src/test/resources/regression/frontends/passing/ClassFields.scala
index eda170f50..f9253cc99 100644
--- a/src/test/resources/regression/frontends/passing/ClassFields.scala
+++ b/src/test/resources/regression/frontends/passing/ClassFields.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ClassFields {
diff --git a/src/test/resources/regression/frontends/passing/Fields.scala b/src/test/resources/regression/frontends/passing/Fields.scala
index 4cf067d63..f6c83deb4 100644
--- a/src/test/resources/regression/frontends/passing/Fields.scala
+++ b/src/test/resources/regression/frontends/passing/Fields.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/frontends/passing/ImplicitDefs.scala b/src/test/resources/regression/frontends/passing/ImplicitDefs.scala
index 74f6f2b88..848aeb428 100644
--- a/src/test/resources/regression/frontends/passing/ImplicitDefs.scala
+++ b/src/test/resources/regression/frontends/passing/ImplicitDefs.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import scala.language.implicitConversions
 
diff --git a/src/test/resources/regression/frontends/passing/ImplicitDefs2.scala b/src/test/resources/regression/frontends/passing/ImplicitDefs2.scala
index dba63890b..d9b07c4ba 100644
--- a/src/test/resources/regression/frontends/passing/ImplicitDefs2.scala
+++ b/src/test/resources/regression/frontends/passing/ImplicitDefs2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.blup
 
 import leon._
diff --git a/src/test/resources/regression/frontends/passing/Operators.scala b/src/test/resources/regression/frontends/passing/Operators.scala
index a26b5c75b..ac539056d 100644
--- a/src/test/resources/regression/frontends/passing/Operators.scala
+++ b/src/test/resources/regression/frontends/passing/Operators.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Operators {
   
diff --git a/src/test/resources/regression/frontends/passing/OptParams.scala b/src/test/resources/regression/frontends/passing/OptParams.scala
index 5e4334acf..567cb842d 100644
--- a/src/test/resources/regression/frontends/passing/OptParams.scala
+++ b/src/test/resources/regression/frontends/passing/OptParams.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object OptParams {
 
diff --git a/src/test/resources/regression/frontends/passing/Overrides.scala b/src/test/resources/regression/frontends/passing/Overrides.scala
index c3be61be2..38342ce6a 100644
--- a/src/test/resources/regression/frontends/passing/Overrides.scala
+++ b/src/test/resources/regression/frontends/passing/Overrides.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Overrides {
 
   abstract class A[T] {
diff --git a/src/test/resources/regression/frontends/passing/bigintExtr.scala b/src/test/resources/regression/frontends/passing/bigintExtr.scala
index 983bd750e..349b75ec3 100644
--- a/src/test/resources/regression/frontends/passing/bigintExtr.scala
+++ b/src/test/resources/regression/frontends/passing/bigintExtr.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 
diff --git a/src/test/resources/regression/genc/invalid/AbsFun.scala b/src/test/resources/regression/genc/invalid/AbsFun.scala
index aff9a2c80..db7a92312 100644
--- a/src/test/resources/regression/genc/invalid/AbsFun.scala
+++ b/src/test/resources/regression/genc/invalid/AbsFun.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object AbsFun {
diff --git a/src/test/resources/regression/genc/invalid/LinearSearch.scala b/src/test/resources/regression/genc/invalid/LinearSearch.scala
index 88cadb0ef..60e5befe7 100644
--- a/src/test/resources/regression/genc/invalid/LinearSearch.scala
+++ b/src/test/resources/regression/genc/invalid/LinearSearch.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 /* The calculus of Computation textbook */
diff --git a/src/test/resources/regression/genc/unverified/BinarySearch.scala b/src/test/resources/regression/genc/unverified/BinarySearch.scala
index aec7d2b5d..666b98c4e 100644
--- a/src/test/resources/regression/genc/unverified/BinarySearch.scala
+++ b/src/test/resources/regression/genc/unverified/BinarySearch.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 /* VSTTE 2008 - Dafny paper */
diff --git a/src/test/resources/regression/genc/unverified/BinarySearchFun.scala b/src/test/resources/regression/genc/unverified/BinarySearchFun.scala
index ebc97f6c6..2e9e95760 100644
--- a/src/test/resources/regression/genc/unverified/BinarySearchFun.scala
+++ b/src/test/resources/regression/genc/unverified/BinarySearchFun.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object BinarySearchFun {
diff --git a/src/test/resources/regression/genc/unverified/MaxSum.scala b/src/test/resources/regression/genc/unverified/MaxSum.scala
index 033dfed30..ce1072948 100644
--- a/src/test/resources/regression/genc/unverified/MaxSum.scala
+++ b/src/test/resources/regression/genc/unverified/MaxSum.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 /* VSTTE 2010 challenge 1 */
diff --git a/src/test/resources/regression/genc/valid/AbsArray.scala b/src/test/resources/regression/genc/valid/AbsArray.scala
index 581684e7c..a7f25b3bb 100644
--- a/src/test/resources/regression/genc/valid/AbsArray.scala
+++ b/src/test/resources/regression/genc/valid/AbsArray.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object AbsArray {
diff --git a/src/test/resources/regression/genc/valid/CaseClass.scala b/src/test/resources/regression/genc/valid/CaseClass.scala
index 83f598859..4731fca05 100644
--- a/src/test/resources/regression/genc/valid/CaseClass.scala
+++ b/src/test/resources/regression/genc/valid/CaseClass.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object CaseClass {
diff --git a/src/test/resources/regression/genc/valid/ExpressionOrder.scala b/src/test/resources/regression/genc/valid/ExpressionOrder.scala
index 21ea9766d..ec81d038a 100644
--- a/src/test/resources/regression/genc/valid/ExpressionOrder.scala
+++ b/src/test/resources/regression/genc/valid/ExpressionOrder.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ExpressionOrder {
diff --git a/src/test/resources/regression/genc/valid/IntegralColor.scala b/src/test/resources/regression/genc/valid/IntegralColor.scala
index c64cb0fa1..8c42a620e 100644
--- a/src/test/resources/regression/genc/valid/IntegralColor.scala
+++ b/src/test/resources/regression/genc/valid/IntegralColor.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object IntegralColor {
diff --git a/src/test/resources/regression/genc/valid/RecursionAndNestedFunctions.scala b/src/test/resources/regression/genc/valid/RecursionAndNestedFunctions.scala
index 25f69538a..0202fae1e 100644
--- a/src/test/resources/regression/genc/valid/RecursionAndNestedFunctions.scala
+++ b/src/test/resources/regression/genc/valid/RecursionAndNestedFunctions.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object RecursionAndNestedFunctions {
diff --git a/src/test/resources/regression/genc/valid/TupleArray.scala b/src/test/resources/regression/genc/valid/TupleArray.scala
index 1f2354e06..c5ad57f1b 100644
--- a/src/test/resources/regression/genc/valid/TupleArray.scala
+++ b/src/test/resources/regression/genc/valid/TupleArray.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object TupleArray {
diff --git a/src/test/resources/regression/orb/combined/InsertionSort.scala b/src/test/resources/regression/orb/combined/InsertionSort.scala
index 8fd79a2e8..8f0d34367 100644
--- a/src/test/resources/regression/orb/combined/InsertionSort.scala
+++ b/src/test/resources/regression/orb/combined/InsertionSort.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 
diff --git a/src/test/resources/regression/orb/depth/BinaryTrie.scala b/src/test/resources/regression/orb/depth/BinaryTrie.scala
old mode 100755
new mode 100644
index 562ab19ea..c71939f3b
--- a/src/test/resources/regression/orb/depth/BinaryTrie.scala
+++ b/src/test/resources/regression/orb/depth/BinaryTrie.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.instrumentation._
 import leon.invariant._
 
diff --git a/src/test/resources/regression/orb/depth/Folds.scala b/src/test/resources/regression/orb/depth/Folds.scala
old mode 100755
new mode 100644
index 305446be5..b80235514
--- a/src/test/resources/regression/orb/depth/Folds.scala
+++ b/src/test/resources/regression/orb/depth/Folds.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.instrumentation._
 import leon.invariant._
 
diff --git a/src/test/resources/regression/orb/depth/ListOperations.scala b/src/test/resources/regression/orb/depth/ListOperations.scala
index 7d77ba834..b9c9418de 100644
--- a/src/test/resources/regression/orb/depth/ListOperations.scala
+++ b/src/test/resources/regression/orb/depth/ListOperations.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.instrumentation._
 import leon.invariant._
 import leon.annotation._
diff --git a/src/test/resources/regression/orb/depth/PropLogicDepth.scala b/src/test/resources/regression/orb/depth/PropLogicDepth.scala
index 881cd61a4..8470737ba 100644
--- a/src/test/resources/regression/orb/depth/PropLogicDepth.scala
+++ b/src/test/resources/regression/orb/depth/PropLogicDepth.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import scala.collection.immutable.Set
 import leon.instrumentation._
 import leon.invariant._
diff --git a/src/test/resources/regression/orb/numerical/ConcatVariationsAbs.scala b/src/test/resources/regression/orb/numerical/ConcatVariationsAbs.scala
index bff880ab3..4c8c16722 100644
--- a/src/test/resources/regression/orb/numerical/ConcatVariationsAbs.scala
+++ b/src/test/resources/regression/orb/numerical/ConcatVariationsAbs.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 
 object ConcatVariationsAbs {
diff --git a/src/test/resources/regression/orb/numerical/QueueAbs.scala b/src/test/resources/regression/orb/numerical/QueueAbs.scala
index a7aee3a93..caaae2d1d 100644
--- a/src/test/resources/regression/orb/numerical/QueueAbs.scala
+++ b/src/test/resources/regression/orb/numerical/QueueAbs.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 
 object AmortizedQueue {
diff --git a/src/test/resources/regression/orb/numerical/SimpleLoop.scala b/src/test/resources/regression/orb/numerical/SimpleLoop.scala
old mode 100755
new mode 100644
index 6a2cdb3d9..741d242bb
--- a/src/test/resources/regression/orb/numerical/SimpleLoop.scala
+++ b/src/test/resources/regression/orb/numerical/SimpleLoop.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object SimpleLoop
 {
 	def s(x: BigInt) : BigInt = {
diff --git a/src/test/resources/regression/orb/numerical/see-saw.scala b/src/test/resources/regression/orb/numerical/see-saw.scala
index 894a8caed..fe3c8dc63 100644
--- a/src/test/resources/regression/orb/numerical/see-saw.scala
+++ b/src/test/resources/regression/orb/numerical/see-saw.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object SeeSaw {
   def s(x: BigInt, y: BigInt, z: BigInt): BigInt = {
     require(y >= 0)
diff --git a/src/test/resources/regression/orb/stack/BinaryTrie.scala b/src/test/resources/regression/orb/stack/BinaryTrie.scala
index f2dfd876c..21b7e7c89 100644
--- a/src/test/resources/regression/orb/stack/BinaryTrie.scala
+++ b/src/test/resources/regression/orb/stack/BinaryTrie.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 //import scala.collection.immutable.Set
diff --git a/src/test/resources/regression/orb/stack/ListOperations.scala b/src/test/resources/regression/orb/stack/ListOperations.scala
index 3ae4a2d17..7323f1a3e 100644
--- a/src/test/resources/regression/orb/stack/ListOperations.scala
+++ b/src/test/resources/regression/orb/stack/ListOperations.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 
diff --git a/src/test/resources/regression/orb/stack/SpeedBenchmarks.scala b/src/test/resources/regression/orb/stack/SpeedBenchmarks.scala
index c1c59d592..8a65f1381 100644
--- a/src/test/resources/regression/orb/stack/SpeedBenchmarks.scala
+++ b/src/test/resources/regression/orb/stack/SpeedBenchmarks.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 import leon.math._
diff --git a/src/test/resources/regression/orb/timing/BinaryTrie.scala b/src/test/resources/regression/orb/timing/BinaryTrie.scala
index a1de6ee0e..431551014 100644
--- a/src/test/resources/regression/orb/timing/BinaryTrie.scala
+++ b/src/test/resources/regression/orb/timing/BinaryTrie.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 
diff --git a/src/test/resources/regression/orb/timing/ConcatVariations.scala b/src/test/resources/regression/orb/timing/ConcatVariations.scala
index a94fb418a..519cef287 100644
--- a/src/test/resources/regression/orb/timing/ConcatVariations.scala
+++ b/src/test/resources/regression/orb/timing/ConcatVariations.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 
diff --git a/src/test/resources/regression/orb/timing/ListOperations.scala b/src/test/resources/regression/orb/timing/ListOperations.scala
index 13b031b4d..e4c486dcd 100644
--- a/src/test/resources/regression/orb/timing/ListOperations.scala
+++ b/src/test/resources/regression/orb/timing/ListOperations.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.invariant._
 import leon.instrumentation._
 
diff --git a/src/test/resources/regression/orb/timing/PropositionalLogic.scala b/src/test/resources/regression/orb/timing/PropositionalLogic.scala
index 22dfdcdec..e7ed2b10a 100644
--- a/src/test/resources/regression/orb/timing/PropositionalLogic.scala
+++ b/src/test/resources/regression/orb/timing/PropositionalLogic.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import scala.collection.immutable.Set
 import leon.invariant._
 import leon.instrumentation._
diff --git a/src/test/resources/regression/orb/timing/SimpleMap.scala b/src/test/resources/regression/orb/timing/SimpleMap.scala
index 86e2c7b7b..3b347be92 100644
--- a/src/test/resources/regression/orb/timing/SimpleMap.scala
+++ b/src/test/resources/regression/orb/timing/SimpleMap.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.instrumentation._
 import leon.invariant._
 
diff --git a/src/test/resources/regression/performance/cegis/Add.scala b/src/test/resources/regression/performance/cegis/Add.scala
index 5931eeb59..81cde689f 100644
--- a/src/test/resources/regression/performance/cegis/Add.scala
+++ b/src/test/resources/regression/performance/cegis/Add.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/performance/cegis/Distinct.scala b/src/test/resources/regression/performance/cegis/Distinct.scala
index a6fb4881c..e47af67df 100644
--- a/src/test/resources/regression/performance/cegis/Distinct.scala
+++ b/src/test/resources/regression/performance/cegis/Distinct.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/performance/cegis/Hole1.scala b/src/test/resources/regression/performance/cegis/Hole1.scala
index 354dcb72c..ce983abae 100644
--- a/src/test/resources/regression/performance/cegis/Hole1.scala
+++ b/src/test/resources/regression/performance/cegis/Hole1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.collection._
diff --git a/src/test/resources/regression/performance/cegis/Length.scala b/src/test/resources/regression/performance/cegis/Length.scala
index 2e38e0a18..04462a0b8 100644
--- a/src/test/resources/regression/performance/cegis/Length.scala
+++ b/src/test/resources/regression/performance/cegis/Length.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/performance/cegis/Mult.scala b/src/test/resources/regression/performance/cegis/Mult.scala
index 9f8f422c6..3b3b9b80d 100644
--- a/src/test/resources/regression/performance/cegis/Mult.scala
+++ b/src/test/resources/regression/performance/cegis/Mult.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/performance/cegis/Squared.scala b/src/test/resources/regression/performance/cegis/Squared.scala
index 5d7877469..1e2e6d27d 100644
--- a/src/test/resources/regression/performance/cegis/Squared.scala
+++ b/src/test/resources/regression/performance/cegis/Squared.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/repair/Compiler1.scala b/src/test/resources/regression/repair/Compiler1.scala
index 300868d67..ffd0bdaee 100644
--- a/src/test/resources/regression/repair/Compiler1.scala
+++ b/src/test/resources/regression/repair/Compiler1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/repair/Heap3.scala b/src/test/resources/regression/repair/Heap3.scala
index 3305b5d15..7d788a3a0 100644
--- a/src/test/resources/regression/repair/Heap3.scala
+++ b/src/test/resources/regression/repair/Heap3.scala
@@ -1,6 +1,6 @@
-/* Copyright 2009-2015 EPFL, Lausanne
- *
- * Author: Ravi
+/* Copyright 2009-2016 EPFL, Lausanne */
+ 
+/** Author: Ravi
  * Date: 20.11.2013
  **/
 
diff --git a/src/test/resources/regression/repair/Heap4.scala b/src/test/resources/regression/repair/Heap4.scala
index 937e29b5c..ad09821ee 100644
--- a/src/test/resources/regression/repair/Heap4.scala
+++ b/src/test/resources/regression/repair/Heap4.scala
@@ -1,7 +1,8 @@
-/* Copyright 2009-2015 EPFL, Lausanne
- * Author: Ravi
+/* Copyright 2009-2016 EPFL, Lausanne */
+
+/* Author: Ravi
  * Date: 20.11.2013
- **/
+ */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/repair/List1.scala b/src/test/resources/regression/repair/List1.scala
index 79b7ecb44..4031f652f 100644
--- a/src/test/resources/regression/repair/List1.scala
+++ b/src/test/resources/regression/repair/List1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.custom
 
diff --git a/src/test/resources/regression/repair/ListEasy.scala b/src/test/resources/regression/repair/ListEasy.scala
index 13590231c..d22286dce 100644
--- a/src/test/resources/regression/repair/ListEasy.scala
+++ b/src/test/resources/regression/repair/ListEasy.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.custom
 
diff --git a/src/test/resources/regression/repair/MergeSort2.scala b/src/test/resources/regression/repair/MergeSort2.scala
index 4447edc40..9435d1e31 100644
--- a/src/test/resources/regression/repair/MergeSort2.scala
+++ b/src/test/resources/regression/repair/MergeSort2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.collection._
diff --git a/src/test/resources/regression/synthesis/Church/Add.scala b/src/test/resources/regression/synthesis/Church/Add.scala
index c94fc4c7f..460e1651e 100644
--- a/src/test/resources/regression/synthesis/Church/Add.scala
+++ b/src/test/resources/regression/synthesis/Church/Add.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/Church/Distinct.scala b/src/test/resources/regression/synthesis/Church/Distinct.scala
index b7f093e9f..53379f02c 100644
--- a/src/test/resources/regression/synthesis/Church/Distinct.scala
+++ b/src/test/resources/regression/synthesis/Church/Distinct.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/Church/Mult.scala b/src/test/resources/regression/synthesis/Church/Mult.scala
index bc4afe213..6c8e0f088 100644
--- a/src/test/resources/regression/synthesis/Church/Mult.scala
+++ b/src/test/resources/regression/synthesis/Church/Mult.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/Church/Squared.scala b/src/test/resources/regression/synthesis/Church/Squared.scala
index 92ac747b8..9c7f04233 100644
--- a/src/test/resources/regression/synthesis/Church/Squared.scala
+++ b/src/test/resources/regression/synthesis/Church/Squared.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/Examples/Length.scala b/src/test/resources/regression/synthesis/Examples/Length.scala
index 2e38e0a18..04462a0b8 100644
--- a/src/test/resources/regression/synthesis/Examples/Length.scala
+++ b/src/test/resources/regression/synthesis/Examples/Length.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/synthesis/Holes/Hole1.scala b/src/test/resources/regression/synthesis/Holes/Hole1.scala
index 354dcb72c..ce983abae 100644
--- a/src/test/resources/regression/synthesis/Holes/Hole1.scala
+++ b/src/test/resources/regression/synthesis/Holes/Hole1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.collection._
diff --git a/src/test/resources/regression/synthesis/List/Delete.scala b/src/test/resources/regression/synthesis/List/Delete.scala
index 0c82b3da4..15d616369 100644
--- a/src/test/resources/regression/synthesis/List/Delete.scala
+++ b/src/test/resources/regression/synthesis/List/Delete.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/List/Diff.scala b/src/test/resources/regression/synthesis/List/Diff.scala
index 477ea0bdb..2e1136aea 100644
--- a/src/test/resources/regression/synthesis/List/Diff.scala
+++ b/src/test/resources/regression/synthesis/List/Diff.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/List/Insert.scala b/src/test/resources/regression/synthesis/List/Insert.scala
index c98947bb1..831fa6815 100644
--- a/src/test/resources/regression/synthesis/List/Insert.scala
+++ b/src/test/resources/regression/synthesis/List/Insert.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/List/Split1.scala b/src/test/resources/regression/synthesis/List/Split1.scala
index 66def0ffa..91b089a36 100644
--- a/src/test/resources/regression/synthesis/List/Split1.scala
+++ b/src/test/resources/regression/synthesis/List/Split1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/List/Split2.scala b/src/test/resources/regression/synthesis/List/Split2.scala
index 5d66b4a59..1bcfacd85 100644
--- a/src/test/resources/regression/synthesis/List/Split2.scala
+++ b/src/test/resources/regression/synthesis/List/Split2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/List/Split3.scala b/src/test/resources/regression/synthesis/List/Split3.scala
index eca76884d..35fe12e7e 100644
--- a/src/test/resources/regression/synthesis/List/Split3.scala
+++ b/src/test/resources/regression/synthesis/List/Split3.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/List/Union.scala b/src/test/resources/regression/synthesis/List/Union.scala
index c36a5933c..8c4a4e71d 100644
--- a/src/test/resources/regression/synthesis/List/Union.scala
+++ b/src/test/resources/regression/synthesis/List/Union.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/synthesis/Misc/HolesBug.scala b/src/test/resources/regression/synthesis/Misc/HolesBug.scala
index 47db91b99..4a7ccb568 100644
--- a/src/test/resources/regression/synthesis/Misc/HolesBug.scala
+++ b/src/test/resources/regression/synthesis/Misc/HolesBug.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/Misc/Unapply.scala b/src/test/resources/regression/synthesis/Misc/Unapply.scala
index 0489202c0..f7f2c232d 100644
--- a/src/test/resources/regression/synthesis/Misc/Unapply.scala
+++ b/src/test/resources/regression/synthesis/Misc/Unapply.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._ 
 import leon.lang.synthesis._
 
diff --git a/src/test/resources/regression/synthesis/SortedList/Delete.scala b/src/test/resources/regression/synthesis/SortedList/Delete.scala
index 31305ca09..ca2886154 100644
--- a/src/test/resources/regression/synthesis/SortedList/Delete.scala
+++ b/src/test/resources/regression/synthesis/SortedList/Delete.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/SortedList/Diff.scala b/src/test/resources/regression/synthesis/SortedList/Diff.scala
index 9e4e32bae..99813b197 100644
--- a/src/test/resources/regression/synthesis/SortedList/Diff.scala
+++ b/src/test/resources/regression/synthesis/SortedList/Diff.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/SortedList/Insert1.scala b/src/test/resources/regression/synthesis/SortedList/Insert1.scala
index affc5b455..3aac75ecd 100644
--- a/src/test/resources/regression/synthesis/SortedList/Insert1.scala
+++ b/src/test/resources/regression/synthesis/SortedList/Insert1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/SortedList/Insert2.scala b/src/test/resources/regression/synthesis/SortedList/Insert2.scala
index e44eac286..7327dafaf 100644
--- a/src/test/resources/regression/synthesis/SortedList/Insert2.scala
+++ b/src/test/resources/regression/synthesis/SortedList/Insert2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/SortedList/InsertSort.scala b/src/test/resources/regression/synthesis/SortedList/InsertSort.scala
index 8f5b78247..4e319f357 100644
--- a/src/test/resources/regression/synthesis/SortedList/InsertSort.scala
+++ b/src/test/resources/regression/synthesis/SortedList/InsertSort.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/SortedList/Union.scala b/src/test/resources/regression/synthesis/SortedList/Union.scala
index 95d17bb61..7df087b85 100644
--- a/src/test/resources/regression/synthesis/SortedList/Union.scala
+++ b/src/test/resources/regression/synthesis/SortedList/Union.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/StrictSortedList/Delete.scala b/src/test/resources/regression/synthesis/StrictSortedList/Delete.scala
index 81827ed03..6e75398bf 100644
--- a/src/test/resources/regression/synthesis/StrictSortedList/Delete.scala
+++ b/src/test/resources/regression/synthesis/StrictSortedList/Delete.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/StrictSortedList/Insert.scala b/src/test/resources/regression/synthesis/StrictSortedList/Insert.scala
index 6c7543ad3..4f9e644f8 100644
--- a/src/test/resources/regression/synthesis/StrictSortedList/Insert.scala
+++ b/src/test/resources/regression/synthesis/StrictSortedList/Insert.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/synthesis/StrictSortedList/Union.scala b/src/test/resources/regression/synthesis/StrictSortedList/Union.scala
index cf2fcd727..3765c92eb 100644
--- a/src/test/resources/regression/synthesis/StrictSortedList/Union.scala
+++ b/src/test/resources/regression/synthesis/StrictSortedList/Union.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.annotation._
diff --git a/src/test/resources/regression/termination/looping/LambdaCalculus.scala b/src/test/resources/regression/termination/looping/LambdaCalculus.scala
index d24d8c31b..16026eed8 100644
--- a/src/test/resources/regression/termination/looping/LambdaCalculus.scala
+++ b/src/test/resources/regression/termination/looping/LambdaCalculus.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/termination/looping/Numeric1.scala b/src/test/resources/regression/termination/looping/Numeric1.scala
index 877015620..aa5ecb678 100644
--- a/src/test/resources/regression/termination/looping/Numeric1.scala
+++ b/src/test/resources/regression/termination/looping/Numeric1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/looping/Numeric2.scala b/src/test/resources/regression/termination/looping/Numeric2.scala
index 4942b8456..0ce10f198 100644
--- a/src/test/resources/regression/termination/looping/Numeric2.scala
+++ b/src/test/resources/regression/termination/looping/Numeric2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/looping/Numeric3.scala b/src/test/resources/regression/termination/looping/Numeric3.scala
index d093b3163..adf5dbea6 100644
--- a/src/test/resources/regression/termination/looping/Numeric3.scala
+++ b/src/test/resources/regression/termination/looping/Numeric3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/looping/OddEven.scala b/src/test/resources/regression/termination/looping/OddEven.scala
index 078b4c258..1a2497777 100644
--- a/src/test/resources/regression/termination/looping/OddEven.scala
+++ b/src/test/resources/regression/termination/looping/OddEven.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 object Test {
 
diff --git a/src/test/resources/regression/termination/looping/Queue.scala b/src/test/resources/regression/termination/looping/Queue.scala
index 3df1a9ac5..7685817f0 100644
--- a/src/test/resources/regression/termination/looping/Queue.scala
+++ b/src/test/resources/regression/termination/looping/Queue.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/termination/looping/Termination_failling1.scala b/src/test/resources/regression/termination/looping/Termination_failling1.scala
index a901a791b..ecadd0e62 100644
--- a/src/test/resources/regression/termination/looping/Termination_failling1.scala
+++ b/src/test/resources/regression/termination/looping/Termination_failling1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/looping/UniversalEquality.scala b/src/test/resources/regression/termination/looping/UniversalEquality.scala
index 7b7181a6f..15d8ec7e9 100644
--- a/src/test/resources/regression/termination/looping/UniversalEquality.scala
+++ b/src/test/resources/regression/termination/looping/UniversalEquality.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/termination/looping/WrongFibonacci.scala b/src/test/resources/regression/termination/looping/WrongFibonacci.scala
index 9911ee76d..7e9b4938b 100644
--- a/src/test/resources/regression/termination/looping/WrongFibonacci.scala
+++ b/src/test/resources/regression/termination/looping/WrongFibonacci.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 object Test {
   
diff --git a/src/test/resources/regression/termination/valid/CountTowardsZero.scala b/src/test/resources/regression/termination/valid/CountTowardsZero.scala
index e0ce187ad..46163dbd0 100644
--- a/src/test/resources/regression/termination/valid/CountTowardsZero.scala
+++ b/src/test/resources/regression/termination/valid/CountTowardsZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 object Test {
   def f(x: BigInt): BigInt = {
diff --git a/src/test/resources/regression/termination/valid/Fibonacci.scala b/src/test/resources/regression/termination/valid/Fibonacci.scala
index dfa133e6b..8ea557156 100644
--- a/src/test/resources/regression/termination/valid/Fibonacci.scala
+++ b/src/test/resources/regression/termination/valid/Fibonacci.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Fibonacci {
   def fib(x: BigInt) : BigInt = {
diff --git a/src/test/resources/regression/termination/valid/HOTermination.scala b/src/test/resources/regression/termination/valid/HOTermination.scala
index da05e5ba8..8947a89ca 100644
--- a/src/test/resources/regression/termination/valid/HOTermination.scala
+++ b/src/test/resources/regression/termination/valid/HOTermination.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 
 import leon.lang._
diff --git a/src/test/resources/regression/termination/valid/ListWithSize.scala b/src/test/resources/regression/termination/valid/ListWithSize.scala
index af8aafeb8..b432e6554 100644
--- a/src/test/resources/regression/termination/valid/ListWithSize.scala
+++ b/src/test/resources/regression/termination/valid/ListWithSize.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/termination/valid/NNF.scala b/src/test/resources/regression/termination/valid/NNF.scala
index 455cef7ec..32ecd1916 100644
--- a/src/test/resources/regression/termination/valid/NNF.scala
+++ b/src/test/resources/regression/termination/valid/NNF.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 
diff --git a/src/test/resources/regression/termination/valid/Numeric1.scala b/src/test/resources/regression/termination/valid/Numeric1.scala
index 60a9f841b..684aeb403 100644
--- a/src/test/resources/regression/termination/valid/Numeric1.scala
+++ b/src/test/resources/regression/termination/valid/Numeric1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/valid/Queue.scala b/src/test/resources/regression/termination/valid/Queue.scala
index dee019a41..742bc1982 100644
--- a/src/test/resources/regression/termination/valid/Queue.scala
+++ b/src/test/resources/regression/termination/valid/Queue.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/termination/valid/QuickSort.scala b/src/test/resources/regression/termination/valid/QuickSort.scala
index d4fb11ea6..ca3396ab8 100644
--- a/src/test/resources/regression/termination/valid/QuickSort.scala
+++ b/src/test/resources/regression/termination/valid/QuickSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/termination/valid/RedBlackTree.scala b/src/test/resources/regression/termination/valid/RedBlackTree.scala
index 2d48a25e0..9990cdc09 100644
--- a/src/test/resources/regression/termination/valid/RedBlackTree.scala
+++ b/src/test/resources/regression/termination/valid/RedBlackTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/termination/valid/SimpInterpret.scala b/src/test/resources/regression/termination/valid/SimpInterpret.scala
index c5255506d..dc9b5d5f9 100644
--- a/src/test/resources/regression/termination/valid/SimpInterpret.scala
+++ b/src/test/resources/regression/termination/valid/SimpInterpret.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/termination/valid/Termination_passing1.scala b/src/test/resources/regression/termination/valid/Termination_passing1.scala
index 2f429ad05..389e60a5f 100644
--- a/src/test/resources/regression/termination/valid/Termination_passing1.scala
+++ b/src/test/resources/regression/termination/valid/Termination_passing1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/transformations/SimplifyLets.scala b/src/test/resources/regression/transformations/SimplifyLets.scala
index 6d118e9bf..62fd3f7a4 100644
--- a/src/test/resources/regression/transformations/SimplifyLets.scala
+++ b/src/test/resources/regression/transformations/SimplifyLets.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/transformations/SimplifyPaths.scala b/src/test/resources/regression/transformations/SimplifyPaths.scala
index 1c5af48a7..17d3a80b6 100644
--- a/src/test/resources/regression/transformations/SimplifyPaths.scala
+++ b/src/test/resources/regression/transformations/SimplifyPaths.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/isabelle/error/FunctionsWrong.scala b/src/test/resources/regression/verification/isabelle/error/FunctionsWrong.scala
index 54b2bec14..bd1a65c53 100644
--- a/src/test/resources/regression/verification/isabelle/error/FunctionsWrong.scala
+++ b/src/test/resources/regression/verification/isabelle/error/FunctionsWrong.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon._
 import leon.annotation._
 import leon.collection._
diff --git a/src/test/resources/regression/verification/isabelle/error/MutualWrong.scala b/src/test/resources/regression/verification/isabelle/error/MutualWrong.scala
index 16fd3ee9b..5a006fa7f 100644
--- a/src/test/resources/regression/verification/isabelle/error/MutualWrong.scala
+++ b/src/test/resources/regression/verification/isabelle/error/MutualWrong.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/isabelle/error/TypesWrong.scala b/src/test/resources/regression/verification/isabelle/error/TypesWrong.scala
index a3772cc75..505e23d86 100644
--- a/src/test/resources/regression/verification/isabelle/error/TypesWrong.scala
+++ b/src/test/resources/regression/verification/isabelle/error/TypesWrong.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon._
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/isabelle/unknown/Casts.scala b/src/test/resources/regression/verification/isabelle/unknown/Casts.scala
index c1f8844f0..2d0ef020e 100644
--- a/src/test/resources/regression/verification/isabelle/unknown/Casts.scala
+++ b/src/test/resources/regression/verification/isabelle/unknown/Casts.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon._
 import leon.annotation._
 import leon.collection._
diff --git a/src/test/resources/regression/verification/isabelle/unknown/Mutual.scala b/src/test/resources/regression/verification/isabelle/unknown/Mutual.scala
index 5b14a2b86..3f25ef9b2 100644
--- a/src/test/resources/regression/verification/isabelle/unknown/Mutual.scala
+++ b/src/test/resources/regression/verification/isabelle/unknown/Mutual.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/isabelle/valid/Datatypes.scala b/src/test/resources/regression/verification/isabelle/valid/Datatypes.scala
index 0da6b7026..feea22f60 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Datatypes.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Datatypes.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/isabelle/valid/Lists.scala b/src/test/resources/regression/verification/isabelle/valid/Lists.scala
index be3292851..0eaeafc81 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Lists.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Lists.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon._
 import leon.annotation._
 import leon.collection._
diff --git a/src/test/resources/regression/verification/isabelle/valid/Nats.scala b/src/test/resources/regression/verification/isabelle/valid/Nats.scala
index 4838665b6..f679173dd 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Nats.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Nats.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/isabelle/valid/Overlapping.scala b/src/test/resources/regression/verification/isabelle/valid/Overlapping.scala
index 330f75530..8c9d606f0 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Overlapping.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Overlapping.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/isabelle/valid/Quantifiers.scala b/src/test/resources/regression/verification/isabelle/valid/Quantifiers.scala
index b0e815c57..ba950b239 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Quantifiers.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Quantifiers.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Quantifiers {
diff --git a/src/test/resources/regression/verification/isabelle/valid/Reals.scala b/src/test/resources/regression/verification/isabelle/valid/Reals.scala
index e4b963518..c7f370bab 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Reals.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Reals.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon._
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/isabelle/valid/Unapply.scala b/src/test/resources/regression/verification/isabelle/valid/Unapply.scala
index 8a00fd5db..6569f180c 100644
--- a/src/test/resources/regression/verification/isabelle/valid/Unapply.scala
+++ b/src/test/resources/regression/verification/isabelle/valid/Unapply.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.collection._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Acc.scala b/src/test/resources/regression/verification/newsolvers/invalid/Acc.scala
index 2edd23ab7..2005a7d03 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Acc.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Acc.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala b/src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
index 897aceefa..98f5de2e2 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package test.resources.regression.verification.purescala.invalid
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
index fa89830c4..6bebade95 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object AddingPositiveNumbers {
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Array1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array1.scala
index a7e3fea8e..3707c62e6 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Array1.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Array2.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array2.scala
index 3996f1fb7..b241dc8cb 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Array2.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Array2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Array3.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array3.scala
index f5c75c538..4307c3982 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Array3.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Array3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Array4.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array4.scala
index d7875d9b3..35a6479b9 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Array4.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Array4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala
index 4375995d5..73ec19af5 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala
index a2572db84..bbd8bb508 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
index c11405429..ab320c8c3 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala b/src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala
index 1395a1e89..a4a4a6a05 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Division.scala b/src/test/resources/regression/verification/newsolvers/invalid/Division.scala
index 6b505a773..1678d2db8 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Division.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Division.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala b/src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
index 239cb7db2..32b47ae9c 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
index 0cb31c890..17af7c45e 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Generics.scala b/src/test/resources/regression/verification/newsolvers/invalid/Generics.scala
index 21971e521..991b948d9 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Generics.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Generics.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala b/src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala
index 32d97e003..0c95c311e 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala b/src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
index d82f045b5..ddf735282 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala b/src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala
index 196353358..cd801dc9e 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
index f2aa840a8..394e2cd9f 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
index 0bd3d302f..76b8e64cf 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple2 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
index cd514455b..abc0ffba3 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple3 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala b/src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
index c9f290853..eaf345dd9 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala b/src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
index 547978dbc..18b36ebf0 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala b/src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
index c0d4fd9a6..7ac05413c 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala
index d286487c0..f937daaa9 100644
--- a/src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala
+++ b/src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Acc.scala b/src/test/resources/regression/verification/newsolvers/valid/Acc.scala
index 6dce9c294..6f93027c9 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Acc.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Acc.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
index 0b269eded..84fca5dc6 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object AddingPositiveNumbers {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala b/src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
index d3ad0237a..5d60e67bf 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
index c3496b157..450a07a7e 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 object ArrayLiterals {
diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
index e60918b64..d501089cf 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
index 6d6ec65a3..aadcfde99 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 import leon._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala b/src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala
index 39cc5b732..bbc4edf5d 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala b/src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
index 6da51350f..b40aac4f8 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala b/src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala
index 561f38a19..6475d9117 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala b/src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala
index 4a71c913a..318af6680 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object CaseObject1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Field1.scala b/src/test/resources/regression/verification/newsolvers/valid/Field1.scala
index be10c683d..8c410b3d9 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Field1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Field1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Field1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Field2.scala b/src/test/resources/regression/verification/newsolvers/valid/Field2.scala
index 6b52ca258..db42516e5 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Field2.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Field2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Field2 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
index a9b5ff6b6..ab85023cb 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala b/src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
index 4fd46f85f..dfc11de52 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Generics.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics.scala
index 14045bf32..86ee9d50c 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Generics.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Generics.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
index d269f2178..e054b629f 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala b/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
index 876fb5a2a..0e2ca3405 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala b/src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala
index 3252c9acf..655f84797 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala b/src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
index 6543f94e5..6901da6c8 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object InstanceOf1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala b/src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala
index d54b5b86e..47283ef72 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala b/src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
index eea0009f2..a0f2d22f3 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
@@ -1,5 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-import leon.lang._
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 object LiteralMaps {
   def test(): Map[Int, Int] = {
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala b/src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala
index 2776a86c2..99681add4 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyMap.scala b/src/test/resources/regression/verification/newsolvers/valid/MyMap.scala
index 4f656c596..9cb5fa4b3 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyMap.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MySet.scala b/src/test/resources/regression/verification/newsolvers/valid/MySet.scala
index b19be90e7..13efa589e 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MySet.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MySet.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala
index 9aa42ce05..55ba48e8e 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala
index 05124ffbe..8683adcde 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple2 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala
index 20bb0eec9..db4f82411 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple3 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala
index 8b2ede8f2..6dd4d3c1c 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 
 object MyTuple4 {
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala
index 78c93bc2a..d8fff8878 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple5 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala
index e6cff3917..f8cc1b423 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple6 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Nat.scala b/src/test/resources/regression/verification/newsolvers/valid/Nat.scala
index 498373c4a..b766230ab 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Nat.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Nat.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala b/src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala
index f33e1bb5d..31a4bc763 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.annotation._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala b/src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala
index 93c87331e..a9a07c985 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala b/src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
index 66e3f84ec..fa7c0cf48 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala b/src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
index e24935bbe..a40068e70 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala b/src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
index ba2380c6a..49fad8682 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala b/src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala
index e31801436..f971d2a59 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala b/src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala
index eef9c65da..bbb436b6a 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Unit1.scala b/src/test/resources/regression/verification/newsolvers/valid/Unit1.scala
index a0683d303..596f7cc31 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Unit1.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Unit1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit1 {
 
diff --git a/src/test/resources/regression/verification/newsolvers/valid/Unit2.scala b/src/test/resources/regression/verification/newsolvers/valid/Unit2.scala
index 8a285ff23..1aa3cf55b 100644
--- a/src/test/resources/regression/verification/newsolvers/valid/Unit2.scala
+++ b/src/test/resources/regression/verification/newsolvers/valid/Unit2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit2 {
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Acc.scala b/src/test/resources/regression/verification/purescala/invalid/Acc.scala
index d1f8810de..2005a7d03 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Acc.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Acc.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala b/src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
index 897aceefa..98f5de2e2 100644
--- a/src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package test.resources.regression.verification.purescala.invalid
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
index fa89830c4..6bebade95 100644
--- a/src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object AddingPositiveNumbers {
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array1.scala b/src/test/resources/regression/verification/purescala/invalid/Array1.scala
index a7e3fea8e..3707c62e6 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array2.scala b/src/test/resources/regression/verification/purescala/invalid/Array2.scala
index 3996f1fb7..b241dc8cb 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array3.scala b/src/test/resources/regression/verification/purescala/invalid/Array3.scala
index f5c75c538..4307c3982 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array3.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array4.scala b/src/test/resources/regression/verification/purescala/invalid/Array4.scala
index d7875d9b3..35a6479b9 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array4.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array5.scala b/src/test/resources/regression/verification/purescala/invalid/Array5.scala
index 2adb7e5c5..d98816940 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array5.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array6.scala b/src/test/resources/regression/verification/purescala/invalid/Array6.scala
index 18a1e7ab0..d856d9e9e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array6.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Array7.scala b/src/test/resources/regression/verification/purescala/invalid/Array7.scala
index dcf7059f8..9c2c788f7 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Array7.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Array7.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Asserts1.scala b/src/test/resources/regression/verification/purescala/invalid/Asserts1.scala
index 7b36cead0..38c7eb435 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Asserts1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Asserts1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala b/src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala
index c11405429..ab320c8c3 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
index 54ac21fb6..632a7f423 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala b/src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
index ed3ebf22a..2bec1b715 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/BigArray.scala b/src/test/resources/regression/verification/purescala/invalid/BigArray.scala
index 1395a1e89..a4a4a6a05 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BigArray.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BigArray.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/BinarySearchTreeQuant.scala b/src/test/resources/regression/verification/purescala/invalid/BinarySearchTreeQuant.scala
index 849de7d15..260d33ad2 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BinarySearchTreeQuant.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BinarySearchTreeQuant.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/BraunTree.scala b/src/test/resources/regression/verification/purescala/invalid/BraunTree.scala
index b8ce261ad..ff2144d1c 100644
--- a/src/test/resources/regression/verification/purescala/invalid/BraunTree.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/BraunTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/CallByName1.scala b/src/test/resources/regression/verification/purescala/invalid/CallByName1.scala
index c96ab1617..7aef4f08b 100644
--- a/src/test/resources/regression/verification/purescala/invalid/CallByName1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/CallByName1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object CallByName1 {
diff --git a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
index 185aad5c9..f92657c78 100644
--- a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object CharCompare {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Choose1.scala b/src/test/resources/regression/verification/purescala/invalid/Choose1.scala
index cb3d8b3ff..ac9922ed7 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Choose1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Choose1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala
index 7415f2e6a..95f435727 100644
--- a/src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala b/src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
index 239cb7db2..32b47ae9c 100644
--- a/src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/Existentials.scala b/src/test/resources/regression/verification/purescala/invalid/Existentials.scala
index 19679db92..4f3d358c7 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Existentials.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Existentials.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Existentials {
diff --git a/src/test/resources/regression/verification/purescala/invalid/FieldInheritance.scala b/src/test/resources/regression/verification/purescala/invalid/FieldInheritance.scala
index 7ef9d9522..e183b615a 100644
--- a/src/test/resources/regression/verification/purescala/invalid/FieldInheritance.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/FieldInheritance.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object FieldInheritance {
diff --git a/src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala
index 0cb31c890..17af7c45e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/ForallAssoc.scala b/src/test/resources/regression/verification/purescala/invalid/ForallAssoc.scala
index 83773b222..dcd837a69 100644
--- a/src/test/resources/regression/verification/purescala/invalid/ForallAssoc.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/ForallAssoc.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ForallAssoc {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Generics.scala b/src/test/resources/regression/verification/purescala/invalid/Generics.scala
index 21971e521..991b948d9 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Generics.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Generics.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Generics2.scala b/src/test/resources/regression/verification/purescala/invalid/Generics2.scala
index 32d97e003..0c95c311e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Generics2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Generics2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala b/src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala
index 0685b7b92..c44cd759d 100644
--- a/src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/HOInvocations2.scala b/src/test/resources/regression/verification/purescala/invalid/HOInvocations2.scala
index 1639def5d..ba7c88c9c 100644
--- a/src/test/resources/regression/verification/purescala/invalid/HOInvocations2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/HOInvocations2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object HOInvocations2 {
diff --git a/src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala b/src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala
index d82f045b5..ddf735282 100644
--- a/src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/ListOperations.scala b/src/test/resources/regression/verification/purescala/invalid/ListOperations.scala
index 46e90ccfc..82f4648a2 100644
--- a/src/test/resources/regression/verification/purescala/invalid/ListOperations.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/ListOperations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/Lists.scala b/src/test/resources/regression/verification/purescala/invalid/Lists.scala
index d691cae5b..c9594195d 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Lists.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Lists.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/MatchExh.scala b/src/test/resources/regression/verification/purescala/invalid/MatchExh.scala
index 0f7f7d736..e5260ae1f 100644
--- a/src/test/resources/regression/verification/purescala/invalid/MatchExh.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/MatchExh.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Mean.scala b/src/test/resources/regression/verification/purescala/invalid/Mean.scala
index 02240e73b..aa691fa15 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Mean.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Mean.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala b/src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala
index 19eb0da32..114eb998b 100644
--- a/src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/Monotonic.scala b/src/test/resources/regression/verification/purescala/invalid/Monotonic.scala
index bc9a1bc76..ddb17ff3e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Monotonic.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Monotonic.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Monotonic {
diff --git a/src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala
index f2aa840a8..394e2cd9f 100644
--- a/src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple1 {
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala
index 0bd3d302f..76b8e64cf 100644
--- a/src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple2 {
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala
index cd514455b..abc0ffba3 100644
--- a/src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple3 {
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Nested15.scala b/src/test/resources/regression/verification/purescala/invalid/Nested15.scala
index 61ac54c4e..d604082f6 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Nested15.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Nested15.scala
@@ -1,5 +1,7 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.collection._
+
 object Nested15 {
 
   def foo[A](i: List[A]): BigInt = {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Overrides.scala b/src/test/resources/regression/verification/purescala/invalid/Overrides.scala
index ae6b4ebd4..28c6e9dbc 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Overrides.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Overrides.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Overrides {
   abstract class A {
     def x(a: Int): Int
diff --git a/src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala b/src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala
index c9f290853..eaf345dd9 100644
--- a/src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/PositiveMap2.scala b/src/test/resources/regression/verification/purescala/invalid/PositiveMap2.scala
index 713f901c9..c7cc782c6 100644
--- a/src/test/resources/regression/verification/purescala/invalid/PositiveMap2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/PositiveMap2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object PositiveMap2 {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Postcondition.scala b/src/test/resources/regression/verification/purescala/invalid/Postcondition.scala
index d942f446e..be95028c0 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Postcondition.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Postcondition.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Postconditions {
diff --git a/src/test/resources/regression/verification/purescala/invalid/PreInSpecs.scala b/src/test/resources/regression/verification/purescala/invalid/PreInSpecs.scala
index 4f184bac1..03c795e33 100644
--- a/src/test/resources/regression/verification/purescala/invalid/PreInSpecs.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/PreInSpecs.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object PreInSpecs {
diff --git a/src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala b/src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
index aa00e12d4..31790c960 100644
--- a/src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
index 418fbb9e8..efa3c4e0e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala b/src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
index 3a234b88b..65e7a655b 100644
--- a/src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 
diff --git a/src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala b/src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala
index f56a174de..05004448d 100644
--- a/src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala b/src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala
index 5fc587fe8..c3b9e96f0 100644
--- a/src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/invalid/SimpleQuantification.scala b/src/test/resources/regression/verification/purescala/invalid/SimpleQuantification.scala
index 7a3446612..b020f413c 100644
--- a/src/test/resources/regression/verification/purescala/invalid/SimpleQuantification.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/SimpleQuantification.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Simple {
diff --git a/src/test/resources/regression/verification/purescala/invalid/TestLazinessOfAnd.scala b/src/test/resources/regression/verification/purescala/invalid/TestLazinessOfAnd.scala
index 9ee698e1d..66ccb8f2e 100644
--- a/src/test/resources/regression/verification/purescala/invalid/TestLazinessOfAnd.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/TestLazinessOfAnd.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object AndTest {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Unapply1.scala b/src/test/resources/regression/verification/purescala/invalid/Unapply1.scala
index 674ca7c69..cd78d4798 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Unapply1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Unapply1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Unap1 {
diff --git a/src/test/resources/regression/verification/purescala/invalid/Unapply2.scala b/src/test/resources/regression/verification/purescala/invalid/Unapply2.scala
index 7efd6e220..152f1445b 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Unapply2.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Unapply2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._ 
 object Unap2 {
   def unapply[A, B](i: (Int, B, A)): Option[(A, B)] = 
diff --git a/src/test/resources/regression/verification/purescala/invalid/Unit1.scala b/src/test/resources/regression/verification/purescala/invalid/Unit1.scala
index d286487c0..f937daaa9 100644
--- a/src/test/resources/regression/verification/purescala/invalid/Unit1.scala
+++ b/src/test/resources/regression/verification/purescala/invalid/Unit1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Acc.scala b/src/test/resources/regression/verification/purescala/valid/Acc.scala
index 9445ccaa8..6f93027c9 100644
--- a/src/test/resources/regression/verification/purescala/valid/Acc.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Acc.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
index 0b269eded..84fca5dc6 100644
--- a/src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
+++ b/src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object AddingPositiveNumbers {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala b/src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala
index 006fbde9a..dfb302cb9 100644
--- a/src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala
+++ b/src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/Anonymous.scala b/src/test/resources/regression/verification/purescala/valid/Anonymous.scala
index 17f72fd08..2239fb9a6 100644
--- a/src/test/resources/regression/verification/purescala/valid/Anonymous.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Anonymous.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Array1.scala b/src/test/resources/regression/verification/purescala/valid/Array1.scala
index 4dbec292c..f1978f170 100644
--- a/src/test/resources/regression/verification/purescala/valid/Array1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Array2.scala b/src/test/resources/regression/verification/purescala/valid/Array2.scala
index 53d30e9af..40b96f740 100644
--- a/src/test/resources/regression/verification/purescala/valid/Array2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Array2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array2 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Array3.scala b/src/test/resources/regression/verification/purescala/valid/Array3.scala
index b7ea754b4..a9f98167f 100644
--- a/src/test/resources/regression/verification/purescala/valid/Array3.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Array3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array3 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
index 34850fe4f..4921b5e36 100644
--- a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
index e60918b64..d501089cf 100644
--- a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
index fce6728b6..aadcfde99 100644
--- a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/AssociativeList.scala b/src/test/resources/regression/verification/purescala/valid/AssociativeList.scala
index 39cc5b732..bbc4edf5d 100644
--- a/src/test/resources/regression/verification/purescala/valid/AssociativeList.scala
+++ b/src/test/resources/regression/verification/purescala/valid/AssociativeList.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala b/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
index a68525d81..29459bfca 100644
--- a/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
index 3de75f003..74a774601 100644
--- a/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
index 382dbb191..78510863c 100644
--- a/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/valid/BasicReal.scala b/src/test/resources/regression/verification/purescala/valid/BasicReal.scala
index 2250c5949..fb8342da7 100644
--- a/src/test/resources/regression/verification/purescala/valid/BasicReal.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BasicReal.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala b/src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala
index 6da51350f..b40aac4f8 100644
--- a/src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/BinarySearchTreeQuant.scala b/src/test/resources/regression/verification/purescala/valid/BinarySearchTreeQuant.scala
index a435e69ca..4676dcd6a 100644
--- a/src/test/resources/regression/verification/purescala/valid/BinarySearchTreeQuant.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BinarySearchTreeQuant.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/BitsTricks.scala b/src/test/resources/regression/verification/purescala/valid/BitsTricks.scala
index 2da2298eb..23cbe32a4 100644
--- a/src/test/resources/regression/verification/purescala/valid/BitsTricks.scala
+++ b/src/test/resources/regression/verification/purescala/valid/BitsTricks.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/CallByName1.scala b/src/test/resources/regression/verification/purescala/valid/CallByName1.scala
index 912acdc48..07247e047 100644
--- a/src/test/resources/regression/verification/purescala/valid/CallByName1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/CallByName1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object CallByName1 {
diff --git a/src/test/resources/regression/verification/purescala/valid/CaseObject1.scala b/src/test/resources/regression/verification/purescala/valid/CaseObject1.scala
index 4a71c913a..318af6680 100644
--- a/src/test/resources/regression/verification/purescala/valid/CaseObject1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/CaseObject1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object CaseObject1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Choose1.scala b/src/test/resources/regression/verification/purescala/valid/Choose1.scala
index 19ca94fbb..ee36ea506 100644
--- a/src/test/resources/regression/verification/purescala/valid/Choose1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Choose1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/verification/purescala/valid/Choose2.scala b/src/test/resources/regression/verification/purescala/valid/Choose2.scala
index ad05bda10..15a2e0c03 100644
--- a/src/test/resources/regression/verification/purescala/valid/Choose2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Choose2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.synthesis._
diff --git a/src/test/resources/regression/verification/purescala/valid/Client.scala b/src/test/resources/regression/verification/purescala/valid/Client.scala
index c0dd37cda..e58a05c99 100644
--- a/src/test/resources/regression/verification/purescala/valid/Client.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Client.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.collection._
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Closures.scala b/src/test/resources/regression/verification/purescala/valid/Closures.scala
index 3ce765917..47aed6f0b 100644
--- a/src/test/resources/regression/verification/purescala/valid/Closures.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Closures.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Closures2.scala b/src/test/resources/regression/verification/purescala/valid/Closures2.scala
index 559eb2783..f77ae2dd3 100644
--- a/src/test/resources/regression/verification/purescala/valid/Closures2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Closures2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Composition.scala b/src/test/resources/regression/verification/purescala/valid/Composition.scala
index cd62eb8da..64ac20726 100644
--- a/src/test/resources/regression/verification/purescala/valid/Composition.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Composition.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala
index 559e13591..9ce813efe 100644
--- a/src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/valid/Existentials.scala b/src/test/resources/regression/verification/purescala/valid/Existentials.scala
index 992d58cd0..471e48463 100644
--- a/src/test/resources/regression/verification/purescala/valid/Existentials.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Existentials.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Existentials {
diff --git a/src/test/resources/regression/verification/purescala/valid/Extern1.scala b/src/test/resources/regression/verification/purescala/valid/Extern1.scala
index fa48c90f7..f0eb89634 100644
--- a/src/test/resources/regression/verification/purescala/valid/Extern1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Extern1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Extern2.scala b/src/test/resources/regression/verification/purescala/valid/Extern2.scala
index ce5c7b683..aac01ec11 100644
--- a/src/test/resources/regression/verification/purescala/valid/Extern2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Extern2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.annotation._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Field1.scala b/src/test/resources/regression/verification/purescala/valid/Field1.scala
index be10c683d..8c410b3d9 100644
--- a/src/test/resources/regression/verification/purescala/valid/Field1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Field1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Field1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Field2.scala b/src/test/resources/regression/verification/purescala/valid/Field2.scala
index 6b52ca258..db42516e5 100644
--- a/src/test/resources/regression/verification/purescala/valid/Field2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Field2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Field2 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/FieldInheritance.scala b/src/test/resources/regression/verification/purescala/valid/FieldInheritance.scala
index 9b99fc84c..68f7f4961 100644
--- a/src/test/resources/regression/verification/purescala/valid/FieldInheritance.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FieldInheritance.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object FieldInheritance {
diff --git a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
index ead4c46cb..add622294 100644
--- a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/FlatMap.scala b/src/test/resources/regression/verification/purescala/valid/FlatMap.scala
index 878b61456..9ff0308e4 100644
--- a/src/test/resources/regression/verification/purescala/valid/FlatMap.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FlatMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala b/src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala
index 692023111..f333c936f 100644
--- a/src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala b/src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala
index 5e0b72e54..dfc11de52 100644
--- a/src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala
+++ b/src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/ForallAssoc.scala b/src/test/resources/regression/verification/purescala/valid/ForallAssoc.scala
index ae90e9489..f001bc435 100644
--- a/src/test/resources/regression/verification/purescala/valid/ForallAssoc.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ForallAssoc.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ForallAssoc {
diff --git a/src/test/resources/regression/verification/purescala/valid/Formulas.scala b/src/test/resources/regression/verification/purescala/valid/Formulas.scala
index 0fafe4158..6a1529187 100644
--- a/src/test/resources/regression/verification/purescala/valid/Formulas.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Formulas.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Generics.scala b/src/test/resources/regression/verification/purescala/valid/Generics.scala
index 14045bf32..86ee9d50c 100644
--- a/src/test/resources/regression/verification/purescala/valid/Generics.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Generics.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Generics1.scala b/src/test/resources/regression/verification/purescala/valid/Generics1.scala
index d269f2178..e054b629f 100644
--- a/src/test/resources/regression/verification/purescala/valid/Generics1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Generics1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/HOInvocations.scala b/src/test/resources/regression/verification/purescala/valid/HOInvocations.scala
index e536d1986..81fab89f9 100644
--- a/src/test/resources/regression/verification/purescala/valid/HOInvocations.scala
+++ b/src/test/resources/regression/verification/purescala/valid/HOInvocations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/HOInvocations2.scala b/src/test/resources/regression/verification/purescala/valid/HOInvocations2.scala
index 0af2a6a06..550da0cf2 100644
--- a/src/test/resources/regression/verification/purescala/valid/HOInvocations2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/HOInvocations2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object HOInvocations2 {
diff --git a/src/test/resources/regression/verification/purescala/valid/Heaps.scala b/src/test/resources/regression/verification/purescala/valid/Heaps.scala
index aa66ca2f2..7379ad87d 100644
--- a/src/test/resources/regression/verification/purescala/valid/Heaps.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Heaps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/InsertionSort.scala b/src/test/resources/regression/verification/purescala/valid/InsertionSort.scala
index 0ec78ff0d..157e3394e 100644
--- a/src/test/resources/regression/verification/purescala/valid/InsertionSort.scala
+++ b/src/test/resources/regression/verification/purescala/valid/InsertionSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala b/src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala
index 6543f94e5..6901da6c8 100644
--- a/src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object InstanceOf1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Justify.scala b/src/test/resources/regression/verification/purescala/valid/Justify.scala
index e5b06bc94..b7517052c 100644
--- a/src/test/resources/regression/verification/purescala/valid/Justify.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Justify.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.lang.synthesis._
 import leon.collection._
diff --git a/src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala b/src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala
index b7f589cf7..bf72524cf 100644
--- a/src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala
+++ b/src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
  
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lambdas.scala b/src/test/resources/regression/verification/purescala/valid/Lambdas.scala
index 7adbfe448..b39d2c803 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lambdas.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lambdas.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/ListOperations.scala b/src/test/resources/regression/verification/purescala/valid/ListOperations.scala
index 72a27c049..e711c9682 100644
--- a/src/test/resources/regression/verification/purescala/valid/ListOperations.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ListOperations.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists1.scala b/src/test/resources/regression/verification/purescala/valid/Lists1.scala
index 0b10f27d0..c946a4823 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists2.scala b/src/test/resources/regression/verification/purescala/valid/Lists2.scala
index 79126cb22..4edd2d1e1 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists3.scala b/src/test/resources/regression/verification/purescala/valid/Lists3.scala
index dedab2a4e..01fe747df 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists3.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists4.scala b/src/test/resources/regression/verification/purescala/valid/Lists4.scala
index 124d944da..1afde3867 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists4.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists5.scala b/src/test/resources/regression/verification/purescala/valid/Lists5.scala
index 9826dc372..627fdb9ed 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists5.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Lists6.scala b/src/test/resources/regression/verification/purescala/valid/Lists6.scala
index 763fabdad..13bd154b5 100644
--- a/src/test/resources/regression/verification/purescala/valid/Lists6.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Lists6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala b/src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala
index 07894524a..6f03046d1 100644
--- a/src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala
+++ b/src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala b/src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
index 7b1e19418..737432e7b 100644
--- a/src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object MapGetOrElse2 {
diff --git a/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala b/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
index 86a3d6d22..79a1a287c 100644
--- a/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object MapGetPlus {
diff --git a/src/test/resources/regression/verification/purescala/valid/MatchExh.scala b/src/test/resources/regression/verification/purescala/valid/MatchExh.scala
index 77251bc8c..e05c97de9 100644
--- a/src/test/resources/regression/verification/purescala/valid/MatchExh.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MatchExh.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Mean.scala b/src/test/resources/regression/verification/purescala/valid/Mean.scala
index 155b7095a..9bdce687e 100644
--- a/src/test/resources/regression/verification/purescala/valid/Mean.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Mean.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/MergeSort.scala b/src/test/resources/regression/verification/purescala/valid/MergeSort.scala
index 9847aba04..5ebcc74cb 100644
--- a/src/test/resources/regression/verification/purescala/valid/MergeSort.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MergeSort.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/Methods.scala b/src/test/resources/regression/verification/purescala/valid/Methods.scala
index e3c71b2a5..a2dac3cf4 100644
--- a/src/test/resources/regression/verification/purescala/valid/Methods.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Methods.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Methods {
diff --git a/src/test/resources/regression/verification/purescala/valid/Monads1.scala b/src/test/resources/regression/verification/purescala/valid/Monads1.scala
index 19518ae9b..bfaee154a 100644
--- a/src/test/resources/regression/verification/purescala/valid/Monads1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Monads1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Monads2.scala b/src/test/resources/regression/verification/purescala/valid/Monads2.scala
index b9487c0c5..5d344032c 100644
--- a/src/test/resources/regression/verification/purescala/valid/Monads2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Monads2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Monads3.scala b/src/test/resources/regression/verification/purescala/valid/Monads3.scala
index fc0e7149b..0f0e3c914 100644
--- a/src/test/resources/regression/verification/purescala/valid/Monads3.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Monads3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.proof._
diff --git a/src/test/resources/regression/verification/purescala/valid/Monotonic.scala b/src/test/resources/regression/verification/purescala/valid/Monotonic.scala
index cef6be60f..6a07df7d6 100644
--- a/src/test/resources/regression/verification/purescala/valid/Monotonic.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Monotonic.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Monotonic {
diff --git a/src/test/resources/regression/verification/purescala/valid/MyMap.scala b/src/test/resources/regression/verification/purescala/valid/MyMap.scala
index b4652040a..f9b88ef24 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyMap.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MySet.scala b/src/test/resources/regression/verification/purescala/valid/MySet.scala
index b19be90e7..13efa589e 100644
--- a/src/test/resources/regression/verification/purescala/valid/MySet.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MySet.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple1.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple1.scala
index 9aa42ce05..55ba48e8e 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple2.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple2.scala
index 05124ffbe..8683adcde 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple2 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple3.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple3.scala
index 20bb0eec9..db4f82411 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple3.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple3 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple4.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple4.scala
index 8b2ede8f2..6dd4d3c1c 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple4.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 
 object MyTuple4 {
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple5.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple5.scala
index 78c93bc2a..d8fff8878 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple5.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple5 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/MyTuple6.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple6.scala
index e6cff3917..f8cc1b423 100644
--- a/src/test/resources/regression/verification/purescala/valid/MyTuple6.scala
+++ b/src/test/resources/regression/verification/purescala/valid/MyTuple6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object MyTuple6 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nat.scala b/src/test/resources/regression/verification/purescala/valid/Nat.scala
index 2c6b8724a..41b58248f 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nat.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nat.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested1.scala b/src/test/resources/regression/verification/purescala/valid/Nested1.scala
index c70534592..165e42474 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested10.scala b/src/test/resources/regression/verification/purescala/valid/Nested10.scala
index 815582ef9..d129c5313 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested10.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested10.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested10 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested11.scala b/src/test/resources/regression/verification/purescala/valid/Nested11.scala
index 66fc9af74..3982c3423 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested11.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested11.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested11 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested12.scala b/src/test/resources/regression/verification/purescala/valid/Nested12.scala
index 3ca2eb472..2961a5b4c 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested12.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested12.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested12 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested13.scala b/src/test/resources/regression/verification/purescala/valid/Nested13.scala
index 83d9a9eea..f4dc50e44 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested13.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested13.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested13 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested14.scala b/src/test/resources/regression/verification/purescala/valid/Nested14.scala
index a5ac872f9..82f4fd1b9 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested14.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested14.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested14 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested15.scala b/src/test/resources/regression/verification/purescala/valid/Nested15.scala
index 5fd3650d6..4ece21eaf 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested15.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested15.scala
@@ -1,5 +1,7 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.collection._
+
 object Nested15 {
 
   def foo[A](i: List[A]): BigInt = {
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested2.scala b/src/test/resources/regression/verification/purescala/valid/Nested2.scala
index 7824f983d..7b70916c4 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested2 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested3.scala b/src/test/resources/regression/verification/purescala/valid/Nested3.scala
index 1018ff325..28ff445f8 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested3.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested3 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested4.scala b/src/test/resources/regression/verification/purescala/valid/Nested4.scala
index b1b8cb5c3..397dd7484 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested4.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested4 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested5.scala b/src/test/resources/regression/verification/purescala/valid/Nested5.scala
index 0cbd6b509..736c0f6bf 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested5.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested5 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested6.scala b/src/test/resources/regression/verification/purescala/valid/Nested6.scala
index 57e448444..6d6df90a4 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested6.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested6 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested7.scala b/src/test/resources/regression/verification/purescala/valid/Nested7.scala
index 3238de813..b9e986311 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested7.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested7.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested7 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested8.scala b/src/test/resources/regression/verification/purescala/valid/Nested8.scala
index 9f18dfe1d..67c81f414 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested8.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested8.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Nested9.scala b/src/test/resources/regression/verification/purescala/valid/Nested9.scala
index 3e7df6d9e..ae029ad68 100644
--- a/src/test/resources/regression/verification/purescala/valid/Nested9.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Nested9.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Nested9 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/NotEquals.scala b/src/test/resources/regression/verification/purescala/valid/NotEquals.scala
index 23d857db5..31a4bc763 100644
--- a/src/test/resources/regression/verification/purescala/valid/NotEquals.scala
+++ b/src/test/resources/regression/verification/purescala/valid/NotEquals.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/Overrides.scala b/src/test/resources/regression/verification/purescala/valid/Overrides.scala
index 4b6767e6b..749fec7e0 100644
--- a/src/test/resources/regression/verification/purescala/valid/Overrides.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Overrides.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Overrides {
   abstract class A {
     def x(a: Int): Int
diff --git a/src/test/resources/regression/verification/purescala/valid/ParBalance.scala b/src/test/resources/regression/verification/purescala/valid/ParBalance.scala
index 35ca75376..a1e5ea1ed 100644
--- a/src/test/resources/regression/verification/purescala/valid/ParBalance.scala
+++ b/src/test/resources/regression/verification/purescala/valid/ParBalance.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/PositiveMap.scala b/src/test/resources/regression/verification/purescala/valid/PositiveMap.scala
index 93c87331e..a9a07c985 100644
--- a/src/test/resources/regression/verification/purescala/valid/PositiveMap.scala
+++ b/src/test/resources/regression/verification/purescala/valid/PositiveMap.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/PositiveMap2.scala b/src/test/resources/regression/verification/purescala/valid/PositiveMap2.scala
index eb2262f02..ea8ccbdf5 100644
--- a/src/test/resources/regression/verification/purescala/valid/PositiveMap2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/PositiveMap2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Postcondition.scala b/src/test/resources/regression/verification/purescala/valid/Postcondition.scala
index e044a9a3a..d4303a799 100644
--- a/src/test/resources/regression/verification/purescala/valid/Postcondition.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Postcondition.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Postconditions {
diff --git a/src/test/resources/regression/verification/purescala/valid/PreInSpecs.scala b/src/test/resources/regression/verification/purescala/valid/PreInSpecs.scala
index 988f7331a..314c2c587 100644
--- a/src/test/resources/regression/verification/purescala/valid/PreInSpecs.scala
+++ b/src/test/resources/regression/verification/purescala/valid/PreInSpecs.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object PreInSpecs {
diff --git a/src/test/resources/regression/verification/purescala/valid/Predicate.scala b/src/test/resources/regression/verification/purescala/valid/Predicate.scala
index c011d4b91..b1d560d7a 100644
--- a/src/test/resources/regression/verification/purescala/valid/Predicate.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Predicate.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.monads.predicate
 
 import leon.collection._
diff --git a/src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala b/src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala
index 66e3f84ec..fa7c0cf48 100644
--- a/src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala
+++ b/src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
index 3d8dcf5b2..c6d44938e 100644
--- a/src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
+++ b/src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala b/src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala
index e24935bbe..a40068e70 100644
--- a/src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala
+++ b/src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala b/src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala
index 882dfa140..e35e6bc0e 100644
--- a/src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala
+++ b/src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.annotation._
diff --git a/src/test/resources/regression/verification/purescala/valid/Sets1.scala b/src/test/resources/regression/verification/purescala/valid/Sets1.scala
index 0cfc54263..ff0d0421b 100644
--- a/src/test/resources/regression/verification/purescala/valid/Sets1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Sets1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Sets2.scala b/src/test/resources/regression/verification/purescala/valid/Sets2.scala
index 6d798afcc..1ea7ca023 100644
--- a/src/test/resources/regression/verification/purescala/valid/Sets2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Sets2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/SimpleQuantification.scala b/src/test/resources/regression/verification/purescala/valid/SimpleQuantification.scala
index 5e7e9cb33..4784d2c17 100644
--- a/src/test/resources/regression/verification/purescala/valid/SimpleQuantification.scala
+++ b/src/test/resources/regression/verification/purescala/valid/SimpleQuantification.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Simple {
diff --git a/src/test/resources/regression/verification/purescala/valid/Subtyping1.scala b/src/test/resources/regression/verification/purescala/valid/Subtyping1.scala
index c7e8bd533..8b5d7e4b5 100644
--- a/src/test/resources/regression/verification/purescala/valid/Subtyping1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Subtyping1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Subtyping2.scala b/src/test/resources/regression/verification/purescala/valid/Subtyping2.scala
index eef9c65da..bbb436b6a 100644
--- a/src/test/resources/regression/verification/purescala/valid/Subtyping2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Subtyping2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/TransitiveQuantification.scala b/src/test/resources/regression/verification/purescala/valid/TransitiveQuantification.scala
index 5e7bb03cd..c622bc139 100644
--- a/src/test/resources/regression/verification/purescala/valid/TransitiveQuantification.scala
+++ b/src/test/resources/regression/verification/purescala/valid/TransitiveQuantification.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object Transitive {
diff --git a/src/test/resources/regression/verification/purescala/valid/Trees1.scala b/src/test/resources/regression/verification/purescala/valid/Trees1.scala
index de892510c..cb0b02900 100644
--- a/src/test/resources/regression/verification/purescala/valid/Trees1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Trees1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Unapply.scala b/src/test/resources/regression/verification/purescala/valid/Unapply.scala
index 1885837d9..0113f68d7 100644
--- a/src/test/resources/regression/verification/purescala/valid/Unapply.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Unapply.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._ 
 object Unap {
   def unapply[A, B](i: (Int, B, A)): Option[(A, B)] = 
diff --git a/src/test/resources/regression/verification/purescala/valid/Unit1.scala b/src/test/resources/regression/verification/purescala/valid/Unit1.scala
index a0683d303..596f7cc31 100644
--- a/src/test/resources/regression/verification/purescala/valid/Unit1.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Unit1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit1 {
 
diff --git a/src/test/resources/regression/verification/purescala/valid/Unit2.scala b/src/test/resources/regression/verification/purescala/valid/Unit2.scala
index 8a285ff23..1aa3cf55b 100644
--- a/src/test/resources/regression/verification/purescala/valid/Unit2.scala
+++ b/src/test/resources/regression/verification/purescala/valid/Unit2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Unit2 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Array1.scala b/src/test/resources/regression/verification/xlang/invalid/Array1.scala
index 7dea56cb4..b1e032aaa 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Array1.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array1 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Array2.scala b/src/test/resources/regression/verification/xlang/invalid/Array2.scala
index 94fed91ba..2785ca228 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Array2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Array2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array2 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Array3.scala b/src/test/resources/regression/verification/xlang/invalid/Array3.scala
index 23eeb888b..4d785c176 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Array3.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Array3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Assert1.scala b/src/test/resources/regression/verification/xlang/invalid/Assert1.scala
index 8027179df..8febd5aa3 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Assert1.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Assert1.scala
@@ -1,4 +1,4 @@
-package test.resources.regression.verification.xlang.invalid
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 /* Copyright 2009-2015 EPFL, Lausanne */
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Assert2.scala b/src/test/resources/regression/verification/xlang/invalid/Assert2.scala
index cc8b2a591..1dee8a90f 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Assert2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Assert2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Assert2 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/Asserts2.scala b/src/test/resources/regression/verification/xlang/invalid/Asserts2.scala
index bfda82471..3942d9337 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Asserts2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Asserts2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.annotation._
 import leon.lang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala
index af706720a..c35318dfe 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala
index b6983c816..a7e89366e 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala
index 2e0609389..d32c1ba84 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala
index e5b9507b5..1fc7ebcd9 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala
index 5d8cacbe8..0ba271747 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala
index 9ef936b5a..c2144cce4 100644
--- a/src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala b/src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala
index 0e62acffe..7ddaac162 100644
--- a/src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr1 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala b/src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala
index 154c65370..4126d6636 100644
--- a/src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr2 {
 
diff --git a/src/test/resources/regression/verification/xlang/invalid/NestedFunState1.scala b/src/test/resources/regression/verification/xlang/invalid/NestedFunState1.scala
index 9372ea742..abd623d29 100644
--- a/src/test/resources/regression/verification/xlang/invalid/NestedFunState1.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/NestedFunState1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object NestedFunState1 {
 
   def simpleSideEffect(n: BigInt): BigInt = {
diff --git a/src/test/resources/regression/verification/xlang/invalid/NestedFunState2.scala b/src/test/resources/regression/verification/xlang/invalid/NestedFunState2.scala
index 68769df28..394feb446 100644
--- a/src/test/resources/regression/verification/xlang/invalid/NestedFunState2.scala
+++ b/src/test/resources/regression/verification/xlang/invalid/NestedFunState2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object NestedFunState2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Arithmetic.scala b/src/test/resources/regression/verification/xlang/valid/Arithmetic.scala
index 2952f49c5..7febf126c 100644
--- a/src/test/resources/regression/verification/xlang/valid/Arithmetic.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Arithmetic.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array1.scala b/src/test/resources/regression/verification/xlang/valid/Array1.scala
index 644e0d5e9..09379018f 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array2.scala b/src/test/resources/regression/verification/xlang/valid/Array2.scala
index 85bcbb17a..b5e23aa7a 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array3.scala b/src/test/resources/regression/verification/xlang/valid/Array3.scala
index 3cd26b2e8..ece86335b 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array4.scala b/src/test/resources/regression/verification/xlang/valid/Array4.scala
index 6543a00c4..0b7374d6e 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array4.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array5.scala b/src/test/resources/regression/verification/xlang/valid/Array5.scala
index 491205a03..7cdc21737 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array5.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array6.scala b/src/test/resources/regression/verification/xlang/valid/Array6.scala
index ffcc9e362..7c16ca9ae 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array6.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Array7.scala b/src/test/resources/regression/verification/xlang/valid/Array7.scala
index aad31e4ff..0efc14e8f 100644
--- a/src/test/resources/regression/verification/xlang/valid/Array7.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Array7.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/ArrayNested1.scala b/src/test/resources/regression/verification/xlang/valid/ArrayNested1.scala
index 196a6442b..f698242c1 100644
--- a/src/test/resources/regression/verification/xlang/valid/ArrayNested1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/ArrayNested1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ArrayNested1 {
diff --git a/src/test/resources/regression/verification/xlang/valid/ArrayNested2.scala b/src/test/resources/regression/verification/xlang/valid/ArrayNested2.scala
index a8935ab8c..5b2407b57 100644
--- a/src/test/resources/regression/verification/xlang/valid/ArrayNested2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/ArrayNested2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object ArrayNested2 {
diff --git a/src/test/resources/regression/verification/xlang/valid/Assert1.scala b/src/test/resources/regression/verification/xlang/valid/Assert1.scala
index d9ae5c675..8f2199ad2 100644
--- a/src/test/resources/regression/verification/xlang/valid/Assert1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Assert1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Assert1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Assert2.scala b/src/test/resources/regression/verification/xlang/valid/Assert2.scala
index 0f5131346..64002e2cf 100644
--- a/src/test/resources/regression/verification/xlang/valid/Assert2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Assert2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Assert2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Assert3.scala b/src/test/resources/regression/verification/xlang/valid/Assert3.scala
index 49e2f6c55..bd29aae41 100644
--- a/src/test/resources/regression/verification/xlang/valid/Assert3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Assert3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Assign1.scala b/src/test/resources/regression/verification/xlang/valid/Assign1.scala
index cbf5c009d..2f812d48a 100644
--- a/src/test/resources/regression/verification/xlang/valid/Assign1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Assign1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Assign1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Epsilon1.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon1.scala
index 93d5ae083..8c91e3f7f 100644
--- a/src/test/resources/regression/verification/xlang/valid/Epsilon1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Epsilon1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/valid/Epsilon2.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon2.scala
index 671ddb000..6506c4d97 100644
--- a/src/test/resources/regression/verification/xlang/valid/Epsilon2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Epsilon2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/valid/Epsilon3.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon3.scala
index 64899cb78..e1103e2f1 100644
--- a/src/test/resources/regression/verification/xlang/valid/Epsilon3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Epsilon3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/valid/Epsilon4.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon4.scala
index df8cd36b8..248bf0f1d 100644
--- a/src/test/resources/regression/verification/xlang/valid/Epsilon4.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Epsilon4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/valid/Epsilon5.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon5.scala
index 8d608604d..80cbb2bc9 100644
--- a/src/test/resources/regression/verification/xlang/valid/Epsilon5.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Epsilon5.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 import leon.lang._
 import leon.lang.xlang._
diff --git a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder1.scala b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder1.scala
index 8ef668a2a..23576c1fc 100644
--- a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object FunInvocEvaluationOrder1 {
 
   def test(): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder2.scala b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder2.scala
index 12090f0f3..c37ab1045 100644
--- a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object FunInvocEvaluationOrder2 {
 
   def leftToRight(n: BigInt): BigInt = {
diff --git a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder3.scala b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder3.scala
index f26352965..e6c1b37dd 100644
--- a/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/FunInvocEvaluationOrder3.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object FunInvocEvaluationOrder3 {
 
   def leftToRight(n: BigInt): BigInt = {
diff --git a/src/test/resources/regression/verification/xlang/valid/IfExpr1.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr1.scala
index c32f4f97e..a9ffdabcc 100644
--- a/src/test/resources/regression/verification/xlang/valid/IfExpr1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/IfExpr1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/IfExpr2.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr2.scala
index a848d2091..c439ea593 100644
--- a/src/test/resources/regression/verification/xlang/valid/IfExpr2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/IfExpr2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/IfExpr3.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr3.scala
index 352f89b9e..f71fb9cba 100644
--- a/src/test/resources/regression/verification/xlang/valid/IfExpr3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/IfExpr3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr3 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/IfExpr4.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr4.scala
index 43c43fb15..e0335300e 100644
--- a/src/test/resources/regression/verification/xlang/valid/IfExpr4.scala
+++ b/src/test/resources/regression/verification/xlang/valid/IfExpr4.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object IfExpr4 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState1.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState1.scala
index 1ec0266f8..cb649ef1c 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object NestedFunState1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState2.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState2.scala
index e48b1b959..d42eb0d59 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object NestedFunState2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState3.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState3.scala
index 650f5987d..3a796c0d1 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState3.scala
@@ -1,4 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedFunState3 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState4.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState4.scala
index 9f4fb2621..4838242de 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState4.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState4.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedFunState4 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState5.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState5.scala
index 13f3cf47c..e60ff32cd 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState5.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState5.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedFunState5 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState6.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState6.scala
index cea0f2e19..15d2e75eb 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState6.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState6.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object NestedFunState6 {
 
   def simpleSideEffect(n: BigInt): BigInt = {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedFunState7.scala b/src/test/resources/regression/verification/xlang/valid/NestedFunState7.scala
index ff2418a0c..e4d07f4ad 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedFunState7.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedFunState7.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedFunState7 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedOld1.scala b/src/test/resources/regression/verification/xlang/valid/NestedOld1.scala
index 903dfd63a..d93276e0e 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedOld1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedOld1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedOld1 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedOld2.scala b/src/test/resources/regression/verification/xlang/valid/NestedOld2.scala
index fe6143ecf..3bd75e35c 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedOld2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedOld2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object NestedOld2 {
diff --git a/src/test/resources/regression/verification/xlang/valid/NestedVar.scala b/src/test/resources/regression/verification/xlang/valid/NestedVar.scala
index 0aeb48be5..a9b864cb4 100644
--- a/src/test/resources/regression/verification/xlang/valid/NestedVar.scala
+++ b/src/test/resources/regression/verification/xlang/valid/NestedVar.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object NestedVar {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing1.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing1.scala
index d1041aef5..238b9273e 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing1.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing1 {
 
   def test(): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing2.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing2.scala
index e152b00ad..f8f774fee 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing2.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing2 {
 
   def test(): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing3.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing3.scala
index cd9d94c46..937938bc7 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing3.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing3 {
 
   def f(x: Int): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing4.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing4.scala
index fb6802192..ef870c612 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing4.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing4.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing4 {
 
   def test(): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing5.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing5.scala
index 1a958a5ff..7c904de5f 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing5.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing5.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing5 {
 
 
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing6.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing6.scala
index 26dd91b8d..7822e7148 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing6.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing6.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing6 {
 
   def f(x1: Int, x2: Int, x3: Int): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing7.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing7.scala
index f3628703b..1c028d617 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing7.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing7.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package test.resources.regression.verification.xlang.valid
 
 object Sequencing7 {
diff --git a/src/test/resources/regression/verification/xlang/valid/Sequencing8.scala b/src/test/resources/regression/verification/xlang/valid/Sequencing8.scala
index a37092ecf..b4db8fcf2 100644
--- a/src/test/resources/regression/verification/xlang/valid/Sequencing8.scala
+++ b/src/test/resources/regression/verification/xlang/valid/Sequencing8.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 object Sequencing8 {
 
   def test(): Int = {
diff --git a/src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala b/src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala
index a35daf11a..b3df2c796 100644
--- a/src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala
+++ b/src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/verification/xlang/valid/While1.scala b/src/test/resources/regression/verification/xlang/valid/While1.scala
index b74ffa287..6cff049de 100644
--- a/src/test/resources/regression/verification/xlang/valid/While1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/While1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object While1 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/While2.scala b/src/test/resources/regression/verification/xlang/valid/While2.scala
index 78c0a8880..93a560177 100644
--- a/src/test/resources/regression/verification/xlang/valid/While2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/While2.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object While2 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/While3.scala b/src/test/resources/regression/verification/xlang/valid/While3.scala
index 08f05d954..e3283cfe2 100644
--- a/src/test/resources/regression/verification/xlang/valid/While3.scala
+++ b/src/test/resources/regression/verification/xlang/valid/While3.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object While3 {
 
diff --git a/src/test/resources/regression/verification/xlang/valid/WhileAsFun1.scala b/src/test/resources/regression/verification/xlang/valid/WhileAsFun1.scala
index b81ea3859..60a7e9737 100644
--- a/src/test/resources/regression/verification/xlang/valid/WhileAsFun1.scala
+++ b/src/test/resources/regression/verification/xlang/valid/WhileAsFun1.scala
@@ -1,4 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object WhileAsFun1 {
diff --git a/src/test/resources/regression/verification/xlang/valid/WhileAsFun2.scala b/src/test/resources/regression/verification/xlang/valid/WhileAsFun2.scala
index 968aadfdb..01d0ea635 100644
--- a/src/test/resources/regression/verification/xlang/valid/WhileAsFun2.scala
+++ b/src/test/resources/regression/verification/xlang/valid/WhileAsFun2.scala
@@ -1,4 +1,5 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 
 object WhileAsFun2 {
diff --git a/src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala b/src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
index b57fc9d8b..d53d4d2bc 100644
--- a/src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
+++ b/src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 import leon.lang._
 import leon.collection._
 import leon._
diff --git a/src/test/resources/regression/xlang/error/Array1.scala b/src/test/resources/regression/xlang/error/Array1.scala
index 2a9813abc..4f1f6a6ff 100644
--- a/src/test/resources/regression/xlang/error/Array1.scala
+++ b/src/test/resources/regression/xlang/error/Array1.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object Array1 {
 
diff --git a/src/test/resources/regression/xlang/error/ArrayAliasing6.scala b/src/test/resources/regression/xlang/error/ArrayAliasing6.scala
index 963a134bf..660c98f3c 100644
--- a/src/test/resources/regression/xlang/error/ArrayAliasing6.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing6.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object ArrayAliasing6 {
 
diff --git a/src/test/resources/regression/xlang/error/ArrayAliasing8.scala b/src/test/resources/regression/xlang/error/ArrayAliasing8.scala
index e7c27cc9c..c466d4564 100644
--- a/src/test/resources/regression/xlang/error/ArrayAliasing8.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing8.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object ArrayAliasing8 {
 
diff --git a/src/test/resources/regression/xlang/error/ArrayAliasing9.scala b/src/test/resources/regression/xlang/error/ArrayAliasing9.scala
index c84d29c3f..72d26d87a 100644
--- a/src/test/resources/regression/xlang/error/ArrayAliasing9.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing9.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 object ArrayAliasing9 {
 
diff --git a/src/test/scala/leon/genc/GenCSuite.scala b/src/test/scala/leon/genc/GenCSuite.scala
index df6d30e5c..d1bd12f25 100644
--- a/src/test/scala/leon/genc/GenCSuite.scala
+++ b/src/test/scala/leon/genc/GenCSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon
 package genc
diff --git a/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala b/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
index e5565e073..888223899 100644
--- a/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
+++ b/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.evaluators
 
diff --git a/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala b/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
index 812cf88ea..5245c00c2 100644
--- a/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
+++ b/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.evaluators
 
diff --git a/src/test/scala/leon/integration/purescala/CallGraphSuite.scala b/src/test/scala/leon/integration/purescala/CallGraphSuite.scala
index 636cd4f40..1d9fa2124 100644
--- a/src/test/scala/leon/integration/purescala/CallGraphSuite.scala
+++ b/src/test/scala/leon/integration/purescala/CallGraphSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/purescala/DataGenSuite.scala b/src/test/scala/leon/integration/purescala/DataGenSuite.scala
index b1acfd74c..050176ef5 100644
--- a/src/test/scala/leon/integration/purescala/DataGenSuite.scala
+++ b/src/test/scala/leon/integration/purescala/DataGenSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/purescala/DefOpsSuite.scala b/src/test/scala/leon/integration/purescala/DefOpsSuite.scala
index c7aad05c6..7c7b82b13 100644
--- a/src/test/scala/leon/integration/purescala/DefOpsSuite.scala
+++ b/src/test/scala/leon/integration/purescala/DefOpsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala b/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
index fe548c1b0..565dbdb14 100644
--- a/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
+++ b/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/purescala/InliningSuite.scala b/src/test/scala/leon/integration/purescala/InliningSuite.scala
index 069a0e5ba..973dd579a 100644
--- a/src/test/scala/leon/integration/purescala/InliningSuite.scala
+++ b/src/test/scala/leon/integration/purescala/InliningSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala b/src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala
index 7ebbe8951..f70543fc9 100644
--- a/src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala
+++ b/src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.purescala
 
diff --git a/src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala b/src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala
index 89031230b..50897d972 100644
--- a/src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala b/src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala
index b08e7f916..91967c426 100644
--- a/src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala
+++ b/src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/GlobalVariablesSuite.scala b/src/test/scala/leon/integration/solvers/GlobalVariablesSuite.scala
index 64cb3b70b..466a16dad 100644
--- a/src/test/scala/leon/integration/solvers/GlobalVariablesSuite.scala
+++ b/src/test/scala/leon/integration/solvers/GlobalVariablesSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala b/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
index 6c2064f95..62b343df6 100644
--- a/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.integration.solvers
 
 import leon.test._
diff --git a/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala b/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
index 3b405720a..3d56b31cc 100644
--- a/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
+++ b/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/SolversSuite.scala b/src/test/scala/leon/integration/solvers/SolversSuite.scala
index d2af2030b..2a42bc6a3 100644
--- a/src/test/scala/leon/integration/solvers/SolversSuite.scala
+++ b/src/test/scala/leon/integration/solvers/SolversSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/StringSolverSuite.scala b/src/test/scala/leon/integration/solvers/StringSolverSuite.scala
index 7c0d3e13c..029bfb233 100644
--- a/src/test/scala/leon/integration/solvers/StringSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/StringSolverSuite.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.integration.solvers
 
 import org.scalatest.FunSuite
diff --git a/src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala b/src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala
index 4ee340988..e491737cd 100644
--- a/src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala b/src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala
index b3c0f82f2..f286d9d65 100644
--- a/src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.integration.solvers
 
diff --git a/src/test/scala/leon/isabelle/IsabelleLibrarySuite.scala b/src/test/scala/leon/isabelle/IsabelleLibrarySuite.scala
index 669949159..bf4acc202 100644
--- a/src/test/scala/leon/isabelle/IsabelleLibrarySuite.scala
+++ b/src/test/scala/leon/isabelle/IsabelleLibrarySuite.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.isabelle
 
 import scala.concurrent._
diff --git a/src/test/scala/leon/isabelle/IsabelleVerificationSuite.scala b/src/test/scala/leon/isabelle/IsabelleVerificationSuite.scala
index 628a523ad..d8a5ba46f 100644
--- a/src/test/scala/leon/isabelle/IsabelleVerificationSuite.scala
+++ b/src/test/scala/leon/isabelle/IsabelleVerificationSuite.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.isabelle
 
 import leon.regression.verification.VerificationSuite
diff --git a/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala b/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
index a0e52aa0b..2919a605c 100644
--- a/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
+++ b/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.frontends
 
diff --git a/src/test/scala/leon/regression/orb/OrbInstrumentationTestSuite.scala b/src/test/scala/leon/regression/orb/OrbInstrumentationTestSuite.scala
index 82288376e..bb4bb564e 100644
--- a/src/test/scala/leon/regression/orb/OrbInstrumentationTestSuite.scala
+++ b/src/test/scala/leon/regression/orb/OrbInstrumentationTestSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.orb
 import leon.test._
diff --git a/src/test/scala/leon/regression/orb/OrbRegressionSuite.scala b/src/test/scala/leon/regression/orb/OrbRegressionSuite.scala
index 00c01cf27..6c46aeb34 100644
--- a/src/test/scala/leon/regression/orb/OrbRegressionSuite.scala
+++ b/src/test/scala/leon/regression/orb/OrbRegressionSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.orb
 import leon.test._
diff --git a/src/test/scala/leon/regression/repair/RepairSuite.scala b/src/test/scala/leon/regression/repair/RepairSuite.scala
index 653afe38f..16f1ddb88 100644
--- a/src/test/scala/leon/regression/repair/RepairSuite.scala
+++ b/src/test/scala/leon/regression/repair/RepairSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.repair
 
diff --git a/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala b/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
index 61bbe1deb..c2f818a78 100644
--- a/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.synthesis
 
diff --git a/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala b/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
index 9dbb0e36f..b676a3633 100644
--- a/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.synthesis
 
diff --git a/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala b/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
index a3e94094f..3615b0340 100644
--- a/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.synthesis
 
diff --git a/src/test/scala/leon/regression/termination/TerminationSuite.scala b/src/test/scala/leon/regression/termination/TerminationSuite.scala
index 215c72272..c9ccd0dd1 100644
--- a/src/test/scala/leon/regression/termination/TerminationSuite.scala
+++ b/src/test/scala/leon/regression/termination/TerminationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.termination
 
diff --git a/src/test/scala/leon/regression/testcases/TestCasesCompile.scala b/src/test/scala/leon/regression/testcases/TestCasesCompile.scala
index 333413721..f33f3e6f3 100644
--- a/src/test/scala/leon/regression/testcases/TestCasesCompile.scala
+++ b/src/test/scala/leon/regression/testcases/TestCasesCompile.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.testcases
 
diff --git a/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala b/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
index d350bd04b..c122f7048 100644
--- a/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.verification
 
diff --git a/src/test/scala/leon/regression/verification/NewSolversSuite.scala b/src/test/scala/leon/regression/verification/NewSolversSuite.scala
index 5a340d1f8..d41ea95dc 100644
--- a/src/test/scala/leon/regression/verification/NewSolversSuite.scala
+++ b/src/test/scala/leon/regression/verification/NewSolversSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.verification
 
diff --git a/src/test/scala/leon/regression/verification/VerificationSuite.scala b/src/test/scala/leon/regression/verification/VerificationSuite.scala
index 446d06675..becde94bf 100644
--- a/src/test/scala/leon/regression/verification/VerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/VerificationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.verification
 
diff --git a/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
index 6fe7b0740..efecaf71a 100644
--- a/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.verification
 
diff --git a/src/test/scala/leon/regression/verification/purescala/PureScalaVerificationSuite.scala b/src/test/scala/leon/regression/verification/purescala/PureScalaVerificationSuite.scala
index a0beb7fba..5d5679f95 100644
--- a/src/test/scala/leon/regression/verification/purescala/PureScalaVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/purescala/PureScalaVerificationSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.regression.verification
 package purescala
diff --git a/src/test/scala/leon/test/LeonRegressionSuite.scala b/src/test/scala/leon/test/LeonRegressionSuite.scala
index 4181fee97..ba4b51a1b 100644
--- a/src/test/scala/leon/test/LeonRegressionSuite.scala
+++ b/src/test/scala/leon/test/LeonRegressionSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.test
 
diff --git a/src/test/scala/leon/test/LeonTestSuite.scala b/src/test/scala/leon/test/LeonTestSuite.scala
index 18bd8fc14..2c9399f12 100644
--- a/src/test/scala/leon/test/LeonTestSuite.scala
+++ b/src/test/scala/leon/test/LeonTestSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.test
 
diff --git a/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala b/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
index 23f6de068..944814727 100644
--- a/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
+++ b/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.test
 
diff --git a/src/test/scala/leon/test/TestSilentReporter.scala b/src/test/scala/leon/test/TestSilentReporter.scala
index 2a8761584..a7b3535a2 100644
--- a/src/test/scala/leon/test/TestSilentReporter.scala
+++ b/src/test/scala/leon/test/TestSilentReporter.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.test
 
diff --git a/src/test/scala/leon/test/helpers/ExpressionsDSL.scala b/src/test/scala/leon/test/helpers/ExpressionsDSL.scala
index 715a874e6..8d14906c5 100644
--- a/src/test/scala/leon/test/helpers/ExpressionsDSL.scala
+++ b/src/test/scala/leon/test/helpers/ExpressionsDSL.scala
@@ -1,3 +1,5 @@
+/* Copyright 2009-2016 EPFL, Lausanne */
+
 package leon.test.helpers
 
 import org.scalatest.Assertions
diff --git a/src/test/scala/leon/test/helpers/WithLikelyEq.scala b/src/test/scala/leon/test/helpers/WithLikelyEq.scala
index d499f5617..9836fc151 100644
--- a/src/test/scala/leon/test/helpers/WithLikelyEq.scala
+++ b/src/test/scala/leon/test/helpers/WithLikelyEq.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.test.helpers
 
diff --git a/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala b/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
index b510c01bb..e7c0f8d8f 100644
--- a/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
+++ b/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.evaluators
 
diff --git a/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala b/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
index 4f74b00c5..8d40aa5ce 100644
--- a/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.purescala
 
diff --git a/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala b/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
index 2dd956cdd..13f54e9f4 100644
--- a/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.purescala
 
diff --git a/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala b/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
index 5337bc0c4..444a29048 100644
--- a/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.purescala
 
diff --git a/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala b/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
index 33552066e..8c6b5c523 100644
--- a/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.purescala
 
diff --git a/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala b/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
index c7ce03cf7..e24be6f28 100644
--- a/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.purescala
 
diff --git a/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala b/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
index f6d334454..eba92b1f0 100644
--- a/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
+++ b/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.solvers
 
diff --git a/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala b/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
index c54b8dda4..b185454d9 100644
--- a/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
+++ b/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.synthesis
 import leon.test._
diff --git a/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala b/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
index a754d837b..260a8cce6 100644
--- a/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
+++ b/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.synthesis
 import leon.test._
diff --git a/src/test/scala/leon/unit/utils/GraphsSuite.scala b/src/test/scala/leon/unit/utils/GraphsSuite.scala
index 984a427fa..fc3c45ad6 100644
--- a/src/test/scala/leon/unit/utils/GraphsSuite.scala
+++ b/src/test/scala/leon/unit/utils/GraphsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.utils
 
diff --git a/src/test/scala/leon/unit/utils/StreamsSuite.scala b/src/test/scala/leon/unit/utils/StreamsSuite.scala
index 0dd732ada..f11099437 100644
--- a/src/test/scala/leon/unit/utils/StreamsSuite.scala
+++ b/src/test/scala/leon/unit/utils/StreamsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.utils
 
diff --git a/src/test/scala/leon/unit/utils/UtilsSuite.scala b/src/test/scala/leon/unit/utils/UtilsSuite.scala
index fe0286a97..090c4b3a8 100644
--- a/src/test/scala/leon/unit/utils/UtilsSuite.scala
+++ b/src/test/scala/leon/unit/utils/UtilsSuite.scala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
+/* Copyright 2009-2016 EPFL, Lausanne */
 
 package leon.unit.utils
 
-- 
GitLab