diff --git a/build-logic/src/main/groovy/io/micronaut/build/internal/openapi/OpenApiGeneratorTask.java b/build-logic/src/main/groovy/io/micronaut/build/internal/openapi/OpenApiGeneratorTask.java
index e973b7ecfc..7a603f3bab 100644
--- a/build-logic/src/main/groovy/io/micronaut/build/internal/openapi/OpenApiGeneratorTask.java
+++ b/build-logic/src/main/groovy/io/micronaut/build/internal/openapi/OpenApiGeneratorTask.java
@@ -28,12 +28,14 @@
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
@@ -89,6 +91,26 @@ public Provider<Directory> getGeneratedTestSourcesDirectory() {
     @Input
     public abstract ListProperty<Map<String, String>> getResponseBodyMappings();
 
+    @Optional
+    @Input
+    public abstract MapProperty<String, String> getNameMapping();
+
+    @Optional
+    @Input
+    public abstract Property<String> getApiNamePrefix();
+
+    @Optional
+    @Input
+    public abstract Property<String> getApiNameSuffix();
+
+    @Optional
+    @Input
+    public abstract Property<String> getModelNamePrefix();
+
+    @Optional
+    @Input
+    public abstract Property<String> getModelNameSuffix();
+
     @Inject
     protected abstract ExecOperations getExecOperations();
 
@@ -99,6 +121,9 @@ public void execute() throws IOException {
         var lang = getLang().get();
         var generatedAnnotation = getGeneratedAnnotation().get();
         var ksp = getKsp().get();
+
+        var apiPrefix =
+
         Files.createDirectories(generatedSourcesDir.toPath());
         Files.createDirectories(generatedTestSourcesDir.toPath());
         getProject().getLogger().info("json: {}", getParameterMappings().get());
@@ -115,6 +140,11 @@ public void execute() throws IOException {
             args.add(lang.toUpperCase());
             args.add(Boolean.toString(generatedAnnotation));
             args.add(Boolean.toString(ksp));
+            args.add(getNameMapping().get().toString());
+            args.add(getApiNamePrefix().isPresent() ? getApiNamePrefix().get() : "");
+            args.add(getApiNameSuffix().isPresent() ? getApiNameSuffix().get() : "");
+            args.add(getModelNamePrefix().isPresent() ? getModelNamePrefix().get() : "");
+            args.add(getModelNameSuffix().isPresent() ? getModelNameSuffix().get() : "");
             javaexec.args(args);
         });
     }
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
index aa6b7487c4..ba9834cd18 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
@@ -129,6 +129,7 @@ protected AbstractMicronautJavaCodegen() {
         // CHECKSTYLE:OFF
         // Set all the fields
         useBeanValidation = true;
+        useJakartaEe = true;
         useOptional = false;
         visitable = false;
         testTool = OPT_TEST_JUNIT;
@@ -290,6 +291,30 @@ public void setApiPackage(String apiPackage) {
         updateOption(CodegenConstants.API_PACKAGE, apiPackage);
     }
 
+    @Override
+    public void setApiNamePrefix(String apiNamePrefix) {
+        super.setApiNamePrefix(apiNamePrefix);
+        updateOption(CodegenConstants.API_NAME_PREFIX, apiNamePrefix);
+    }
+
+    @Override
+    public void setApiNameSuffix(String apiNameSuffix) {
+        super.setApiNameSuffix(apiNameSuffix);
+        updateOption(CodegenConstants.API_NAME_SUFFIX, apiNameSuffix);
+    }
+
+    @Override
+    public void setModelNamePrefix(String modelNamePrefix) {
+        super.setModelNamePrefix(modelNamePrefix);
+        updateOption(CodegenConstants.MODEL_NAME_PREFIX, modelNamePrefix);
+    }
+
+    @Override
+    public void setModelNameSuffix(String modelNameSuffix) {
+        super.setModelNameSuffix(modelNameSuffix);
+        updateOption(CodegenConstants.MODEL_NAME_SUFFIX, modelNameSuffix);
+    }
+
     @Override
     public void setInvokerPackage(String invokerPackage) {
         super.setInvokerPackage(invokerPackage);
@@ -481,6 +506,42 @@ public void addResponseBodyMappings(List<ResponseBodyMapping> responseBodyMappin
         this.responseBodyMappings.addAll(responseBodyMappings);
     }
 
+    public void addSchemaMapping(Map<String, String> schemaMapping) {
+        this.schemaMapping.putAll(schemaMapping);
+    }
+
+    public void addImportMapping(Map<String, String> importMapping) {
+        this.importMapping.putAll(importMapping);
+    }
+
+    public void addNameMapping(Map<String, String> nameMapping) {
+        this.nameMapping.putAll(nameMapping);
+    }
+
+    public void addTypeMapping(Map<String, String> typeMapping) {
+        this.typeMapping.putAll(typeMapping);
+    }
+
+    public void addEnumNameMapping(Map<String, String> enumNameMapping) {
+        this.enumNameMapping.putAll(enumNameMapping);
+    }
+
+    public void addModelNameMapping(Map<String, String> modelNameMapping) {
+        this.modelNameMapping.putAll(modelNameMapping);
+    }
+
+    public void addInlineSchemaNameMapping(Map<String, String> inlineSchemaNameMapping) {
+        this.inlineSchemaNameMapping.putAll(inlineSchemaNameMapping);
+    }
+
+    public void addInlineSchemaOption(Map<String, String> inlineSchemaOption) {
+        this.inlineSchemaOption.putAll(inlineSchemaOption);
+    }
+
+    public void addOpenapiNormalizer(Map<String, String> openapiNormalizer) {
+        this.openapiNormalizer.putAll(openapiNormalizer);
+    }
+
     // CHECKSTYLE:OFF
     private void maybeSetSwagger() {
         if (additionalProperties.containsKey(OPT_GENERATE_SWAGGER_ANNOTATIONS)) {
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
index 8b0e8ffd43..3fc78b59ff 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
@@ -554,6 +554,42 @@ public void addResponseBodyMappings(List<ResponseBodyMapping> responseBodyMappin
         this.responseBodyMappings.addAll(responseBodyMappings);
     }
 
+    public void addSchemaMapping(Map<String, String> schemaMapping) {
+        this.schemaMapping.putAll(schemaMapping);
+    }
+
+    public void addImportMapping(Map<String, String> importMapping) {
+        this.importMapping.putAll(importMapping);
+    }
+
+    public void addNameMapping(Map<String, String> nameMapping) {
+        this.nameMapping.putAll(nameMapping);
+    }
+
+    public void addTypeMapping(Map<String, String> typeMapping) {
+        this.typeMapping.putAll(typeMapping);
+    }
+
+    public void addEnumNameMapping(Map<String, String> enumNameMapping) {
+        this.enumNameMapping.putAll(enumNameMapping);
+    }
+
+    public void addModelNameMapping(Map<String, String> modelNameMapping) {
+        this.modelNameMapping.putAll(modelNameMapping);
+    }
+
+    public void addInlineSchemaNameMapping(Map<String, String> inlineSchemaNameMapping) {
+        this.inlineSchemaNameMapping.putAll(inlineSchemaNameMapping);
+    }
+
+    public void addInlineSchemaOption(Map<String, String> inlineSchemaOption) {
+        this.inlineSchemaOption.putAll(inlineSchemaOption);
+    }
+
+    public void addOpenapiNormalizer(Map<String, String> openapiNormalizer) {
+        this.openapiNormalizer.putAll(openapiNormalizer);
+    }
+
     // CHECKSTYLE:OFF
     private void maybeSetSwagger() {
         if (additionalProperties.containsKey(OPT_GENERATE_SWAGGER_ANNOTATIONS)) {
@@ -812,7 +848,7 @@ public String getTypeDeclaration(Schema p) {
 
         if (ModelUtils.isMapSchema(target)) {
             // Note: ModelUtils.isMapSchema(p) returns true when p is a composed schema that also defines
-            // additionalproperties: true
+            // additionalProperties: true
             Schema<?> inner = ModelUtils.getAdditionalProperties(target);
             if (inner == null) {
                 System.err.println("`" + p.getName() + "` (map property) does not have a proper inner type defined. Default to type:string");
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
index 95e6a32d39..1b3146ce70 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
@@ -51,7 +51,7 @@ public class JavaMicronautClientCodegen extends AbstractMicronautJavaCodegen<Jav
         title = "OpenAPI Micronaut Client";
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-            .stability(Stability.BETA)
+            .stability(Stability.STABLE)
             .build();
         additionalProperties.put("client", "true");
 
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java
index 8dd30eae0e..ee49c8b071 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java
@@ -78,7 +78,7 @@ public class JavaMicronautServerCodegen extends AbstractMicronautJavaCodegen<Jav
         apiDocPath = "docs/controllers";
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-            .stability(Stability.BETA)
+            .stability(Stability.STABLE)
             .build();
         additionalProperties.put("server", "true");
 
@@ -98,6 +98,8 @@ public class JavaMicronautServerCodegen extends AbstractMicronautJavaCodegen<Jav
         cliOptions.add(CliOption.newBoolean(OPT_GENERATE_STREAMING_FILE_UPLOAD, "Whether to generate StreamingFileUpload type for file request body", generateStreamingFileUpload));
         cliOptions.add(CliOption.newBoolean(OPT_AOT, "Generate compatible code with micronaut-aot", aot));
 
+        setApiNamePrefix(API_PREFIX);
+        setApiNameSuffix(API_SUFFIX);
 
         // Set the type mappings
         // It could be also StreamingFileUpload
@@ -197,8 +199,6 @@ public void processOpts() {
 
         // Api file
         apiTemplateFiles.clear();
-        setApiNamePrefix(API_PREFIX);
-        setApiNameSuffix(API_SUFFIX);
         apiTemplateFiles.put("server/controller-interface.mustache", ".java");
 
         apiTestTemplateFiles.clear();
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautClientCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautClientCodegen.java
index d8815751ac..7f5618c71a 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautClientCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautClientCodegen.java
@@ -51,7 +51,7 @@ public class KotlinMicronautClientCodegen extends AbstractMicronautKotlinCodegen
         title = "OpenAPI Micronaut Client";
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-            .stability(Stability.BETA)
+            .stability(Stability.STABLE)
             .build();
         additionalProperties.put("client", "true");
 
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautServerCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautServerCodegen.java
index a3b7b83d14..ea1922de86 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautServerCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/KotlinMicronautServerCodegen.java
@@ -76,7 +76,7 @@ public class KotlinMicronautServerCodegen extends AbstractMicronautKotlinCodegen
         apiDocPath = "docs/controllers";
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-            .stability(Stability.BETA)
+            .stability(Stability.STABLE)
             .build();
         additionalProperties.put("server", "true");
 
@@ -95,6 +95,9 @@ public class KotlinMicronautServerCodegen extends AbstractMicronautKotlinCodegen
         cliOptions.add(CliOption.newBoolean(OPT_GENERATE_STREAMING_FILE_UPLOAD, "Whether to generate StreamingFileUpload type for file request body", generateStreamingFileUpload));
         cliOptions.add(CliOption.newBoolean(OPT_AOT, "Generate compatible code with micronaut-aot", aot));
 
+        setApiNamePrefix(API_PREFIX);
+        setApiNameSuffix(API_SUFFIX);
+
         // Set the type mappings
         // It could be also StreamingFileUpload
         typeMapping.put("file", "CompletedFileUpload");
@@ -188,8 +191,6 @@ public void processOpts() {
 
         // Api file
         apiTemplateFiles.clear();
-        setApiNamePrefix(API_PREFIX);
-        setApiNameSuffix(API_SUFFIX);
         apiTemplateFiles.put("server/controller-interface.mustache", ".kt");
 
         apiTestTemplateFiles.clear();
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java
index ca14147da5..317cfdd5dd 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
@@ -57,7 +58,7 @@ private MicronautCodeGeneratorEntryPoint(URI definitionFile,
                                              JavaMicronautClientCodegen.ClientOptions javaClientOptions,
                                              KotlinMicronautServerCodegen.ServerOptions kotlinServerOptions,
                                              KotlinMicronautClientCodegen.ClientOptions kotlinClientOptions
-                                             ) {
+    ) {
         this.definitionFile = definitionFile;
         this.outputDirectory = outputDirectory;
         this.codeGenerator = codeGenerator;
@@ -141,6 +142,46 @@ private void configureOptions() {
             if (options.responseBodyMappings != null) {
                 javaCodeGen.addResponseBodyMappings(options.responseBodyMappings);
             }
+            if (options.schemaMapping != null) {
+                javaCodeGen.addSchemaMapping(options.schemaMapping);
+            }
+            if (options.importMapping != null) {
+                javaCodeGen.addImportMapping(options.importMapping);
+            }
+            if (options.nameMapping != null) {
+                javaCodeGen.addNameMapping(options.nameMapping);
+            }
+            if (options.typeMapping != null) {
+                javaCodeGen.addTypeMapping(options.typeMapping);
+            }
+            if (options.enumNameMapping != null) {
+                javaCodeGen.addEnumNameMapping(options.enumNameMapping);
+            }
+            if (options.modelNameMapping != null) {
+                javaCodeGen.addModelNameMapping(options.modelNameMapping);
+            }
+            if (options.inlineSchemaNameMapping != null) {
+                javaCodeGen.addInlineSchemaNameMapping(options.inlineSchemaNameMapping);
+            }
+            if (options.inlineSchemaOption != null) {
+                javaCodeGen.addInlineSchemaOption(options.inlineSchemaOption);
+            }
+            if (options.openapiNormalizer != null) {
+                javaCodeGen.addOpenapiNormalizer(options.openapiNormalizer);
+            }
+            if (options.apiNamePrefix != null && !options.apiNamePrefix.isBlank()) {
+                javaCodeGen.setApiNamePrefix(options.apiNamePrefix);
+            }
+            if (options.apiNameSuffix != null && !options.apiNameSuffix.isBlank()) {
+                javaCodeGen.setApiNameSuffix(options.apiNameSuffix);
+            }
+            if (options.modelNamePrefix != null && !options.modelNamePrefix.isBlank()) {
+                javaCodeGen.setModelNamePrefix(options.modelNamePrefix);
+            }
+            if (options.modelNameSuffix != null && !options.modelNameSuffix.isBlank()) {
+                javaCodeGen.setModelNameSuffix(options.modelNameSuffix);
+            }
+
             javaCodeGen.setReactive(options.reactive);
             javaCodeGen.setGenerateHttpResponseAlways(options.generateHttpResponseAlways);
             javaCodeGen.setGenerateHttpResponseWhereRequired(options.generateHttpResponseWhereRequired);
@@ -165,6 +206,46 @@ private void configureOptions() {
             if (options.responseBodyMappings != null) {
                 kotlinCodeGen.addResponseBodyMappings(options.responseBodyMappings);
             }
+            if (options.schemaMapping != null) {
+                kotlinCodeGen.addSchemaMapping(options.schemaMapping);
+            }
+            if (options.importMapping != null) {
+                kotlinCodeGen.addImportMapping(options.importMapping);
+            }
+            if (options.nameMapping != null) {
+                kotlinCodeGen.addNameMapping(options.nameMapping);
+            }
+            if (options.typeMapping != null) {
+                kotlinCodeGen.addTypeMapping(options.typeMapping);
+            }
+            if (options.enumNameMapping != null) {
+                kotlinCodeGen.addEnumNameMapping(options.enumNameMapping);
+            }
+            if (options.modelNameMapping != null) {
+                kotlinCodeGen.addModelNameMapping(options.modelNameMapping);
+            }
+            if (options.inlineSchemaNameMapping != null) {
+                kotlinCodeGen.addInlineSchemaNameMapping(options.inlineSchemaNameMapping);
+            }
+            if (options.inlineSchemaOption != null) {
+                kotlinCodeGen.addInlineSchemaOption(options.inlineSchemaOption);
+            }
+            if (options.openapiNormalizer != null) {
+                kotlinCodeGen.addOpenapiNormalizer(options.openapiNormalizer);
+            }
+            if (options.apiNamePrefix != null && !options.apiNamePrefix.isBlank()) {
+                kotlinCodeGen.setApiNamePrefix(options.apiNamePrefix);
+            }
+            if (options.apiNameSuffix != null && !options.apiNameSuffix.isBlank()) {
+                kotlinCodeGen.setApiNameSuffix(options.apiNameSuffix);
+            }
+            if (options.modelNamePrefix != null && !options.modelNamePrefix.isBlank()) {
+                kotlinCodeGen.setModelNamePrefix(options.modelNamePrefix);
+            }
+            if (options.modelNameSuffix != null && !options.modelNameSuffix.isBlank()) {
+                kotlinCodeGen.setModelNameSuffix(options.modelNameSuffix);
+            }
+
             kotlinCodeGen.setReactive(options.reactive);
             kotlinCodeGen.setGenerateHttpResponseAlways(options.generateHttpResponseAlways);
             kotlinCodeGen.setGenerateHttpResponseWhereRequired(options.generateHttpResponseWhereRequired);
@@ -413,6 +494,21 @@ private static class DefaultOptionsBuilder implements MicronautCodeGeneratorOpti
             private String modelPackage;
             private List<ParameterMapping> parameterMappings;
             private List<ResponseBodyMapping> responseBodyMappings;
+            private Map<String, String> schemaMapping;
+            private Map<String, String> importMapping;
+            private Map<String, String> nameMapping;
+            private Map<String, String> typeMapping;
+            private Map<String, String> enumNameMapping;
+            private Map<String, String> modelNameMapping;
+            private Map<String, String> inlineSchemaNameMapping;
+            private Map<String, String> inlineSchemaOption;
+            private Map<String, String> openapiNormalizer;
+
+            private String apiNamePrefix;
+            private String apiNameSuffix;
+            private String modelNamePrefix;
+            private String modelNameSuffix;
+
             private boolean optional;
             private boolean reactive = true;
             private boolean generateHttpResponseAlways;
@@ -464,6 +560,84 @@ public MicronautCodeGeneratorOptionsBuilder withResponseBodyMappings(List<Respon
                 return this;
             }
 
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withSchemaMapping(Map<String, String> schemaMapping) {
+                this.schemaMapping = schemaMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withImportMapping(Map<String, String> importMapping) {
+                this.importMapping = importMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withNameMapping(Map<String, String> nameMapping) {
+                this.nameMapping = nameMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withTypeMapping(Map<String, String> typeMapping) {
+                this.typeMapping = typeMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withEnumNameMapping(Map<String, String> enumNameMapping) {
+                this.enumNameMapping = enumNameMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withModelNameMapping(Map<String, String> modelNameMapping) {
+                this.modelNameMapping = modelNameMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withInlineSchemaNameMapping(Map<String, String> inlineSchemaNameMapping) {
+                this.inlineSchemaNameMapping = inlineSchemaNameMapping;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withInlineSchemaOption(Map<String, String> inlineSchemaOption) {
+                this.inlineSchemaOption = inlineSchemaOption;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withOpenapiNormalizer(Map<String, String> openapiNormalizer) {
+                this.openapiNormalizer = openapiNormalizer;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withApiNamePrefix(String apiNamePrefix) {
+                this.apiNamePrefix = apiNamePrefix;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withApiNameSuffix(String apiNameSuffix) {
+                this.apiNameSuffix = apiNameSuffix;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withModelNamePrefix(String modelNamePrefix) {
+                this.modelNamePrefix = modelNamePrefix;
+                return this;
+            }
+
+            @Override
+            public MicronautCodeGeneratorOptionsBuilder withModelNameSuffix(String modelNameSuffix) {
+                this.modelNameSuffix = modelNameSuffix;
+                return this;
+            }
+
             @Override
             public MicronautCodeGeneratorOptionsBuilder withReactive(boolean reactive) {
                 this.reactive = reactive;
@@ -513,7 +687,37 @@ public MicronautCodeGeneratorOptionsBuilder withDateTimeFormat(DateTimeFormat fo
             }
 
             private Options build() {
-                return new Options(lang, apiPackage, modelPackage, invokerPackage, artifactId, parameterMappings, responseBodyMappings, beanValidation, optional, reactive, generateHttpResponseAlways, generateHttpResponseWhereRequired, testFramework, serializationLibraryKind, dateTimeFormat);
+                return new Options(
+                    lang,
+                    apiPackage,
+                    modelPackage,
+                    invokerPackage,
+                    artifactId,
+                    parameterMappings,
+                    responseBodyMappings,
+                    schemaMapping,
+                    importMapping,
+                    nameMapping,
+                    typeMapping,
+                    enumNameMapping,
+                    modelNameMapping,
+                    inlineSchemaNameMapping,
+                    inlineSchemaOption,
+                    openapiNormalizer,
+
+                    apiNamePrefix,
+                    apiNameSuffix,
+                    modelNamePrefix,
+                    modelNameSuffix,
+
+                    beanValidation,
+                    optional,
+                    reactive,
+                    generateHttpResponseAlways,
+                    generateHttpResponseWhereRequired,
+                    testFramework,
+                    serializationLibraryKind,
+                    dateTimeFormat);
             }
         }
     }
@@ -542,6 +746,21 @@ private record Options(
         String artifactId,
         List<ParameterMapping> parameterMappings,
         List<ResponseBodyMapping> responseBodyMappings,
+        Map<String, String> schemaMapping,
+        Map<String, String> importMapping,
+        Map<String, String> nameMapping,
+        Map<String, String> typeMapping,
+        Map<String, String> enumNameMapping,
+        Map<String, String> modelNameMapping,
+        Map<String, String> inlineSchemaNameMapping,
+        Map<String, String> inlineSchemaOption,
+        Map<String, String> openapiNormalizer,
+
+        String apiNamePrefix,
+        String apiNameSuffix,
+        String modelNamePrefix,
+        String modelNameSuffix,
+
         boolean beanValidation,
         boolean optional,
         boolean reactive,
diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java
index 1119558a4a..21db670b3c 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java
@@ -16,6 +16,7 @@
 package io.micronaut.openapi.generator;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Builder for generic options that the Micronaut code generator supports.
@@ -79,6 +80,109 @@ public interface MicronautCodeGeneratorOptionsBuilder {
      */
     MicronautCodeGeneratorOptionsBuilder withResponseBodyMappings(List<ResponseBodyMapping> responseBodyMappings);
 
+    /**
+     * Add the schema mappings.
+     *
+     * @param schemaMapping the schema mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withSchemaMapping(Map<String, String> schemaMapping);
+
+    /**
+     * Add the import mappings.
+     *
+     * @param importMapping the import mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withImportMapping(Map<String, String> importMapping);
+
+    /**
+     * Add the name mappings.
+     *
+     * @param nameMapping the name mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withNameMapping(Map<String, String> nameMapping);
+
+    /**
+     * Add the type mappings.
+     *
+     * @param typeMapping the type mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withTypeMapping(Map<String, String> typeMapping);
+
+    /**
+     * Add the enum name mappings.
+     *
+     * @param enumNameMapping the enum name mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withEnumNameMapping(Map<String, String> enumNameMapping);
+
+    /**
+     * Add the model name mappings.
+     *
+     * @param modelNameMapping the model name mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withModelNameMapping(Map<String, String> modelNameMapping);
+
+    /**
+     * Add the inline schema name mappings.
+     *
+     * @param inlineSchemaNameMapping the inline schema name mappings
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withInlineSchemaNameMapping(Map<String, String> inlineSchemaNameMapping);
+
+    /**
+     * Add the inline schema options.
+     *
+     * @param inlineSchemaOption the inline schema options
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withInlineSchemaOption(Map<String, String> inlineSchemaOption);
+
+    /**
+     * Add the OpenAPi normalizer options.
+     *
+     * @param openapiNormalizer the OpenAPi normalizer options
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withOpenapiNormalizer(Map<String, String> openapiNormalizer);
+
+    /**
+     * Set the api name prefix.
+     *
+     * @param apiNamePrefix the api name prefix
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withApiNamePrefix(String apiNamePrefix);
+
+    /**
+     * Set the api name suffix.
+     *
+     * @param apiNameSuffix the api name suffix
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withApiNameSuffix(String apiNameSuffix);
+
+    /**
+     * Set the model name prefix.
+     *
+     * @param modelNamePrefix the model name prefix
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withModelNamePrefix(String modelNamePrefix);
+
+    /**
+     * Set the model name suffix.
+     *
+     * @param modelNameSuffix the model name suffix
+     * @return this builder
+     */
+    MicronautCodeGeneratorOptionsBuilder withModelNameSuffix(String modelNameSuffix);
 
     /**
      * If set to true, the generator will use reactive types.
diff --git a/test-suite-generator-util/src/main/java/io/micronaut/openapi/testsuite/GeneratorMain.java b/test-suite-generator-util/src/main/java/io/micronaut/openapi/testsuite/GeneratorMain.java
index cc0be0bbb8..df9f2b601c 100644
--- a/test-suite-generator-util/src/main/java/io/micronaut/openapi/testsuite/GeneratorMain.java
+++ b/test-suite-generator-util/src/main/java/io/micronaut/openapi/testsuite/GeneratorMain.java
@@ -60,6 +60,13 @@ public static void main(String[] args) throws URISyntaxException {
         List<ResponseBodyMapping> responseBodyMappings =
             parseResponseBodyMappings(args[5]);
 
+        Map<String, String> nameMapping = parseNameMapping(args[9]);
+
+        String apiPrefix = args[10];
+        String apiSuffix = args[11];
+        String modelPrefix = args[12];
+        String modelSuffix = args[13];
+
         MicronautCodeGeneratorEntryPoint.OutputKind[] outputKinds
             = Arrays.stream(args[3].split(","))
             .map(MicronautCodeGeneratorEntryPoint.OutputKind::of)
@@ -77,9 +84,14 @@ public static void main(String[] args) throws URISyntaxException {
                     .withBeanValidation(true)
                     .withOptional(true)
                     .withReactive(true)
+                    .withApiNamePrefix(apiPrefix)
+                    .withApiNameSuffix(apiSuffix)
+                    .withModelNamePrefix(modelPrefix)
+                    .withModelNameSuffix(modelSuffix)
                     .withTestFramework(lang == JAVA ? MicronautCodeGeneratorEntryPoint.TestFramework.SPOCK : MicronautCodeGeneratorEntryPoint.TestFramework.JUNIT5)
                     .withParameterMappings(parameterMappings)
-                    .withResponseBodyMappings(responseBodyMappings);
+                    .withResponseBodyMappings(responseBodyMappings)
+                    .withNameMapping(nameMapping);
             });
         if (server) {
             if (lang == GeneratorLanguage.KOTLIN) {
@@ -136,6 +148,10 @@ private static List<ResponseBodyMapping> parseResponseBodyMappings(String string
         )).toList();
     }
 
+    private static Map<String, String> parseNameMapping(String string) {
+        return parseMap(string);
+    }
+
     private static List<Map<String, String>> parseListOfMaps(String string) {
         List<Map<String, String>> result = new ArrayList<>();
         if (string.isBlank()) {
@@ -183,4 +199,36 @@ private static List<Map<String, String>> parseListOfMaps(String string) {
 
         return result;
     }
+
+    private static Map<String, String> parseMap(String string) {
+        var result = new HashMap<String, String>();
+        if (string.isBlank()) {
+            return result;
+        }
+
+        assert string.charAt(0) == '{';
+        int i = 1;
+
+        int endIndex = string.indexOf('}', i);
+
+        while (i < endIndex) {
+            if (string.charAt(i) == ' ') {
+                ++i;
+            }
+            int nameIndex = string.indexOf('=', i);
+            String name = string.substring(i, nameIndex);
+            i = nameIndex + 1;
+            int valueIndex = string.indexOf(',', i);
+            if (endIndex < valueIndex || valueIndex == -1) {
+                valueIndex = endIndex;
+            }
+            String value = string.substring(i, valueIndex);
+            i = valueIndex + 1;
+
+            result.put(name, value);
+        }
+        assert i == string.length() - 1;
+
+        return result;
+    }
 }
diff --git a/test-suite-java-server-generator/build.gradle b/test-suite-java-server-generator/build.gradle
index 40d3488b5f..1e41665221 100644
--- a/test-suite-java-server-generator/build.gradle
+++ b/test-suite-java-server-generator/build.gradle
@@ -68,4 +68,5 @@ tasks.named("generateOpenApi") {
             // Ignored header - Does not wrap the response in HttpResponse
             [headerName: "ignored-header"]
     ]
+    nameMapping = [test: "changedTest"]
 }
diff --git a/test-suite-java-server-generator/spec.yaml b/test-suite-java-server-generator/spec.yaml
index 3328d4fb79..befec924ef 100644
--- a/test-suite-java-server-generator/spec.yaml
+++ b/test-suite-java-server-generator/spec.yaml
@@ -895,6 +895,9 @@ components:
         message:
           type: string
           description: The error message
+        test:
+          type: string
+          description: Test prop
 
   parameters:
     PageQueryParam:
diff --git a/test-suite-kotlin-ksp-server-generator/build.gradle b/test-suite-kotlin-ksp-server-generator/build.gradle
index 9322a96010..a4963a5a0b 100644
--- a/test-suite-kotlin-ksp-server-generator/build.gradle
+++ b/test-suite-kotlin-ksp-server-generator/build.gradle
@@ -75,11 +75,6 @@ tasks.named("generateOpenApi") {
     ]
 }
 
-// TODO: Wait fix https://github.com/micronaut-projects/micronaut-core/issues/10117
-test {
-    exclude 'io/micronaut/**'
-}
-
 kotlin {
     jvmToolchain(17)
 }
diff --git a/test-suite-kotlin-ksp-server-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt b/test-suite-kotlin-ksp-server-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt
index 3989bd56c6..e6a280b8e7 100644
--- a/test-suite-kotlin-ksp-server-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt
+++ b/test-suite-kotlin-ksp-server-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt
@@ -21,6 +21,7 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.Arguments.arguments
 import org.junit.jupiter.params.provider.EnumSource
 import org.junit.jupiter.params.provider.MethodSource
+import spock.lang.Issue
 import java.math.BigDecimal
 import java.time.LocalDate
 import java.time.OffsetDateTime
@@ -198,6 +199,8 @@ class RequestBodyControllerTest(
         assertEquals(model, response)
     }
 
+    @Issue("https://github.com/micronaut-projects/micronaut-serialization/issues/768")
+    @Disabled
     @MethodSource("discriminators")
     @ParameterizedTest
     fun testSendModelWithDiscriminatorChild(discriminatorName: String, model: Animal) {