diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
index f499b17f69..93e981c6c6 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
@@ -281,11 +281,11 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy {
         else if (definition instanceof UDTDefinition) {
             UDTDefinition udt = (UDTDefinition) definition;
 
-            // [#330] A UDT inside of a package is a PL/SQL RECORD type
-            if (udt.getPackage() == null)
-                return "udt";
+            // [#330] [#6529] A UDT inside of a package is a PL/SQL RECORD type
+            if (udt.getPackage() != null)
+                return "packages." + getJavaIdentifier(udt.getPackage()).toLowerCase() + ".udt";
             else
-                return "packages." + getJavaIdentifier(udt.getPackage()).toLowerCase();
+                return "udt";
         }
         else if (definition instanceof PackageDefinition) {
             return "packages";