diff --git a/psGrammar/demos/learning.jsgf b/psGrammar/demos/learning.jsgf
index b62cec3e7aa83317deda6e299fa961daec868630..cf2fd2755f5142991257dbbc28ffd309ea68e3c3 100644
--- a/psGrammar/demos/learning.jsgf
+++ b/psGrammar/demos/learning.jsgf
@@ -1,13 +1,15 @@
 #JSGF V1.0;
 grammar learning;
 
-public <command> = [tobi] (<save> | <stop> );
+public <command> = [<robot>] (<save> | <stop> );
+
+<robot> = (tobi | robot | biron | pepper | tiago);
 
 <NP_location> = ([the] <location>);
 
 <save> = <pre> <NP_location>;
 <pre> = ([please] save) | (here is) | memorize;
-<location> = (table <numberOfTable>) | (shelf) | (bar) | (bin) | (garbage collection);
+<location> = (table <numberOfTable>) | (bar) | (bin) | (garbage collection);
 <numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
 
 <stop> = (stop the task) | (wait here);
diff --git a/psGrammar/demos/listen.jsgf b/psGrammar/demos/listen.jsgf
index 6b55421e4b22f8e2a5b615bf71e3842716eb0405..74d61020010177f7393bd717a44dd14df82acd9d 100644
--- a/psGrammar/demos/listen.jsgf
+++ b/psGrammar/demos/listen.jsgf
@@ -1,7 +1,9 @@
 #JSGF V1.0;
 grammar commands;
 
-public <command> = [tobi] ( <goto> | <stop> );
+public <command> = [<robot>] ( <goto> | <stop> );
+
+<robot> = (tobi | robot | biron | pepper | tiago);
 
 <goto> = ([go to] <NP_location>);
 
@@ -9,7 +11,7 @@ public <command> = [tobi] ( <goto> | <stop> );
 
 <NP_location> = ([the] <location>);
 
-<location> = (table <numberOfTable>) | shelf | bar | bin | (garbage collection);
+<location> = (table <numberOfTable>) | bar | bin | (garbage collection);
 <numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);