diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java
similarity index 75%
rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java
rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java
index 1c4da346..2045091e 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java
@@ -1,4 +1,4 @@
-package com.asyncapi.v2.binding.channel.stomp;
+package com.asyncapi.bindings.stomp.v0._1_0.channel;
 
 import com.asyncapi.bindings.ChannelBinding;
 import lombok.Data;
@@ -6,7 +6,9 @@
 import lombok.NoArgsConstructor;
 
 /**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
+ * This class <b>MUST NOT</b> contain any properties.
+ * <p>
+ * Its name is reserved for future use.
  * <p>
  * Describes STOMP channel binding.
  *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java
similarity index 75%
rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java
rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java
index a3052965..43812418 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java
@@ -1,4 +1,4 @@
-package com.asyncapi.v3.binding.message.stomp;
+package com.asyncapi.bindings.stomp.v0._1_0.message;
 
 import com.asyncapi.bindings.MessageBinding;
 import lombok.Data;
@@ -6,7 +6,9 @@
 import lombok.NoArgsConstructor;
 
 /**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
+ * This class <b>MUST NOT</b> contain any properties.
+ * <p>
+ * Its name is reserved for future use.
  * <p>
  * Describes STOMP message binding.
  *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java
similarity index 75%
rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java
rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java
index d5246c3e..b4d15373 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java
@@ -1,4 +1,4 @@
-package com.asyncapi.v3.binding.operation.stomp;
+package com.asyncapi.bindings.stomp.v0._1_0.operation;
 
 import com.asyncapi.bindings.OperationBinding;
 import lombok.Data;
@@ -6,7 +6,9 @@
 import lombok.NoArgsConstructor;
 
 /**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
+ * This class <b>MUST NOT</b> contain any properties.
+ * <p>
+ * Its name is reserved for future use.
  * <p>
  * Describes STOMP operation binding.
  *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java
similarity index 75%
rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java
rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java
index c2f17108..42b65412 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java
@@ -1,4 +1,4 @@
-package com.asyncapi.v3.binding.server.stomp;
+package com.asyncapi.bindings.stomp.v0._1_0.server;
 
 import com.asyncapi.bindings.ServerBinding;
 import lombok.Data;
@@ -6,7 +6,9 @@
 import lombok.NoArgsConstructor;
 
 /**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
+ * This class <b>MUST NOT</b> contain any properties.
+ * <p>
+ * Its name is reserved for future use.
  * <p>
  * Describes STOMP server binding.
  *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java
deleted file mode 100644
index ac314af9..00000000
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.asyncapi.v2.binding.message.stomp;
-
-import com.asyncapi.bindings.MessageBinding;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
- * <p>
- * Describes STOMP message binding.
- *
- * @version 0.1.0
- * @see <a href="https://github.com/asyncapi/bindings/tree/master/sqs#message-binding-object">STOMP message binding</a>
- * @author Pavel Bodiachevskii
- */
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class STOMPMessageBinding extends MessageBinding {
-}
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java
deleted file mode 100644
index 75cbee65..00000000
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.asyncapi.v2.binding.operation.stomp;
-
-import com.asyncapi.bindings.OperationBinding;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
- * <p>
- * Describes STOMP operation binding.
- *
- * @version 0.1.0
- * @see <a href="https://github.com/asyncapi/bindings/tree/master/sqs#operation-binding-object">STOMP operation binding</a>
- * @author Pavel Bodiachevskii
- */
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class STOMPOperationBinding extends OperationBinding {
-}
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java
deleted file mode 100644
index 580d7168..00000000
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.asyncapi.v2.binding.server.stomp;
-
-import com.asyncapi.bindings.ServerBinding;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
- * <p>
- * Describes STOMP server binding.
- *
- * @version 0.1.0
- * @see <a href="https://github.com/asyncapi/bindings/tree/master/sqs#server-binding-object">STOMP server binding</a>
- * @author Pavel Bodiachevskii
- */
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class STOMPServerBinding extends ServerBinding {
-}
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java
index da096286..7b1b4fe9 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding;
 import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding;
 import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding;
-import com.asyncapi.v2.binding.channel.stomp.STOMPChannelBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding;
 import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java
index 991d2a06..7ca52856 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v2.binding.message.sns.SNSMessageBinding;
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding;
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding;
-import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding;
 import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java
index 47392755..eaa1a0e5 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding;
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding;
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding;
-import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding;
 import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java
