diff --git a/ros2rag.tests/build.gradle b/ros2rag.tests/build.gradle
index 3357c81de76caa277188c3f953da52403d1194bb..20906aa9cb5f938b5bc3f15c7b3d51a1135462f3 100644
--- a/ros2rag.tests/build.gradle
+++ b/ros2rag.tests/build.gradle
@@ -65,8 +65,8 @@ task preprocessExampleTest(type: JavaExec, group: 'verification') {
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
     args '--outputDir=src/test/02-after-ros2rag/example',
-            '--inputGrammar=src/test/01-input/example/Example.relast',
-            '--inputRos2Rag=src/test/01-input/example/Example.ros2rag',
+            '--inputGrammar=src/test/01-input/example/Test.relast',
+            '--inputRos2Rag=src/test/01-input/example/Test.ros2rag',
             '--rootNode=Model',
             '--logReads', '--logWrites'
 }
@@ -77,7 +77,7 @@ task compileExampleTest(type: RelastTest) {
     relastFiles 'src/test/02-after-ros2rag/example/Grammar.relast'
     grammarName = 'src/test/03-after-relast/example/example'
     packageName = 'example.ast'
-    moreInputFiles 'src/test/01-input/example/Example.jadd',
+    moreInputFiles 'src/test/01-input/example/Test.jadd',
             'src/test/02-after-ros2rag/example/MqttUpdater.jadd',
             'src/test/02-after-ros2rag/example/ROS2RAG.jadd'
 }
@@ -96,8 +96,8 @@ task preprocessDefaultOnlyReadTest(type: JavaExec, group: 'verification') {
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
     args '--outputDir=src/test/02-after-ros2rag/defaultOnlyRead',
-            '--inputGrammar=src/test/01-input/defaultOnlyRead/Example.relast',
-            '--inputRos2Rag=src/test/01-input/defaultOnlyRead/Example.ros2rag',
+            '--inputGrammar=src/test/01-input/defaultOnlyRead/Test.relast',
+            '--inputRos2Rag=src/test/01-input/defaultOnlyRead/Test.ros2rag',
             '--rootNode=A',
             '--verbose'
 }
@@ -126,8 +126,8 @@ task preprocessDefaultOnlyWriteTest(type: JavaExec, group: 'verification') {
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
     args '--outputDir=src/test/02-after-ros2rag/defaultOnlyWrite',
-            '--inputGrammar=src/test/01-input/defaultOnlyWrite/Example.relast',
-            '--inputRos2Rag=src/test/01-input/defaultOnlyWrite/Example.ros2rag',
+            '--inputGrammar=src/test/01-input/defaultOnlyWrite/Test.relast',
+            '--inputRos2Rag=src/test/01-input/defaultOnlyWrite/Test.ros2rag',
             '--rootNode=A',
             '--verbose'
 }
@@ -138,7 +138,7 @@ task compileDefaultOnlyWriteTest(type: RelastTest) {
     relastFiles 'src/test/02-after-ros2rag/defaultOnlyWrite/Grammar.relast'
     grammarName = 'src/test/03-after-relast/defaultOnlyWrite/defaultOnlyWrite'
     packageName = 'defaultOnlyWrite.ast'
-    moreInputFiles 'src/test/01-input/defaultOnlyWrite/Example.jadd',
+    moreInputFiles 'src/test/01-input/defaultOnlyWrite/Test.jadd',
             'src/test/02-after-ros2rag/defaultOnlyWrite/MqttUpdater.jadd',
             'src/test/02-after-ros2rag/defaultOnlyWrite/ROS2RAG.jadd'
 }
@@ -157,8 +157,8 @@ task preprocessRead1Write2Test(type: JavaExec, group: 'verification') {
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
     args '--outputDir=src/test/02-after-ros2rag/read1write2',
-            '--inputGrammar=src/test/01-input/read1write2/Example.relast',
-            '--inputRos2Rag=src/test/01-input/read1write2/Example.ros2rag',
+            '--inputGrammar=src/test/01-input/read1write2/Test.relast',
+            '--inputRos2Rag=src/test/01-input/read1write2/Test.ros2rag',
             '--rootNode=A',
             '--logReads', '--logWrites'
 }
@@ -169,7 +169,7 @@ task compileRead1Write2Test(type: RelastTest) {
     relastFiles 'src/test/02-after-ros2rag/read1write2/Grammar.relast'
     grammarName = 'src/test/03-after-relast/read1write2/read1write2'
     packageName = 'read1write2.ast'
-    moreInputFiles 'src/test/01-input/read1write2/Example.jadd',
+    moreInputFiles 'src/test/01-input/read1write2/Test.jadd',
             'src/test/02-after-ros2rag/read1write2/MqttUpdater.jadd',
             'src/test/02-after-ros2rag/read1write2/ROS2RAG.jadd'
 }
