diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationService.java
index efed03c6d..762fac79a 100644
--- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationService.java
@@ -2,7 +2,7 @@
 package io.github.springwolf.core.asyncapi.scanners.common.payload;
 
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
 import lombok.RequiredArgsConstructor;
 
@@ -12,13 +12,13 @@
 
 @RequiredArgsConstructor
 public class PayloadAsyncOperationService {
-    private final PayloadClassExtractor payloadClassExtractor;
+    private final PayloadExtractor payloadExtractor;
     private final PayloadService payloadService;
 
     public PayloadSchemaObject extractSchema(AsyncOperation operationData, Method method) {
         Optional<Type> payloadType = operationData.payloadType() != Object.class
                 ? Optional.of(operationData.payloadType())
-                : payloadClassExtractor.extractFrom(method);
+                : payloadExtractor.extractFrom(method);
 
         String contentType = operationData.message().contentType();
 
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterService.java
index 11385c50f..923e08017 100644
--- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterService.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.core.asyncapi.scanners.common.payload;
 
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
 import lombok.RequiredArgsConstructor;
 
@@ -11,11 +11,11 @@
 
 @RequiredArgsConstructor
 public class PayloadMethodParameterService implements PayloadMethodService {
-    private final PayloadClassExtractor payloadClassExtractor;
+    private final PayloadExtractor payloadExtractor;
     private final PayloadService payloadService;
 
     public PayloadSchemaObject extractSchema(Method method) {
-        Optional<Type> payloadType = payloadClassExtractor.extractFrom(method);
+        Optional<Type> payloadType = payloadExtractor.extractFrom(method);
 
         return payloadType.map(payloadService::buildSchema).orElseGet(payloadService::useUnusedPayload);
     }
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractor.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractor.java
similarity index 97%
rename from springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractor.java
index bfce7a0ab..94712a2a5 100644
--- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractor.java
@@ -15,10 +15,10 @@
 import java.util.Optional;
 
 @Slf4j
-public class PayloadClassExtractor {
+public class PayloadExtractor {
     private final Map<String, Integer> extractableClassToArgumentIndex;
 
-    public PayloadClassExtractor(SpringwolfConfigProperties properties) {
+    public PayloadExtractor(SpringwolfConfigProperties properties) {
         if (properties.getPayload() != null) {
             extractableClassToArgumentIndex = properties.getPayload().getExtractableClasses();
         } else {
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverter.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractor.java
similarity index 97%
rename from springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverter.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractor.java
index 4f53556f1..756b179fd 100644
--- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverter.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractor.java
@@ -11,11 +11,11 @@
 import java.util.Map;
 
 @Slf4j
-public class TypeToClassConverter {
+public class TypeExtractor {
 
     private final Map<String, Integer> extractableClassToArgumentIndex;
 
-    public TypeToClassConverter(SpringwolfConfigProperties properties) {
+    public TypeExtractor(SpringwolfConfigProperties properties) {
         if (properties.getPayload() != null) {
             extractableClassToArgumentIndex = properties.getPayload().getExtractableClasses();
         } else {
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java
index 49bf64694..3c716d30f 100644
--- a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java
@@ -32,9 +32,9 @@
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodReturnService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.StringValueResolverProxy;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
@@ -186,14 +186,14 @@ public SchemaWalker yamlSchemaWalker(
 
     @Bean
     @ConditionalOnMissingBean
-    public TypeToClassConverter typeToClassConverter(SpringwolfConfigProperties springwolfConfigProperties) {
-        return new TypeToClassConverter(springwolfConfigProperties);
+    public TypeExtractor typeToClassConverter(SpringwolfConfigProperties springwolfConfigProperties) {
+        return new TypeExtractor(springwolfConfigProperties);
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public PayloadClassExtractor payloadClassExtractor(SpringwolfConfigProperties springwolfConfigProperties) {
-        return new PayloadClassExtractor(springwolfConfigProperties);
+    public PayloadExtractor payloadClassExtractor(SpringwolfConfigProperties springwolfConfigProperties) {
+        return new PayloadExtractor(springwolfConfigProperties);
     }
 
     @Bean
@@ -212,15 +212,15 @@ public PayloadService payloadService(
     @Bean
     @ConditionalOnMissingBean
     public PayloadAsyncOperationService payloadAsyncOperationService(
-            PayloadClassExtractor payloadClassExtractor, PayloadService payloadService) {
-        return new PayloadAsyncOperationService(payloadClassExtractor, payloadService);
+            PayloadExtractor payloadExtractor, PayloadService payloadService) {
+        return new PayloadAsyncOperationService(payloadExtractor, payloadService);
     }
 
     @Bean
     @ConditionalOnMissingBean
     public PayloadMethodParameterService payloadMethodParameterService(
-            PayloadClassExtractor payloadClassExtractor, PayloadService payloadService) {
-        return new PayloadMethodParameterService(payloadClassExtractor, payloadService);
+            PayloadExtractor payloadExtractor, PayloadService payloadService) {
+        return new PayloadMethodParameterService(payloadExtractor, payloadService);
     }
 
     @Bean
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java
index 0c1b80488..6bbbd7955 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java
@@ -26,9 +26,9 @@
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
@@ -64,9 +64,9 @@
             PayloadMethodParameterService.class,
             PayloadAsyncOperationService.class,
             PayloadService.class,
-            PayloadClassExtractor.class,
+            PayloadExtractor.class,
             HeaderClassExtractor.class,
-            TypeToClassConverter.class,
+            TypeExtractor.class,
             DefaultSchemaWalker.class,
             SchemaWalkerProvider.class,
             ExampleJsonValueGenerator.class,
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java
index f318110bf..4f64b080d 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java
@@ -26,9 +26,9 @@
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
@@ -66,9 +66,9 @@
             PayloadMethodParameterService.class,
             PayloadAsyncOperationService.class,
             PayloadService.class,
-            PayloadClassExtractor.class,
+            PayloadExtractor.class,
             HeaderClassExtractor.class,
-            TypeToClassConverter.class,
+            TypeExtractor.class,
             DefaultSchemaWalker.class,
             SchemaWalkerProvider.class,
             ExampleJsonValueGenerator.class,
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationServiceTest.java
index de280d5df..183eab5ad 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationServiceTest.java
@@ -6,7 +6,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncMessage;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
 import org.junit.jupiter.api.BeforeEach;
@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.when;
 
 class PayloadAsyncOperationServiceTest {
-    private PayloadClassExtractor payloadClassExtractor = mock(PayloadClassExtractor.class);
+    private PayloadExtractor payloadExtractor = mock(PayloadExtractor.class);
     private ComponentsService componentsService = mock(ComponentsService.class);
     private SpringwolfConfigProperties properties = mock(SpringwolfConfigProperties.class);
 
@@ -35,7 +35,7 @@ class PayloadAsyncOperationServiceTest {
     @BeforeEach
     void setUp() {
         payloadService = new PayloadService(componentsService, properties);
-        payloadAsyncOperationService = new PayloadAsyncOperationService(payloadClassExtractor, payloadService);
+        payloadAsyncOperationService = new PayloadAsyncOperationService(payloadExtractor, payloadService);
     }
 
     @Test
@@ -73,7 +73,7 @@ public void shouldExtractPayloadFromMethodWithAnnotation() {
         when(asyncOperation.message()).thenReturn(asyncMessage);
 
         Method method = mock(Method.class);
-        when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
+        when(payloadExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
 
         String schemaName = "my-schema-name";
         when(componentsService.getSchemaName(String.class)).thenReturn(schemaName);
@@ -100,7 +100,7 @@ public void shouldReturnPayloadNotUsed() {
         when(asyncOperation.message()).thenReturn(asyncMessage);
 
         Method method = mock(Method.class);
-        when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.empty());
+        when(payloadExtractor.extractFrom(method)).thenReturn(Optional.empty());
 
         // when
         var result = payloadAsyncOperationService.extractSchema(asyncOperation, method);
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterServiceTest.java
index 9b0c2c34e..e63ab76d3 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterServiceTest.java
@@ -4,7 +4,7 @@
 import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
 import org.junit.jupiter.api.BeforeEach;
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.when;
 
 class PayloadMethodParameterServiceTest {
-    private PayloadClassExtractor payloadClassExtractor = mock(PayloadClassExtractor.class);
+    private PayloadExtractor payloadExtractor = mock(PayloadExtractor.class);
     private ComponentsService componentsService = mock(ComponentsService.class);
     private SpringwolfConfigProperties.ConfigDocket docket = mock(SpringwolfConfigProperties.ConfigDocket.class);
     private SpringwolfConfigProperties properties = mock(SpringwolfConfigProperties.class);
@@ -31,7 +31,7 @@ class PayloadMethodParameterServiceTest {
     @BeforeEach
     void setUp() {
         payloadService = new PayloadService(componentsService, properties);
-        payloadMethodParameterService = new PayloadMethodParameterService(payloadClassExtractor, payloadService);
+        payloadMethodParameterService = new PayloadMethodParameterService(payloadExtractor, payloadService);
     }
 
     @Test
@@ -41,7 +41,7 @@ public void shouldExtractPayloadFromMethod() {
         when(docket.getDefaultContentType()).thenReturn("application/json");
 
         Method method = mock(Method.class);
-        when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
+        when(payloadExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
 
         String schemaName = "my-schema-name";
         when(componentsService.getSchemaName(String.class)).thenReturn(schemaName);
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractorTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractorTest.java
similarity index 93%
rename from springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractorTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractorTest.java
index 3e5c80ca7..37a00a143 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadClassExtractorTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/PayloadExtractorTest.java
@@ -12,9 +12,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 
-class PayloadClassExtractorTest {
+class PayloadExtractorTest {
 
-    private final PayloadClassExtractor extractor = new PayloadClassExtractor(new SpringwolfConfigProperties());
+    private final PayloadExtractor extractor = new PayloadExtractor(new SpringwolfConfigProperties());
 
     @Test
     void getPayloadType() throws NoSuchMethodException {
diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverterTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractorTest.java
similarity index 83%
rename from springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverterTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractorTest.java
index eaf1494e6..6733b0b75 100644
--- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeToClassConverterTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/common/payload/internal/TypeExtractorTest.java
@@ -17,9 +17,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class TypeToClassConverterTest {
+class TypeExtractorTest {
 
-    private final TypeToClassConverter typeToClassConverter;
+    private final TypeExtractor typeExtractor;
 
     {
         SpringwolfConfigProperties properties = new SpringwolfConfigProperties();
@@ -28,14 +28,14 @@ class TypeToClassConverterTest {
                 .getPayload()
                 .setExtractableClasses(new HashMap<>(properties.getPayload().getExtractableClasses()));
         properties.getPayload().getExtractableClasses().put(TestClass.CustomPair.class.getName(), 1);
-        typeToClassConverter = new TypeToClassConverter(properties);
+        typeExtractor = new TypeExtractor(properties);
     }
 
     @Test
     void getPayloadType() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithString", String.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(String.class);
     }
@@ -44,7 +44,7 @@ void getPayloadType() throws NoSuchMethodException {
     void getPayloadTypeWithMessageOfInterfaces() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithMessageOfGenericClasses", Message.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(Collection.class);
     }
@@ -53,7 +53,7 @@ void getPayloadTypeWithMessageOfInterfaces() throws NoSuchMethodException {
     void getPayloadTypeWithInterface() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithGenericClass", Collection.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(Collection.class);
     }
@@ -62,7 +62,7 @@ void getPayloadTypeWithInterface() throws NoSuchMethodException {
     void getPayloadTypeWithMessageOfListOfString() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithMessageOfListOfString", Message.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(String.class);
     }
@@ -71,7 +71,7 @@ void getPayloadTypeWithMessageOfListOfString() throws NoSuchMethodException {
     void getPayloadTypeWithMessageOfListOfCustomPair() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithMessageOfCustomPair", Message.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         // payload is extracted from the second generic argument
         assertThat(result).isEqualTo(Double.class);
@@ -81,7 +81,7 @@ void getPayloadTypeWithMessageOfListOfCustomPair() throws NoSuchMethodException
     void getPayloadTypeWithMessageOfString() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithMessageOfString", Message.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(String.class);
     }
@@ -90,7 +90,7 @@ void getPayloadTypeWithMessageOfString() throws NoSuchMethodException {
     void getPayloadTypeWithCustomMessageExtendsInterface() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCustomMessageExtendsInterface", List.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(TestClass.CustomMessage.class);
     }
@@ -99,7 +99,7 @@ void getPayloadTypeWithCustomMessageExtendsInterface() throws NoSuchMethodExcept
     void getPayloadTypeWithCustomMessagePairExtendsInterface() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCustomMessagePairExtendsInterface", List.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         // payload is extracted from the second generic argument
         assertThat(result).isEqualTo(Double.class);
@@ -109,7 +109,7 @@ void getPayloadTypeWithCustomMessagePairExtendsInterface() throws NoSuchMethodEx
     void getPayloadTypeWithCustomMessageSuperInterface() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCustomMessageSuperInterface", List.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(TestClass.CustomMessage.class);
     }
@@ -118,7 +118,7 @@ void getPayloadTypeWithCustomMessageSuperInterface() throws NoSuchMethodExceptio
     void getPayloadTypeWithCustomMessagePairSuperInterface() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCustomMessagePairSuperInterface", List.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         // payload is extracted from the second generic argument
         assertThat(result).isEqualTo(Double.class);
@@ -128,7 +128,7 @@ void getPayloadTypeWithCustomMessagePairSuperInterface() throws NoSuchMethodExce
     void getPayloadTypeWithPrimitive() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithPrimitive", int.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(int.class);
     }
@@ -137,7 +137,7 @@ void getPayloadTypeWithPrimitive() throws NoSuchMethodException {
     void getPayloadTypeWithPrimitiveArray() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithPrimitiveArray", int[].class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(int.class);
     }
@@ -146,7 +146,7 @@ void getPayloadTypeWithPrimitiveArray() throws NoSuchMethodException {
     void getPayloadTypeWithListOfPrimitiveArray() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCollectionOfPrimitiveArray", List.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(int.class);
     }
@@ -155,7 +155,7 @@ void getPayloadTypeWithListOfPrimitiveArray() throws NoSuchMethodException {
     void getPayloadTypeWithCustomType() throws NoSuchMethodException {
         Method m = TestClass.class.getDeclaredMethod("consumeWithCustomType", TestClass.MyType.class);
 
-        Class<?> result = typeToClassConverter.extractClass(extractFrom(m));
+        Class<?> result = typeExtractor.extractClass(extractFrom(m));
 
         assertThat(result).isEqualTo(TestClass.MyType.class);
     }
@@ -165,7 +165,7 @@ void exceptionsAreTurnedIntoVoid() {
         ParameterizedType spiedType = mock(ParameterizedType.class);
         when(spiedType.getRawType()).thenThrow(new ClassCastException());
 
-        Class<?> result = typeToClassConverter.extractClass(spiedType);
+        Class<?> result = typeExtractor.extractClass(spiedType);
 
         assertThat(result).isEqualTo(Void.class);
     }
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java
index 58f1617a2..ea7f30cef 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common;
 
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import lombok.RequiredArgsConstructor;
 
 import java.lang.reflect.AnnotatedElement;
@@ -20,7 +20,7 @@
 
 @RequiredArgsConstructor
 public class FunctionalChannelBeanBuilder {
-    private final TypeToClassConverter typeToClassConverter;
+    private final TypeExtractor typeExtractor;
 
     public Set<FunctionalChannelBeanData> build(AnnotatedElement element) {
         Class<?> type = getRawType(element);
@@ -119,7 +119,7 @@ private List<Class<?>> getTypeGenerics(Class<?> c) {
 
     private List<Class<?>> getTypeGenerics(ParameterizedType parameterizedType) {
         return Arrays.stream(parameterizedType.getActualTypeArguments())
-                .map(typeToClassConverter::extractClass)
+                .map(typeExtractor::extractClass)
                 .collect(toList());
     }
 }
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
index 2d21a5ec7..8221813aa 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
@@ -7,7 +7,7 @@
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.classes.spring.ComponentClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
 import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.channels.CloudStreamFunctionChannelsScanner;
@@ -70,7 +70,7 @@ public CloudStreamFunctionOperationsScanner cloudStreamFunctionOperationsScanner
     }
 
     @Bean
-    public FunctionalChannelBeanBuilder functionalChannelBeanBuilder(TypeToClassConverter typeToClassConverter) {
-        return new FunctionalChannelBeanBuilder(typeToClassConverter);
+    public FunctionalChannelBeanBuilder functionalChannelBeanBuilder(TypeExtractor typeExtractor) {
+        return new FunctionalChannelBeanBuilder(typeExtractor);
     }
 }
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
index 8b2721825..eb2099747 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
@@ -25,9 +25,9 @@
 import io.github.springwolf.core.asyncapi.scanners.classes.spring.ComponentClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.classes.spring.ConfigurationClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
 import io.github.springwolf.core.configuration.docket.DefaultAsyncApiDocketService;
@@ -68,9 +68,9 @@
             DefaultComponentsService.class,
             SwaggerSchemaService.class,
             PayloadService.class,
-            PayloadClassExtractor.class,
+            PayloadExtractor.class,
             SwaggerSchemaUtil.class,
-            TypeToClassConverter.class,
+            TypeExtractor.class,
             DefaultSchemaWalker.class,
             SchemaWalkerProvider.class,
             ExampleJsonValueGenerator.class,
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java
index 8dfb9a532..f9de22b60 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common;
 
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
 import org.apache.kafka.streams.kstream.KStream;
 import org.assertj.core.api.Assertions;
@@ -23,7 +23,7 @@
 class FunctionalChannelBeanBuilderTest {
     private final SpringwolfConfigProperties properties = new SpringwolfConfigProperties();
     private final FunctionalChannelBeanBuilder functionalChannelBeanBuilder =
-            new FunctionalChannelBeanBuilder(new TypeToClassConverter(properties));
+            new FunctionalChannelBeanBuilder(new TypeExtractor(properties));
 
     @Nested
     class FromMethod {
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
index 1c1bd430a..d708ed75f 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
@@ -8,9 +8,9 @@
 import io.github.springwolf.core.asyncapi.components.examples.SchemaWalkerProvider;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.DefaultSchemaWalker;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.json.ExampleJsonValueGenerator;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
@@ -52,8 +52,8 @@
             SpringwolfJmsController.class,
             PublishingPayloadCreator.class,
             SpringwolfJmsProducer.class,
-            PayloadClassExtractor.class,
-            TypeToClassConverter.class,
+            PayloadExtractor.class,
+            TypeExtractor.class,
             DefaultComponentsService.class,
             SwaggerSchemaService.class,
             PayloadService.class,
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
index e859da3bc..612ce3485 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
@@ -8,9 +8,9 @@
 import io.github.springwolf.core.asyncapi.components.examples.SchemaWalkerProvider;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.DefaultSchemaWalker;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.json.ExampleJsonValueGenerator;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
@@ -56,8 +56,8 @@
             SwaggerSchemaService.class,
             PayloadService.class,
             SwaggerSchemaUtil.class,
-            PayloadClassExtractor.class,
-            TypeToClassConverter.class,
+            PayloadExtractor.class,
+            TypeExtractor.class,
             DefaultSchemaWalker.class,
             SchemaWalkerProvider.class,
             ExampleJsonValueGenerator.class,
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
index c1371d565..3a252ae53 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
@@ -6,8 +6,8 @@
 import io.github.springwolf.core.asyncapi.channels.ChannelsService;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
 import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
 import io.github.springwolf.core.controller.PublishingPayloadCreator;
 import io.github.springwolf.plugins.sns.controller.SpringwolfSnsController;
@@ -49,8 +49,8 @@ public class SpringwolfSnsProducerConfigurationIntegrationTest {
             value = {
                 @MockBean(SpringwolfClassScanner.class),
                 @MockBean(ComponentsService.class),
-                @MockBean(PayloadClassExtractor.class),
-                @MockBean(TypeToClassConverter.class),
+                @MockBean(PayloadExtractor.class),
+                @MockBean(TypeExtractor.class),
                 @MockBean(AsyncApiDocketService.class),
                 @MockBean(AsyncApiService.class),
                 @MockBean(SnsTemplate.class)
@@ -91,8 +91,8 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
             value = {
                 @MockBean(SpringwolfClassScanner.class),
                 @MockBean(ComponentsService.class),
-                @MockBean(PayloadClassExtractor.class),
-                @MockBean(TypeToClassConverter.class),
+                @MockBean(PayloadExtractor.class),
+                @MockBean(TypeExtractor.class),
                 @MockBean(ChannelsService.class),
                 @MockBean(SnsTemplate.class)
             })