index a896051d..f9f0a6c0 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v2.binding.server.sns.SNSServerBinding;
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding;
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding;
-import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding;
 import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java
deleted file mode 100644
index 8064d557..00000000
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.asyncapi.v3.binding.channel.stomp;
-
-import com.asyncapi.bindings.ChannelBinding;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * This class MUST NOT contain any properties. Its name is reserved for future use.
- * <p>
- * Describes STOMP channel binding.
- *
- * @version 0.1.0
- * @see <a href="https://github.com/asyncapi/bindings/tree/master/stomp#channel-binding-object">STOMP channel binding</a>
- * @author Pavel Bodiachevskii
- */
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class STOMPChannelBinding extends ChannelBinding {
-}
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java
index 5bbabe2e..d0b78a2e 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v3.binding.channel.sns.SNSChannelBinding;
 import com.asyncapi.v3.binding.channel.solace.SolaceChannelBinding;
 import com.asyncapi.v3.binding.channel.sqs.SQSChannelBinding;
-import com.asyncapi.v3.binding.channel.stomp.STOMPChannelBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding;
 import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding;
 import com.asyncapi.v3.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java
index 081953bb..e64c3025 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v3.binding.message.sns.SNSMessageBinding;
 import com.asyncapi.v3.binding.message.solace.SolaceMessageBinding;
 import com.asyncapi.v3.binding.message.sqs.SQSMessageBinding;
-import com.asyncapi.v3.binding.message.stomp.STOMPMessageBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding;
 import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding;
 import com.asyncapi.v3.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java
index 39880639..4b88f997 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v3.binding.operation.sns.SNSOperationBinding;
 import com.asyncapi.v3.binding.operation.solace.SolaceOperationBinding;
 import com.asyncapi.v3.binding.operation.sqs.SQSOperationBinding;
-import com.asyncapi.v3.binding.operation.stomp.STOMPOperationBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding;
 import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding;
 import com.asyncapi.v3.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java
index 15ce53ce..b99eddf5 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java
@@ -18,7 +18,7 @@
 import com.asyncapi.v3.binding.server.sns.SNSServerBinding;
 import com.asyncapi.v3.binding.server.solace.SolaceServerBinding;
 import com.asyncapi.v3.binding.server.sqs.SQSServerBinding;
-import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding;
+import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding;
 import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding;
 import com.asyncapi.v3.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt
index bd2f4379..4a8c1139 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt
@@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding
 import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding
 import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding
 import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding
-import com.asyncapi.v2.binding.channel.stomp.STOMPChannelBinding
+import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding
 import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest
 
 class ChannelItemTest: SerDeTest<ChannelItem>() {
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt
index 076377d5..b7557899 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt
@@ -23,7 +23,7 @@ import com.asyncapi.v2.binding.message.redis.RedisMessageBinding
 import com.asyncapi.v2.binding.message.sns.SNSMessageBinding
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding
-import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding
+import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding
 import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt
index 359fd0e4..33748af2 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt
@@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.message.redis.RedisMessageBinding
 import com.asyncapi.v2.binding.message.sns.SNSMessageBinding
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding
-import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding
+import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding
 import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt
index d5ee5f54..385dc942 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt
@@ -23,7 +23,7 @@ import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding
 import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding
-import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding
+import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding
 import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt
index 39eee0b2..f4e608d0 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt
@@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding
 import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding
-import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding
+import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding
 import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt
index 973d487b..15b7d3a2 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt
@@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.server.redis.RedisServerBinding
 import com.asyncapi.v2.binding.server.sns.SNSServerBinding
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding
-import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding
+import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding
 import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt
index e742ad1f..8f4e9527 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt
@@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.server.redis.RedisServerBinding
 import com.asyncapi.v2.binding.server.sns.SNSServerBinding
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding
-import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding
+import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding
 import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding
 
 /**
diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt
index 620e5a61..5a1543a5 100644
--- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt
+++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt
@@ -21,7 +21,7 @@ import com.asyncapi.v3.binding.server.redis.RedisServerBinding
 import com.asyncapi.v3.binding.server.sns.SNSServerBinding
 import com.asyncapi.v3.binding.server.solace.SolaceServerBinding
 import com.asyncapi.v3.binding.server.sqs.SQSServerBinding
-import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding
+import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding
 import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding
 import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest
 import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBearerTest