diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 4e70b5d..aedec12 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -418,9 +418,9 @@
 # output dir stub
 %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
 # we can copy the javadoc to not arched dir, or make it not noarch
-%define uniquejavadocdir() %{expand:%{name}%{?1}}
+%define uniquejavadocdir() %{expand:%{compatiblename}%{?1}}
 # main id and dir of this jdk
-%define uniquesuffix() %{expand:%{name}%{?1}}
+%define uniquesuffix() %{expand:%{compatiblename}%{?1}}
 
 #################################################################
 # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
@@ -2408,6 +2408,7 @@ end
 - Make headless own /usr/share/doc/java-21-openjdk
 - Make javadoc-zip own /usr/share/javadoc/java-21-openjdk
 - Delete old conflicting links in pretrans for headless, javadoc and javadoc-zip
+- Use compatiblename not name in uniquejavadocdir and uniquesuffix
 - Resolves: RHEL-71920
 - Resolves: RHEL-71954
 - Resolves: RHEL-69321