diff --git a/{{cookiecutter.repo_name}}/build.gradle b/{{cookiecutter.repo_name}}/build.gradle
index 17b0bb31af91e0e9f1db9f7918449c856907ce95..b9a0cd6fea77f7f5d1deee56f09b7360e4e3f7d3 100644
--- a/{{cookiecutter.repo_name}}/build.gradle
+++ b/{{cookiecutter.repo_name}}/build.gradle
@@ -79,14 +79,14 @@ jar {
     }
 
     from {
-        configurations.runtimeClasspath.collect { return (it.isDirectory() ? it : zipTree(it)) : null }
+        configurations.runtimeClasspath.collect { return (it.isDirectory() ? it : zipTree(it)) }
     }
 }
 
 def relastJar = 'libs/relast.jar'
-def relastFiles = ['./src/main/jastadd/common/MotionGrammar.relast', './src/main/jastadd/World.relast', './src/main/jastadd/LoadUnload.relast']
-def grammarPrefix = './src/gen/jastadd/MotionGrammar'
-def grammarDiagramFile = './src/gen/resources/diagrams/grammar/uml.png'
+def relastFiles = ['./src/main/jastadd/{{cookiecutter.project_short_name}}.relast']
+def grammarPrefix = './src/gen/jastadd/{{cookiecutter.project_short_name}}'
+def grammarDiagramFile = './src/gen/resources/{{cookiecutter.project_short_name}}Grammar.png'
 def jastAddListName = 'JastAddList'
 
 task generateGrammarDiagrams(type: JavaExec) {