diff --git a/psGrammar/demos/demoDynamic.jsgf b/psGrammar/demos/demoDynamic.jsgf
index d7ba2e7f5faee445f9e541cd0cd17b90894f2272..9638db156fa032595f1c31faaea928c8ee8c2fa0 100644
--- a/psGrammar/demos/demoDynamic.jsgf
+++ b/psGrammar/demos/demoDynamic.jsgf
@@ -11,7 +11,7 @@ public <command> = [<robot>] ( <save> | <wave> | <who> | <goTo> | <followMe> | <
 <goTo> = (go to location);
 <followHand> = (come with me) | (give me your hand);
 <gravity> = (gravity compensation) | (show me your gripper) | (switch to gravity mode);
-<exit> = (exit);
+<exit> = (stop the task);
 
 <followMe> = (follow me);
 <handover> = handover;
diff --git a/psGrammar/demos/learning.jsgf b/psGrammar/demos/learning.jsgf
index 0f939e6899c85edd99ccfe47649ec5cf27cebdfb..b62cec3e7aa83317deda6e299fa961daec868630 100644
--- a/psGrammar/demos/learning.jsgf
+++ b/psGrammar/demos/learning.jsgf
@@ -10,4 +10,4 @@ public <command> = [tobi] (<save> | <stop> );
 <location> = (table <numberOfTable>) | (shelf) | (bar) | (bin) | (garbage collection);
 <numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
 
-<stop> = stop | (wait [here]);
+<stop> = (stop the task) | (wait here);
diff --git a/psGrammar/demos/listen.jsgf b/psGrammar/demos/listen.jsgf
index 5b4bfff1a8af426d668a8c12dd870ee4bcb43cc6..6b55421e4b22f8e2a5b615bf71e3842716eb0405 100644
--- a/psGrammar/demos/listen.jsgf
+++ b/psGrammar/demos/listen.jsgf
@@ -5,11 +5,11 @@ public <command> = [tobi] ( <goto> | <stop> );
 
 <goto> = ([go to] <NP_location>);
 
-<stop> = ((abort save) | (stop));
+<stop> = ((abort listen) | (stop the task));
 
 <NP_location> = ([the] <location>);
 
-<location> = (table <numberOfTable>) | shelf | bar | bin;
+<location> = (table <numberOfTable>) | shelf | bar | bin | (garbage collection);
 <numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);