diff --git a/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
index ecc50ab65bb0e..2c8adf7290f5d 100644
--- a/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
+++ b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
@@ -50,7 +50,7 @@ public void process(Exchange exchange) throws Exception {
         inputMessage.setBotName(endpoint.getBotName());
         String response = this.endpoint.getBot().sendChat(inputMessage);
         inputMessage.setReply(response);
-        exchange.getOut().setBody(inputMessage);
+        exchange.getMessage().setBody(inputMessage);
     }
 
     private ChatScriptMessage buildMessage(Object body) throws Exception {
diff --git a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
index abb3aed9195a9..498cf34cf0218 100644
--- a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
+++ b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
@@ -202,7 +202,7 @@ private List<Object> readModels(Exchange exchange, InputStream stream) throws Ex
             Object readObject;
             while ((readObject = in.read()) != null) {
                 if (readObject instanceof BeanIOHeader beanioheader) {
-                    exchange.getOut().getHeaders().putAll(beanioheader.getHeaders());
+                    exchange.getMessage().getHeaders().putAll(beanioheader.getHeaders());
                 }
                 results.add(readObject);
             }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index 51404e36edcd4..55005717d3312 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -213,7 +213,7 @@ public Object unmarshal(Exchange exchange, InputStream inputStream) throws Excep
 
                 if (!factory.skipHeader()) {
                     Map<String, Object> headerObjMap = createModel(headerFactory, line, count.intValue());
-                    exchange.getOut().setHeader(CAMEL_BINDY_FIXED_LENGTH_HEADER, headerObjMap);
+                    exchange.getMessage().setHeader(CAMEL_BINDY_FIXED_LENGTH_HEADER, headerObjMap);
                 }
             }
 
@@ -242,7 +242,7 @@ public Object unmarshal(Exchange exchange, InputStream inputStream) throws Excep
                 if (factory.hasFooter()) {
                     if (!factory.skipFooter()) {
                         Map<String, Object> footerObjMap = createModel(footerFactory, thisLine, count.intValue());
-                        exchange.getOut().setHeader(CAMEL_BINDY_FIXED_LENGTH_FOOTER, footerObjMap);
+                        exchange.getMessage().setHeader(CAMEL_BINDY_FIXED_LENGTH_FOOTER, footerObjMap);
                     }
                 } else {
                     model = createModel(factory, thisLine, count.intValue());
diff --git a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index 36fca4cee3b22..1cabdbb79e3de 100644
--- a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -221,7 +221,7 @@ public void marshal(Exchange exchange, Object graph, OutputStream outputStream)
                     "Cannot PGP encrypt message. No public encryption key found for the User Ids " + userids
                                                + " in the public keyring. Either specify other User IDs or add correct public keys to the keyring.");
         }
-        exchange.getOut().setHeader(NUMBER_OF_ENCRYPTION_KEYS, Integer.valueOf(keys.size()));
+        exchange.getMessage().setHeader(NUMBER_OF_ENCRYPTION_KEYS, Integer.valueOf(keys.size()));
 
         InputStream input = ExchangeHelper.convertToMandatoryType(exchange, InputStream.class, graph);
 
@@ -336,7 +336,7 @@ protected List<PGPSignatureGenerator> createSignatureGenerator(Exchange exchange
             return null;
         }
 
