diff --git a/jastadd-mquat-base/src/main/jastadd/mquat.parser b/jastadd-mquat-base/src/main/jastadd/mquat.parser
index 768e3b25a50f025a0f949380f0ff2781b10813c0..ba0955b37e9de64fb0ce8262b11075c5fa025ef0 100644
--- a/jastadd-mquat-base/src/main/jastadd/mquat.parser
+++ b/jastadd-mquat-base/src/main/jastadd/mquat.parser
@@ -37,7 +37,7 @@ import java.util.HashMap;
 %goal solution;
 
 Request request =
-    REQUEST NAME FOR component_ref.c LB_CURLY request_body.b RB_CURLY {: b.setTarget(c); return b; :}
+    REQUEST NAME? FOR component_ref.c LB_CURLY request_body.b RB_CURLY {: b.setTarget(c); return b; :}
   ;
 
 Request request_body =
diff --git a/jastadd-mquat-solver/src/test/resources/test_01.txt b/jastadd-mquat-solver/src/test/resources/test_01.txt
index 090557820539ec1f646971bdf452f8ee877716d7..c2b5fbdd634136f402f39deee8d3cba715dd7b96 100644
--- a/jastadd-mquat-solver/src/test/resources/test_01.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_01.txt
@@ -85,7 +85,7 @@ component c1 {
         providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
     }
 }
-request c0 {
+request for c0 {
     meta size = 6
     requiring quality >= 35
 }
diff --git a/jastadd-mquat-solver/src/test/resources/test_02.txt b/jastadd-mquat-solver/src/test/resources/test_02.txt
index 08a3dc501979ae5f04de8426c69097b99be49c65..fa6e4fe3503e389da3c57121668a32f66622e2ac 100644
--- a/jastadd-mquat-solver/src/test/resources/test_02.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_02.txt
@@ -88,7 +88,7 @@ component c1 {
         providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
     }
 }
-request c0 {
+request for c0 {
     meta size = 1
     requiring quality >= 35
 }
diff --git a/jastadd-mquat-solver/src/test/resources/test_03.txt b/jastadd-mquat-solver/src/test/resources/test_03.txt
index 89501f1c9e0ec4cd420eb26a94cae072dedaacbe..7d6b937d99962fe7e5023e7e06a298e93064bade 100644
--- a/jastadd-mquat-solver/src/test/resources/test_03.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_03.txt
@@ -104,11 +104,11 @@ component c1 {
         providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
     }
 }
-request c0 {
+request for c0 {
     meta size = 1
     requiring quality >= 35
 }
-request c1 {
+request for c1 {
     meta size = 40
     requiring quality >= 35
 }
diff --git a/jastadd-mquat-solver/src/test/resources/test_04.txt b/jastadd-mquat-solver/src/test/resources/test_04.txt
index 24a42b82184abe2166b5a6fecd7b201fa8f95205..eb58bafa3a1c84cb3440812543d9903dd734c056 100644
--- a/jastadd-mquat-solver/src/test/resources/test_04.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_04.txt
@@ -124,7 +124,7 @@ component c2 {
     }
 }
 
-request c0 {
+request for c0 {
     meta size = 2
     requiring quality >= 35
 }
diff --git a/jastadd-mquat-solver/src/test/resources/test_05.txt b/jastadd-mquat-solver/src/test/resources/test_05.txt
index 3f5806eee76eabe62928d2679a302588c592eb4b..1e4fa152c0c6d4e1b85c83e55b4de1de2dce785c 100644
--- a/jastadd-mquat-solver/src/test/resources/test_05.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_05.txt
@@ -226,7 +226,7 @@ component G {
     }
 }
 
-request A {
+request for A {
     meta size = 2
     requiring quality >= 35
 }