diff --git a/ps-config/demos/demoDynamic.conf b/ps-config/demos/demoDynamic.conf
index e7c3353c2d5479b6235a9b92466cb5a4bb4ae84e..571add51dd9291c06695db1e4d8499269afe148b 100644
--- a/ps-config/demos/demoDynamic.conf
+++ b/ps-config/demos/demoDynamic.conf
@@ -34,14 +34,14 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=saveCommand;
-rsbscope=/speechrec/psa/saveCommand;
-jsgf=../../psGrammar/demos/saveCommand.jsgf;
+name=commands;
+rsbscope=/speechrec/psa/commands;
+jsgf=../../psGrammar/demos/commands.jsgf;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=controlExecution;
+name=learning;
 rsbscope=/speechrec/psa/learning;
 jsgf=../../psGrammar/demos/learning.jsgf;
 bestpath=no;
diff --git a/ps-grammar/demos/commands.jsgf b/ps-grammar/demos/commands.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..00567c7e42f14460fbbd3cb97b035a2f4ecb0f4d
--- /dev/null
+++ b/ps-grammar/demos/commands.jsgf
@@ -0,0 +1,12 @@
+#JSGF V1.0;
+grammar commands;
+
+public <command> = [tobi] ( <followMe> | <ordering> | <test> );
+
+<followMe> = (follow me);
+
+<test> = (execute test);
+
+<ordering> = (start ordering);
+
+
diff --git a/ps-grammar/demos/learning.jsgf b/ps-grammar/demos/learning.jsgf
index 1aa4a9e9bad5bb47fece085c1188ed124d03cfe8..428df4caa7207953880a3a885be9f5c0b1d0bcf5 100644
--- a/ps-grammar/demos/learning.jsgf
+++ b/ps-grammar/demos/learning.jsgf
@@ -1,5 +1,5 @@
 #JSGF V1.0;
-grammar saveLocation;
+grammar learning;
 
 public <command> = [tobi] (<save> | <stop> );
 
diff --git a/ps-grammar/demos/save.jsgf b/ps-grammar/demos/old/save.jsgf
similarity index 100%
rename from ps-grammar/demos/save.jsgf
rename to ps-grammar/demos/old/save.jsgf
diff --git a/ps-grammar/demos/saveCommand.jsgf b/ps-grammar/demos/old/saveCommand.jsgf
similarity index 100%
rename from ps-grammar/demos/saveCommand.jsgf
rename to ps-grammar/demos/old/saveCommand.jsgf
diff --git a/ps-grammar/demos/saveLocation.jsgf b/ps-grammar/demos/old/saveLocation.jsgf
similarity index 100%
rename from ps-grammar/demos/saveLocation.jsgf
rename to ps-grammar/demos/old/saveLocation.jsgf