@@ -188,8 +188,8 @@ task preprocessRead2Write1Test(type: JavaExec, group: 'verification') {
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
     args '--outputDir=src/test/02-after-ros2rag/read2write1',
-            '--inputGrammar=src/test/01-input/read2write1/Example.relast',
-            '--inputRos2Rag=src/test/01-input/read2write1/Example.ros2rag',
+            '--inputGrammar=src/test/01-input/read2write1/Test.relast',
+            '--inputRos2Rag=src/test/01-input/read2write1/Test.ros2rag',
             '--rootNode=A', '--verbose',
             '--logReads', '--logWrites'
 }
@@ -200,7 +200,7 @@ task compileRead2Write1Test(type: RelastTest) {
     relastFiles 'src/test/02-after-ros2rag/read2write1/Grammar.relast'
     grammarName = 'src/test/03-after-relast/read2write1/read2write1'
     packageName = 'read2write1.ast'
-    moreInputFiles 'src/test/01-input/read2write1/Example.jadd',
+    moreInputFiles 'src/test/01-input/read2write1/Test.jadd',
             'src/test/02-after-ros2rag/read2write1/MqttUpdater.jadd',
             'src/test/02-after-ros2rag/read2write1/ROS2RAG.jadd'
 }
diff --git a/ros2rag.tests/src/test/01-input/defaultOnlyRead/Example.relast b/ros2rag.tests/src/test/01-input/defaultOnlyRead/Test.relast
similarity index 100%
rename from ros2rag.tests/src/test/01-input/defaultOnlyRead/Example.relast
rename to ros2rag.tests/src/test/01-input/defaultOnlyRead/Test.relast
diff --git a/ros2rag.tests/src/test/01-input/defaultOnlyRead/Example.ros2rag b/ros2rag.tests/src/test/01-input/defaultOnlyRead/Test.ros2rag
similarity index 100%
rename from ros2rag.tests/src/test/01-input/defaultOnlyRead/Example.ros2rag
rename to ros2rag.tests/src/test/01-input/defaultOnlyRead/Test.ros2rag
diff --git a/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.jadd b/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.jadd
similarity index 100%
rename from ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.jadd
rename to ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.jadd
diff --git a/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.relast b/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.relast
similarity index 100%
rename from ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.relast
rename to ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.relast
diff --git a/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.ros2rag b/ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.ros2rag
similarity index 100%
rename from ros2rag.tests/src/test/01-input/defaultOnlyWrite/Example.ros2rag
rename to ros2rag.tests/src/test/01-input/defaultOnlyWrite/Test.ros2rag
diff --git a/ros2rag.tests/src/test/01-input/example/Example.jadd b/ros2rag.tests/src/test/01-input/example/Test.jadd
similarity index 100%
rename from ros2rag.tests/src/test/01-input/example/Example.jadd
rename to ros2rag.tests/src/test/01-input/example/Test.jadd
diff --git a/ros2rag.tests/src/test/01-input/example/Example.relast b/ros2rag.tests/src/test/01-input/example/Test.relast
similarity index 100%
rename from ros2rag.tests/src/test/01-input/example/Example.relast
rename to ros2rag.tests/src/test/01-input/example/Test.relast
diff --git a/ros2rag.tests/src/test/01-input/example/Example.ros2rag b/ros2rag.tests/src/test/01-input/example/Test.ros2rag
similarity index 100%
rename from ros2rag.tests/src/test/01-input/example/Example.ros2rag
rename to ros2rag.tests/src/test/01-input/example/Test.ros2rag
diff --git a/ros2rag.tests/src/test/01-input/read1write2/Example.jadd b/ros2rag.tests/src/test/01-input/read1write2/Test.jadd
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read1write2/Example.jadd
rename to ros2rag.tests/src/test/01-input/read1write2/Test.jadd
diff --git a/ros2rag.tests/src/test/01-input/read1write2/Example.relast b/ros2rag.tests/src/test/01-input/read1write2/Test.relast
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read1write2/Example.relast
rename to ros2rag.tests/src/test/01-input/read1write2/Test.relast
diff --git a/ros2rag.tests/src/test/01-input/read1write2/Example.ros2rag b/ros2rag.tests/src/test/01-input/read1write2/Test.ros2rag
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read1write2/Example.ros2rag
rename to ros2rag.tests/src/test/01-input/read1write2/Test.ros2rag
diff --git a/ros2rag.tests/src/test/01-input/read2write1/Example.jadd b/ros2rag.tests/src/test/01-input/read2write1/Test.jadd
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read2write1/Example.jadd
rename to ros2rag.tests/src/test/01-input/read2write1/Test.jadd
diff --git a/ros2rag.tests/src/test/01-input/read2write1/Example.relast b/ros2rag.tests/src/test/01-input/read2write1/Test.relast
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read2write1/Example.relast
rename to ros2rag.tests/src/test/01-input/read2write1/Test.relast
diff --git a/ros2rag.tests/src/test/01-input/read2write1/Example.ros2rag b/ros2rag.tests/src/test/01-input/read2write1/Test.ros2rag
similarity index 100%
rename from ros2rag.tests/src/test/01-input/read2write1/Example.ros2rag
rename to ros2rag.tests/src/test/01-input/read2write1/Test.ros2rag