diff --git a/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckFinishedListener.java b/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckFinishedListener.java
index 4f8826d8280817a420e3f5c14c118903f7ee0498..0843def55fc8a82e7c305a101c51a70b68c36484 100644
--- a/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckFinishedListener.java
+++ b/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckFinishedListener.java
@@ -18,7 +18,7 @@ import de.prob.exceptions.ProBException;
 import de.prob.logging.Logger;
 
 /**
- * This JobChangeAdapter presents the user the results of a deadlock freedom
+ * This JobChangeAdapter presents the user the results of a assertion
  * check.
  * 
  * @see AssertionCheckHandler
@@ -60,13 +60,13 @@ public class AssertionCheckFinishedListener extends ProBJobFinishedListener {
 			case COUNTER_EXAMPLE:
 				dialogType = MessageDialog.WARNING;
 				dialogTitle = "COUNTER-EXAMPLE FOUND!";
-				message = "The model contains a Counter-Example state, it will be shown in the state view.";
+				message = "The model contains a Counter-Example state for the Context Theorems, it will be shown in the state view.";
 				displayCounterExample(command, animator);
 				break;
 			case INTERRUPTED:
 				dialogType = MessageDialog.WARNING;
 				dialogTitle = " Interrupt";
-				message = "The deadlock check has been interrupted by the user or a time-out.";
+				message = "The context theorem check has been interrupted by the user or a time-out.";
 				break;
 			default:
 				Logger.notifyUser("Unexpected result: " + result);
@@ -74,7 +74,7 @@ public class AssertionCheckFinishedListener extends ProBJobFinishedListener {
 			}
 		}
 		if (shell.isDisposed()) {
-			System.out.println("Deadlock freedom check finished: "
+			System.out.println("Context Theorems check finished: "
 					+ dialogTitle);
 		} else {
 			final Runnable runnable = new Runnable() {
diff --git a/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckHandler.java b/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckHandler.java
index e311721be347f77ab7d10108c2e6cd4fbe31b545..65b6f7998d99b9060a832f9c902ecc45fff90db2 100644
--- a/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckHandler.java
+++ b/de.prob.ui/src/de/prob/ui/assertion/AssertionCheckHandler.java
@@ -17,8 +17,7 @@ import de.prob.core.command.ConstraintBasedAssertionCheckCommand;
 import de.prob.logging.Logger;
 
 /**
- * This handler provides a simple dialog to ask for an optional predicate to
- * check for deadlocks in the model.
+ * This handler provides a way to start the static assertion checking command
  * 
  * @author plagge
  */