diff --git a/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala b/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
index d11548ac4f680605ed12fa370e87e31837e748e7..eb58ff9f1e426168d0ac7c2fd27ebd158e53d8cb 100755
--- a/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
+++ b/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
@@ -79,6 +79,6 @@ object DalekSurveillanceSystem{
   val pb = new DCOP(Set(d1, d2, d3, d4, d5), Set(constraint12, constraint13, constraint14, constraint23, constraint25,
         constraint34, constraint35, constraint45))
 
-  val assignment : Context = new Context().fix(
+  val initialContext : Context = new Context().fix(
     Map(d1-> north, d2 -> north, d3 -> north, d4 -> north, d5 -> north))
 }
diff --git a/src/main/scala/org/scadcop/util/Main.scala b/src/main/scala/org/scadcop/util/Main.scala
index 4da83ad691838f3a1da2919b1affbf1c45cf412f..cbab58283f6bbceeafdadac8e547f90e639e4ea1 100755
--- a/src/main/scala/org/scadcop/util/Main.scala
+++ b/src/main/scala/org/scadcop/util/Main.scala
@@ -9,8 +9,8 @@ import akka.actor.ActorSystem
   * Main application to test ScaDCOP on a toy example
   */
 object Main extends App {
-  import org.scadcop.example.RobeColouringExample._
-  //or import org.scadcop.example.DalekSurveillanceSystem._
+  //import org.scadcop.example.RobeColouringExample._
+  import org.scadcop.example.DalekSurveillanceSystem._
   //or import org.scadcop.example.ToyExample._
 
   val system = ActorSystem("TestDistributedSolver")
diff --git a/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala b/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
index 89572a2526e1fbba496f2140a290feea7facb8f5..a547d3667af00ea67ea2c6bffb83ca34f2268463 100755
--- a/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
+++ b/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
@@ -15,8 +15,8 @@ class ObjectiveDalekSurveillanceSystemSpec extends AnyFlatSpec {
 
   "The objective when all the directions are north" should " be 33.0" in {
     println(pb)
-    println(assignment)
-    assert(pb.objective(assignment) ~= 33.00)
+    println(initialContext)
+    assert(pb.objective(initialContext) ~= 33.00)
   }
 
   "The objective when all the directions are south" should " be 33.0" in {