diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java
index dd52a74a41..abf1c1a7bb 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java
@@ -56,7 +56,7 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
     public JavaWriter(File file, String fullyQualifiedTypes, String encoding, boolean javadoc, Files files) {
         super(file, encoding, files);
 
-        this.className = file.getName().replaceAll("\\.(java|scala)$", "");
+        this.className = file.getName().replaceAll("\\.(java|scala|kt)$", "");
         this.isJava = file.getName().endsWith(".java");
         this.isScala = file.getName().endsWith(".scala");
         this.isKotlin = file.getName().endsWith(".kt");