-        exchange.getOut().setHeader(NUMBER_OF_SIGNING_KEYS, Integer.valueOf(sigSecretKeysWithPrivateKeyAndUserId.size()));
+        exchange.getMessage().setHeader(NUMBER_OF_SIGNING_KEYS, Integer.valueOf(sigSecretKeysWithPrivateKeyAndUserId.size()));
 
         List<PGPSignatureGenerator> sigGens = new ArrayList<>();
         for (PGPSecretKeyAndPrivateKeyAndUserId sigSecretKeyWithPrivateKeyAndUserId : sigSecretKeysWithPrivateKeyAndUserId) {
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
index 32294c22a5537..0714da520991a 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
@@ -43,9 +43,7 @@ public void process(Exchange exchange) throws Exception {
 
         Message in = exchange.getIn();
         clearMessageHeaders(in);
-        Message out = exchange.getOut();
-        out.copyFrom(in);
-        out.setHeader(config.getSignatureHeaderName(), new Base64().encode(signature));
+        exchange.getMessage().setHeader(config.getSignatureHeaderName(), new Base64().encode(signature));
     }
 
     protected Signature initSignatureService(Exchange exchange) throws Exception {
diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
index 89c8f58084257..6b0f44ad2b5c3 100644
--- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
+++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
@@ -64,10 +64,8 @@ public void process(Exchange exchange) throws Exception {
         Source src = exchange.getIn().getBody(StreamSource.class);
 
         OutputStream out = transform(userAgent, outputFormat, src);
-        exchange.getOut().setBody(out);
-
-        // propagate headers
-        exchange.getOut().setHeaders(headers);
+        exchange.getMessage().setBody(out);
+        exchange.getMessage().setHeaders(headers);
     }
 
     private String getOutputFormat(Exchange exchange) {
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
index 64f40446838d5..e1a1fe2631ee8 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
@@ -131,13 +131,13 @@ public Object unmarshal(Exchange exchange, InputStream inputStream) throws Excep
         String bodyAsString = new String(body, charsetName);
         Message message = parser.parse(bodyAsString);
 
-        // add MSH fields as message out headers
+        // add MSH fields as message headers
         Terser terser = new Terser(message);
         for (Map.Entry<String, String> entry : HEADER_MAP.entrySet()) {
-            exchange.getOut().setHeader(entry.getKey(), terser.get(entry.getValue()));
+            exchange.getMessage().setHeader(entry.getKey(), terser.get(entry.getValue()));
         }
-        exchange.getOut().setHeader(HL7_CONTEXT, hapiContext);
-        exchange.getOut().setHeader(Exchange.CHARSET_NAME, charsetName);
+        exchange.getMessage().setHeader(HL7_CONTEXT, hapiContext);
+        exchange.getMessage().setHeader(Exchange.CHARSET_NAME, charsetName);
         return message;
     }
 
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
index de98bff06eeb9..14ecc5d563bf4 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
@@ -19,7 +19,6 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.influxdb.InfluxDB;
 import org.influxdb.dto.BatchPoints;
@@ -99,13 +98,11 @@ private void doQuery(Exchange exchange, String dataBaseName) {
         String query = calculateQuery(exchange);
         Query influxdbQuery = new Query(query, dataBaseName);
         QueryResult resultSet = connection.query(influxdbQuery);
-        MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getMessage().setBody(resultSet);
     }
 
     private void doPing(Exchange exchange) {
         Pong result = connection.ping();
-        MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getMessage().setBody(result);
     }
 
diff --git a/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Producer.java b/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Producer.java
index 417414a552d00..469ec5035b5c7 100644
--- a/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Producer.java
+++ b/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Producer.java
@@ -28,7 +28,6 @@
 import org.apache.camel.component.influxdb2.data.Record;
 import org.apache.camel.component.influxdb2.data.Records;
 import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -174,7 +173,6 @@ private void insertRecords(Exchange exchange, String orgName, String bucketName,
 
     private void doPing(Exchange exchange) {
         Boolean result = connection.ping();
-        MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getMessage().setBody(result);
     }
 
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
index c7f3c5aa86b8a..a8f0f4cb4d4a4 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
@@ -66,7 +66,7 @@ public void process(Exchange exchange) throws Exception {
                     }
                 }
                 node.addMixin("mix:referenceable");
-                exchange.getOut().setBody(node.getIdentifier());
+                exchange.getMessage().setBody(node.getIdentifier());
                 session.save();
             } else if (JcrConstants.JCR_GET_BY_ID.equals(operation)) {
                 Node node = session.getNodeByIdentifier(exchange.getIn()
diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqProducer.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqProducer.java
index a31d16438429f..a9fbb5011bbf5 100644
--- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqProducer.java
+++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqProducer.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
-import org.apache.camel.Message;
 import org.apache.camel.support.DefaultProducer;
 import org.apache.camel.util.ObjectHelper;
 import org.jooq.Configuration;
@@ -71,8 +70,7 @@ public void process(Exchange exchange) {
                     result = context.fetch(querySQL);
                 }
 
-                Message target = exchange.getPattern().isOutCapable() ? exchange.getOut() : exchange.getIn();
-                target.setBody(result);
+                exchange.getMessage().setBody(result);
                 break;
             case NONE:
                 DSLContext context = DSL.using(dbConfig);
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
index cd019ec8977d9..5e5e64d4aafdf 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
@@ -30,7 +30,6 @@
 import org.apache.camel.ExchangePropertyKey;
 import org.apache.camel.Processor;
 import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilter;
@@ -385,7 +384,7 @@ private Exchange createExchange(IoSession session, Object payload) {
         exchange.getIn().setHeader(MinaConstants.MINA_IOSESSION, session);
         exchange.getIn().setHeader(MinaConstants.MINA_LOCAL_ADDRESS, session.getLocalAddress());
         exchange.getIn().setHeader(MinaConstants.MINA_REMOTE_ADDRESS, session.getRemoteAddress());
-        MinaPayloadHelper.setIn(exchange, payload);
+        MinaPayloadHelper.setPayload(exchange, payload);
         return exchange;
     }
 
@@ -440,12 +439,7 @@ public void messageReceived(IoSession session, Object object) throws Exception {
                 // If there's a response to send, send it.
                 //
                 boolean disconnect = getEndpoint().getConfiguration().isDisconnect();
-                Object response;
-                if (exchange.hasOut()) {
-                    response = MinaPayloadHelper.getOut(getEndpoint(), exchange);
-                } else {
-                    response = MinaPayloadHelper.getIn(getEndpoint(), exchange);
-                }
+                Object response = MinaPayloadHelper.getResponsePayload(getEndpoint(), exchange);
 
                 boolean failed = exchange.isFailed();
                 if (failed && !getEndpoint().getConfiguration().isTransferExchange()) {
@@ -453,7 +447,7 @@ public void messageReceived(IoSession session, Object object) throws Exception {
                         response = exchange.getException();
                     } else {
                         // failed and no exception, must be a fault
-                        response = exchange.getOut().getBody();
+                        response = exchange.getMessage().getBody();
                     }
                 }
 
@@ -466,12 +460,8 @@ public void messageReceived(IoSession session, Object object) throws Exception {
                 }
 
                 // should session be closed after complete?
-                Boolean close;
-                if (ExchangeHelper.isOutCapable(exchange)) {
-                    close = exchange.getOut().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
-                } else {
-                    close = exchange.getIn().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
-                }
+                Boolean close
+                        = exchange.getMessage().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
 
                 // should we disconnect, the header can override the configuration
                 if (close != null) {
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
index b786ca9f45fbb..e700ac0ccbaa3 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
@@ -32,7 +32,7 @@ private MinaPayloadHelper() {
         //Utility Class
     }
 
-    public static Object getIn(MinaEndpoint endpoint, Exchange exchange) {
+    public static Object getRequestPayload(MinaEndpoint endpoint, Exchange exchange) {
         if (endpoint.getConfiguration().isTransferExchange()) {
             // we should transfer the entire exchange over the wire (includes in/out)
             return DefaultExchangeHolder.marshal(exchange);
@@ -42,32 +42,22 @@ public static Object getIn(MinaEndpoint endpoint, Exchange exchange) {
         }
     }
 
-    public static Object getOut(MinaEndpoint endpoint, Exchange exchange) {
+    public static Object getResponsePayload(MinaEndpoint endpoint, Exchange exchange) {
         if (endpoint.getConfiguration().isTransferExchange()) {
             // we should transfer the entire exchange over the wire (includes in/out)
             return DefaultExchangeHolder.marshal(exchange);
         } else {
             // normal transfer using the body only
-            return exchange.getOut().getBody();
+            return exchange.getMessage().getBody();
         }
     }
 
-    public static void setIn(Exchange exchange, Object payload) {
+    public static void setPayload(Exchange exchange, Object payload) {
         if (payload instanceof DefaultExchangeHolder) {
             DefaultExchangeHolder.unmarshal(exchange, (DefaultExchangeHolder) payload);
         } else {
             // normal transfer using the body only
-            exchange.getIn().setBody(payload);
-        }
-    }
-
-    public static void setOut(Exchange exchange, Object payload) {
-        if (payload instanceof DefaultExchangeHolder) {
-            DefaultExchangeHolder.unmarshal(exchange, (DefaultExchangeHolder) payload);
-        } else {
-            // normal transfer using the body only and preserve the headers
-            exchange.getOut().setHeaders(exchange.getIn().getHeaders());
-            exchange.getOut().setBody(payload);
+            exchange.getMessage().setBody(payload);
         }
     }
 }
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
index ddb26027906d5..d5ae0463131f3 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
@@ -31,7 +31,6 @@
 import org.apache.camel.ExchangeTimedOutException;
 import org.apache.camel.spi.CamelLogger;
 import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilter;
@@ -136,7 +135,7 @@ protected void doProcess(Exchange exchange) throws Exception {
                     IOHelper.normalizeCharset(getEndpoint().getConfiguration().getCharsetName()));
         }
 
-        Object body = MinaPayloadHelper.getIn(getEndpoint(), exchange);
+        Object body = MinaPayloadHelper.getRequestPayload(getEndpoint(), exchange);
         if (body == null) {
             noReplyLogger.log("No payload to send for exchange: " + exchange);
             return; // exit early since nothing to write
@@ -184,12 +183,8 @@ protected void doProcess(Exchange exchange) throws Exception {
                 maybeDisconnectOnTimeout();
                 throw new ExchangeTimedOutException(exchange, timeout);
             } else {
-                // set the result on either IN or OUT on the original exchange depending on its pattern
-                if (ExchangeHelper.isOutCapable(exchange)) {
-                    MinaPayloadHelper.setOut(exchange, handler.getMessage());
-                } else {
-                    MinaPayloadHelper.setIn(exchange, handler.getMessage());
-                }
+                // set the result on the exchange
+                MinaPayloadHelper.setPayload(exchange, handler.getMessage());
             }
         }
     }
@@ -210,12 +205,7 @@ protected void maybeDisconnectOnDone(Exchange exchange) throws InterruptedExcept
         }
 
         // should session be closed after complete?
-        Boolean close;
-        if (ExchangeHelper.isOutCapable(exchange)) {
-            close = exchange.getOut().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
-        } else {
-            close = exchange.getIn().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
-        }
+        Boolean close = exchange.getMessage().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
 
         // should we disconnect, the header can override the configuration
         boolean disconnect = getEndpoint().getConfiguration().isDisconnect();
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
index 0138366f431e9..fa28b29fbadb6 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
@@ -125,7 +125,7 @@ public T outMessage(final Function<Message, Object> function) {
         return delegate.expression(new ExpressionAdapter() {
             @Override
             public Object evaluate(Exchange exchange) {
-                return function.apply(exchange.getOut());
+                return function.apply(exchange.getMessage());
             }
         });
     }
@@ -215,7 +215,7 @@ public T outBody(final Function<Object, Object> function) {
         return delegate.expression(new ExpressionAdapter() {
             @Override
             public Object evaluate(Exchange exchange) {
-                return function.apply(exchange.getOut().getBody());
+                return function.apply(exchange.getMessage().getBody());
             }
         });
     }
@@ -228,8 +228,8 @@ public T outBody(final BiFunction<Object, Map<String, Object>, Object> function)
             @Override
             public Object evaluate(Exchange exchange) {
                 return function.apply(
-                        exchange.getOut().getBody(),
-                        exchange.getOut().getHeaders());
+                        exchange.getMessage().getBody(),
+                        exchange.getMessage().getHeaders());
             }
         });
     }
@@ -241,7 +241,7 @@ public <B> T outBody(Class<B> expectedType, final Function<B, Object> function)
         return delegate.expression(new ExpressionAdapter() {
             @Override
             public Object evaluate(Exchange exchange) {
-                return function.apply(exchange.getOut().getBody(expectedType));
+                return function.apply(exchange.getMessage().getBody(expectedType));
             }
         });
     }
@@ -254,8 +254,8 @@ public <B> T outBody(Class<B> expectedType, final BiFunction<B, Map<String, Obje
             @Override
             public Object evaluate(Exchange exchange) {
                 return function.apply(
-                        exchange.getOut().getBody(expectedType),
-                        exchange.getOut().getHeaders());
+                        exchange.getMessage().getBody(expectedType),
+                        exchange.getMessage().getHeaders());
             }
         });
     }
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
index bf2fc79bda38f..6c713893ae16a 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
@@ -53,6 +53,7 @@ public Message getRequest() {
         return exchange.getIn();
     }
 
+    @SuppressWarnings("deprecation")
     @Deprecated
     public Message getResponse() {
         return exchange.getOut();
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
index f1ba1722330db..6fb9452e2f8e7 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
@@ -49,6 +49,7 @@ public Message getRequest() {
         return exchange.getIn();
     }
 
+    @SuppressWarnings("deprecation")
     @Deprecated
     public Message getResponse() {
         return exchange.getOut();
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
index 705b173618725..413411de4a77c 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
@@ -79,7 +79,9 @@ private void addData() {
                         Exchange copy = (Exchange) body;
                         exchange.setException(copy.getException());
                         exchange.setIn(copy.getIn());
-                        if (copy.hasOut()) {
+                        @SuppressWarnings("deprecation")
+                        boolean hasOut = copy.hasOut();
+                        if (hasOut) {
                             exchange.setOut(copy.getOut());
                         }
                         exchange.getProperties().clear();
diff --git a/components/camel-rocketmq/src/main/java/org/apache/camel/component/rocketmq/reply/RocketMQReplyManagerSupport.java b/components/camel-rocketmq/src/main/java/org/apache/camel/component/rocketmq/reply/RocketMQReplyManagerSupport.java
index ec2b025d5d824..f573808f0d586 100644
--- a/components/camel-rocketmq/src/main/java/org/apache/camel/component/rocketmq/reply/RocketMQReplyManagerSupport.java
+++ b/components/camel-rocketmq/src/main/java/org/apache/camel/component/rocketmq/reply/RocketMQReplyManagerSupport.java
@@ -171,7 +171,7 @@ public void processReply(ReplyHolder holder) {
     }
 
     private static void processReceivedReply(ReplyHolder holder) {
-        Message message = holder.getExchange().getOut();
+        Message message = holder.getExchange().getMessage();
         MessageExt messageExt = holder.getMessageExt();
         message.setBody(messageExt.getBody());
         RocketMQMessageConverter.populateHeadersByMessageExt(message, messageExt);
diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SinkConverter.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SinkConverter.java
index beb66fbd1fe0d..cedb57be8e1e4 100644
--- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SinkConverter.java
+++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SinkConverter.java
@@ -78,7 +78,7 @@ public static String toString(StringSink result) {
 
     @SuppressWarnings("rawtypes")
     public static Map toMap(JavaSink.ResultMap resultBeans, Exchange exchange) {
-        Message outMessage = exchange.getOut();
+        Message outMessage = exchange.getMessage();
         outMessage.setBody(resultBeans);
 
         @SuppressWarnings("unchecked")
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
index 07d91b6bc2a1d..cb1fca51b98b4 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
@@ -161,7 +161,7 @@ public Object doUnmarshal(Exchange exchange, InputStream stream, Object rootObje
                 } else {
                     returnHeaders = anyHeaderElements;
                 }
-                exchange.getOut().setHeader(SoapDataFormat.SOAP_UNMARSHALLED_HEADER_LIST, returnHeaders);
+                exchange.getMessage().setHeader(SoapDataFormat.SOAP_UNMARSHALLED_HEADER_LIST, returnHeaders);
             }
         }
 
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
index 9409eb9b4ecdf..cdeb7e6563c66 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
@@ -172,7 +172,7 @@ public Object doUnmarshal(Exchange exchange, InputStream stream, Object rootObje
                 } else {
                     returnHeaders = anyHeaderElements;
                 }
-                exchange.getOut().setHeader(SoapDataFormat.SOAP_UNMARSHALLED_HEADER_LIST, returnHeaders);
+                exchange.getMessage().setHeader(SoapDataFormat.SOAP_UNMARSHALLED_HEADER_LIST, returnHeaders);
             }
         }
 
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java
index f48d08e2a8f68..93a01de1d1f47 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java
@@ -170,7 +170,7 @@ public Object unmarshal(Exchange exchange, Object body) throws Exception {
         if (soapAction != null && elementNameStrategy instanceof ServiceInterfaceStrategy) {
             ServiceInterfaceStrategy strategy = (ServiceInterfaceStrategy) elementNameStrategy;
             String methodName = strategy.getMethodForSoapAction(soapAction);
-            exchange.getOut().setHeader(SOAP_METHOD_NAME, methodName);
+            exchange.getMessage().setHeader(SOAP_METHOD_NAME, methodName);
         }
 
         // Store soap action for an eventual later marshal step.
diff --git a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
index 112ac48121307..9846afff2d39f 100644
--- a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
+++ b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
@@ -37,7 +37,6 @@
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.ExchangeHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ws.WebServiceMessage;
@@ -107,13 +106,8 @@ public void doWithMessage(WebServiceMessage requestMessage) throws IOException,
                     @Override
                     public void doWithMessage(WebServiceMessage responseMessage) throws IOException, TransformerException {
                         SoapMessage soapMessage = (SoapMessage) responseMessage;
-                        if (ExchangeHelper.isOutCapable(exchange)) {
-                            exchange.getOut().copyFromWithNewBody(exchange.getIn(), soapMessage.getPayloadSource());
-                            populateHeaderAndAttachmentsFromResponse(exchange.getOut(AttachmentMessage.class), soapMessage);
-                        } else {
-                            exchange.getIn().setBody(soapMessage.getPayloadSource());
-                            populateHeaderAndAttachmentsFromResponse(exchange.getIn(AttachmentMessage.class), soapMessage);
-                        }
+                        exchange.getMessage().setBody(soapMessage.getPayloadSource());
+                        populateHeaderAndAttachmentsFromResponse(exchange.getMessage(AttachmentMessage.class), soapMessage);
 
                     }
                 });
diff --git a/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java b/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
index 8f6c4ce7296ea..86da62e90036c 100644
--- a/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
+++ b/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
@@ -57,6 +57,7 @@ public Message getMessage() {
         return exchange.getMessage();
     }
 
+    @SuppressWarnings("deprecation")
     @Deprecated
     public Message getResponse() {
         return exchange.getOut();
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java
index ed036d9b84a02..1f9b0c5273d2c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java
@@ -80,24 +80,19 @@ public void execute(StatementWrapper ps) throws SQLException, DataAccessExceptio
                     exchange.getIn().setHeader(SqlStoredConstants.SQL_STORED_UPDATE_COUNT, total);
                 } else {
                     Object result = ps.executeStatement();
-                    // preserve headers first, so we can override the SQL_ROW_COUNT and SQL_UPDATE_COUNT headers
-                    // if statement returns them
-                    exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
 
                     if (result != null) {
-                        if (getEndpoint().isNoop()) {
-                            exchange.getOut().setBody(exchange.getIn().getBody());
-                        } else if (getEndpoint().getOutputHeader() != null) {
-                            exchange.getOut().setBody(exchange.getIn().getBody());
-                            exchange.getOut().setHeader(getEndpoint().getOutputHeader(), result);
-                        } else {
-                            exchange.getOut().setBody(result);
+                        if (!getEndpoint().isNoop()) {
+                            if (getEndpoint().getOutputHeader() != null) {
+                                exchange.getMessage().setHeader(getEndpoint().getOutputHeader(), result);
+                            } else {
+                                exchange.getMessage().setBody(result);
+                            }
                         }
                     }
-                    // for noop=true we still want to enrich with the headers
 
                     if (ps.getUpdateCount() != null) {
-                        exchange.getOut().setHeader(SqlStoredConstants.SQL_STORED_UPDATE_COUNT, ps.getUpdateCount());
+                        exchange.getMessage().setHeader(SqlStoredConstants.SQL_STORED_UPDATE_COUNT, ps.getUpdateCount());
                     }
                 }
             }
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
index 850bb794d2e85..3dd17d1d54d3b 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
@@ -72,13 +72,10 @@ public void process(Exchange exchange) throws Exception {
             }
             SshResult result = SshHelper.sendExecCommand(headers, command, endpoint, client);
 
-            // propagate headers
-            exchange.getOut().getHeaders().putAll(in.getHeaders());
-
             // store result
-            exchange.getOut().setBody(result.getStdout());
-            exchange.getOut().setHeader(SshConstants.EXIT_VALUE, result.getExitValue());
-            exchange.getOut().setHeader(SshConstants.STDERR, result.getStderr());
+            exchange.getMessage().setBody(result.getStdout());
+            exchange.getMessage().setHeader(SshConstants.EXIT_VALUE, result.getExitValue());
+            exchange.getMessage().setHeader(SshConstants.STDERR, result.getStderr());
         } catch (Exception e) {
             throw new CamelExchangeException("Cannot execute command: " + command, exchange, e);
         }
diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
index 2fb8e0961a44a..54c2255f1cb2f 100644
--- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
+++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
@@ -24,7 +24,6 @@
 import com.ctc.wstx.sr.ValidatingStreamReader;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.support.ExchangeHelper;
 
 /**
  * It uses SAX content handler to handle events.
@@ -62,12 +61,7 @@ public void process(Exchange exchange) throws Exception {
             reader.setContentHandler(handler);
             // InputSource is ignored anyway
             reader.parse((InputSource) null);
-            if (ExchangeHelper.isOutCapable(exchange)) {
-                exchange.getOut().setHeaders(exchange.getIn().getHeaders());
-                exchange.getOut().setBody(handler);
-            } else {
-                exchange.getIn().setBody(handler);
-            }
+            exchange.getMessage().setBody(handler);
         } finally {
             if (stream != null) {
                 stream.close();
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
index 312789d8f5465..d5d0a8ec42134 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
@@ -196,30 +196,21 @@ public XmlSignerConfiguration getConfiguration() {
     @Override
     public void process(Exchange exchange) throws Exception {
 
-        try {
-            LOG.debug("XML signature generation started using algorithm {} and canonicalization method {}", getConfiguration()
-                    .getSignatureAlgorithm(), getConfiguration().getCanonicalizationMethod().getAlgorithm());
-
-            // lets setup the out message before we invoke the signing
-            // so that it can mutate it if necessary
-            Message out = exchange.getOut();
-            out.copyFrom(exchange.getIn());
-
-            Document outputDoc = sign(out);
-
-            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-            XmlSignatureHelper.transformNonTextNodeToOutputStream(outputDoc, outStream, omitXmlDeclaration(out),
-                    getConfiguration().getOutputXmlEncoding());
-            byte[] data = outStream.toByteArray();
-            out.setBody(data);
-            setOutputEncodingToMessageHeader(out);
-            clearMessageHeaders(out);
-            LOG.debug("XML signature generation finished");
-        } catch (Exception e) {
-            // remove OUT message, as an exception occurred
-            exchange.setOut(null);
-            throw e;
-        }
+        LOG.debug("XML signature generation started using algorithm {} and canonicalization method {}", getConfiguration()
+                .getSignatureAlgorithm(), getConfiguration().getCanonicalizationMethod().getAlgorithm());
+
+        Message out = exchange.getMessage();
+
+        Document outputDoc = sign(out);
+
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        XmlSignatureHelper.transformNonTextNodeToOutputStream(outputDoc, outStream, omitXmlDeclaration(out),
+                getConfiguration().getOutputXmlEncoding());
+        byte[] data = outStream.toByteArray();
+        out.setBody(data);
+        setOutputEncodingToMessageHeader(out);
+        clearMessageHeaders(out);
+        LOG.debug("XML signature generation finished");
     }
 
     protected Document sign(final Message out) throws Exception {
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
index db423537c9d8e..467afb82a94f1 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
@@ -80,16 +80,9 @@ public XmlVerifierConfiguration getConfiguration() {
     public void process(Exchange exchange) throws Exception {
         InputStream stream = exchange.getIn().getMandatoryBody(InputStream.class);
         try {
-            // lets setup the out message before we invoke the signing
-            // so that it can mutate it if necessary
-            Message out = exchange.getOut();
-            out.copyFrom(exchange.getIn());
+            Message out = exchange.getMessage();
             verify(stream, out);
             clearMessageHeaders(out);
-        } catch (Exception e) {
-            // remove OUT message, as an exception occurred
-            exchange.setOut(null);
-            throw e;
         } finally {
             IOHelper.close(stream, "input stream");
         }
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
index ec43edcffdfd1..9b7b418963b60 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
@@ -85,12 +85,10 @@ public Object resolveVariable(QName name) {
                 answer = in.getBody();
             }
         } else if (uri.equals(OUT_NAMESPACE)) {
-            if (exchange.get().hasOut()) {
-                Message out = exchange.get().getOut();
-                answer = out.getHeader(localPart);
-                if (answer == null && localPart.equals("body")) {
-                    answer = out.getBody();
-                }
+            Message out = exchange.get().getMessage();
+            answer = out.getHeader(localPart);
+            if (answer == null && localPart.equals("body")) {
+                answer = out.getBody();
             }
         }
 
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
index 80f9ebfe30d3c..4fce6d6da9c73 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
@@ -679,8 +679,8 @@ private XPathFunction createOutBodyFunction() {
         return new XPathFunction() {
             @SuppressWarnings("rawtypes")
             public Object evaluate(List list) throws XPathFunctionException {
-                if (exchange.get() != null && exchange.get().hasOut()) {
-                    return exchange.get().getOut().getBody();
+                if (exchange.get() != null) {
+                    return exchange.get().getMessage().getBody();
                 }
                 return null;
             }
@@ -711,7 +711,7 @@ public Object evaluate(List list) throws XPathFunctionException {
                     Object value = list.get(0);
                     if (value != null) {
                         String headerText = exchange.get().getContext().getTypeConverter().convertTo(String.class, value);
-                        return exchange.get().getOut().getHeader(headerText);
+                        return exchange.get().getMessage().getHeader(headerText);
                     }
                 }
                 return null;