diff --git a/build.gradle b/build.gradle
index 1351479b..9b351918 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ subprojects {
         from("$rootDir/resources/license/LICENSE.txt") {
             filteringCharset = 'UTF-8'
             filter(ReplaceTokens, tokens: [
-                    name: project.appName
+                    name: appName
             ])
         }
         into "$projectDir/build/tmp/license"
@@ -87,11 +87,11 @@ subprojects {
             overview "$projectDir/build/tmp/javadoc/overview.html"
             bottom """
                 <a href="${appIssueTrackerUrl}">Report a bug or suggest an enhancement</a><br>
-                ${project.name} is open source and licensed under the <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
-                Official website and more information at: <a target="_blank" href="${project.appWebsiteUrl}">${project.appWebsiteUrl}</a><br>
-                Copyright &copy; ${project.appCopyrightYear}<br>
-                ${project.vendorName}, ${project.vendorCountry}<br>
-                <a target="_blank" href="${project.vendorWebsiteUrl}">${project.vendorWebsiteUrl}</a>
+                ${project.name} is open source and licensed under the <a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+                Official website and more information at: <a target="_blank" href="$appWebsiteUrl">$appWebsiteUrl</a><br>
+                Copyright &copy; $appCopyrightYear<br>
+                $vendorName, $vendorCountry<br>
+                <a target="_blank" href="$vendorWebsiteUrl">$vendorWebsiteUrl</a>
                 """.replaceAll("[\r|\n]+", "")
             addStringOption('doctitle', project.name + ' - ' + project.version)
             addStringOption('Xdoclint:none', '-quiet')
@@ -114,9 +114,9 @@ subprojects {
 
     jar {
         manifest {
-            attributes('Implementation-Title': project.appName,
+            attributes('Implementation-Title': appName,
                     'Implementation-Version': project.version,
-                    'Implementation-Vendor': project.vendorName
+                    'Implementation-Vendor': vendorName
             )
         }
         into('META-INF') {
@@ -131,10 +131,10 @@ subprojects {
                 from components.java
                 pom {
                     name = project.name
-                    url = project.vendorWebsiteUrl
+                    url = vendorWebsiteUrl
                     scm {
-                        url = project.appGitHubUrl
-                        connection = 'scm:git:' + project.appGitConnection
+                        url = appGitHubUrl
+                        connection = 'scm:git:' + appGitConnection
                     }
                 }
             }
diff --git a/citydb-cli/build.gradle b/citydb-cli/build.gradle
index 08b13980..b0da6597 100644
--- a/citydb-cli/build.gradle
+++ b/citydb-cli/build.gradle
@@ -34,7 +34,7 @@ processResources {
 application {
     mainModule = 'org.citydb.cli'
     mainClass = 'org.citydb.cli.Launcher'
-    applicationName = project.appCliCommand
+    applicationName = appCliCommand
     executableDir = ''
 
     startScripts {
@@ -50,7 +50,7 @@ application {
 
 distributions {
     main {
-        distributionBaseName = project.appName
+        distributionBaseName = appName
         contents {
             into('license') {
                 from "$rootDir/resources/license/APACHE-2.0.txt"
@@ -70,8 +70,9 @@ distributions {
 }
 
 tasks.register('buildBundle', Zip) {
+    group = 'distribution'
     dependsOn installDist
-    from "$projectDir/build/install/$project.appName"
+    from "$projectDir/build/install/$appName"
     destinationDirectory = distZip.destinationDirectory.get()
-    archiveFileName = project.appName + '-' + project.version + '.zip'
+    archiveFileName = appName + '-' + project.version + '.zip'
 }
\ No newline at end of file
diff --git a/properties.gradle b/properties.gradle
index 35b8cbc7..009fc66b 100644
--- a/properties.gradle
+++ b/properties.gradle
@@ -5,9 +5,9 @@ ext {
     appCliCommand = 'citydb'
     appDescription = 'Command-line tool for the 3D City Database'
     appWebsiteUrl = 'https://github.com/3dcitydb'
-    appGitHubUrl = 'https://github.com/3dcitydb/importer-exporter'
+    appGitHubUrl = 'https://github.com/3dcitydb/citydb-tool'
     appGitConnection = appGitHubUrl + '.git'
-    appIssueTrackerUrl = 'https://github.com/3dcitydb/importer-exporter/issues'
+    appIssueTrackerUrl = 'https://github.com/3dcitydb/citydb-tool/issues'
     appCopyrightYear = '2022-' + date.format('yyyy')
 
     vendorName = 'virtualcitysystems GmbH'