diff --git a/build.gradle b/build.gradle
index 487e2a5f7c..7443562220 100644
--- a/build.gradle
+++ b/build.gradle
@@ -250,7 +250,7 @@ tasks.register('generateDistLicense') {
                                 artifact.put("licenseContent", new String(artifactLicense.license.text.content.decodeBase64()))
                             }
                         } else {
-                            artifact.put("license", artifactLicense.license.name.replaceAll("/", "-"))
+                            artifact.put("license", artifactLicense.license.name)
                             artifact.put("licenseContent", artifactLicense.license.url)
                         }
                         thirdPartyArtifacts.add(artifact)
@@ -271,7 +271,8 @@ tasks.register('generateDistLicense') {
                 "This distribution contains the following third-party:\n\n"
         thirdPartyArtifacts.each { artifact ->
             // Write licenses
-            def artifactLicenseFile = new File(licensesDir, "${artifact.license}.txt")
+            def artifactLicenseFilename = artifact.license.replaceAll("/", "-") + ".txt"
+            def artifactLicenseFile = new File(licensesDir, artifactLicenseFilename)
             if (artifact.licenseContent != null) {
                 artifactLicenseFile.text = artifact.licenseContent
             } else {
@@ -279,7 +280,7 @@ tasks.register('generateDistLicense') {
             }
 
             // Assemble LICENSE
-            distLicenseText += "${artifact.name} ${artifact.version} licensed under '${artifact.license}'. For details see: licenses/${artifact.license}.txt\n"
+            distLicenseText += "${artifact.name} ${artifact.version} licensed under '${artifact.license}'. For details see: licenses/${artifactLicenseFilename}\n"
         }
         distLicenseFile.text = distLicenseText
     }
diff --git a/tools/third-party-licenses/LICENSE b/tools/third-party-licenses/LICENSE
index 92cfd629c1..ffddeb2a9b 100644
--- a/tools/third-party-licenses/LICENSE
+++ b/tools/third-party-licenses/LICENSE
@@ -313,7 +313,7 @@ httpclient 4.5.13 licensed under 'Apache-2.0'. For details see: licenses/Apache-
 httpcore 4.4.13 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
 httpcore-nio 4.4.6 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
 httpmime 4.5.13 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
-icu4j 72.1 licensed under 'Unicode-ICU License'. For details see: licenses/Unicode-ICU License.txt
+icu4j 72.1 licensed under 'Unicode/ICU License'. For details see: licenses/Unicode-ICU License.txt
 ini4j 0.5.4 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
 ipaddress 5.3.3 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
 istack-commons-runtime 3.0.7 licensed under 'CDDL-1.1'. For details see: licenses/CDDL-1.1.txt