camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] 01/20: CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty
Date Wed, 07 Aug 2019 13:10:33 GMT
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 60f1d55fea26a47505c2e2bb6df22b41896862dc
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Wed Aug 7 10:42:47 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty
---
 components/{camel-netty4 => camel-netty}/pom.xml        |   4 ++--
 .../src/main/docs/netty4-component.adoc                 |   0
 .../camel/component/netty4/ChannelHandlerFactories.java |   0
 .../camel/component/netty4/ChannelHandlerFactory.java   |   0
 .../component/netty4/ClientInitializerFactory.java      |   0
 .../ClientModeTCPNettyServerBootstrapFactory.java       |   0
 .../component/netty4/DefaultChannelHandlerFactory.java  |   0
 .../netty4/DefaultClientInitializerFactory.java         |   0
 .../DefaultNettyCamelStateCorrelationManager.java       |   0
 .../netty4/DefaultServerInitializerFactory.java         |   0
 .../apache/camel/component/netty4/NettyCamelState.java  |   0
 .../netty4/NettyCamelStateCorrelationManager.java       |   0
 .../apache/camel/component/netty4/NettyComponent.java   |   2 +-
 .../camel/component/netty4/NettyConfiguration.java      |   0
 .../apache/camel/component/netty4/NettyConstants.java   |   0
 .../apache/camel/component/netty4/NettyConsumer.java    |   0
 .../component/netty4/NettyConsumerExceptionHandler.java |   0
 .../apache/camel/component/netty4/NettyConverter.java   |   0
 .../apache/camel/component/netty4/NettyEndpoint.java    |   4 ++--
 .../org/apache/camel/component/netty4/NettyHelper.java  |   0
 .../camel/component/netty4/NettyPayloadHelper.java      |   0
 .../apache/camel/component/netty4/NettyProducer.java    |   0
 .../netty4/NettyServerBootstrapConfiguration.java       |   0
 .../component/netty4/NettyServerBootstrapFactory.java   |   0
 .../component/netty4/NettyServerBossPoolBuilder.java    |   0
 .../camel/component/netty4/NettyWorkerPoolBuilder.java  |   0
 .../component/netty4/ServerInitializerFactory.java      |   0
 .../netty4/ShareableChannelHandlerFactory.java          |   0
 .../component/netty4/SharedSingletonObjectPool.java     |   0
 .../netty4/SingleTCPNettyServerBootstrapFactory.java    |   0
 .../netty4/SingleUDPNettyServerBootstrapFactory.java    |   0
 .../camel/component/netty4/TextLineDelimiter.java       |   0
 .../netty4/TimeoutCorrelationManagerSupport.java        |   0
 .../netty4/codec/DatagramPacketByteArrayDecoder.java    |   0
 .../netty4/codec/DatagramPacketByteArrayEncoder.java    |   0
 .../component/netty4/codec/DatagramPacketDecoder.java   |   0
 .../netty4/codec/DatagramPacketDelimiterDecoder.java    |   0
 .../component/netty4/codec/DatagramPacketEncoder.java   |   0
 .../netty4/codec/DatagramPacketObjectDecoder.java       |   0
 .../netty4/codec/DatagramPacketObjectEncoder.java       |   0
 .../netty4/codec/DatagramPacketStringDecoder.java       |   0
 .../netty4/codec/DatagramPacketStringEncoder.java       |   0
 .../netty4/codec/DelegateByteArrayDecoder.java          |   0
 .../netty4/codec/DelegateByteArrayEncoder.java          |   0
 .../netty4/codec/DelimiterBasedFrameDecoder.java        |   0
 .../component/netty4/codec/LineBasedFrameDecoder.java   |   0
 .../camel/component/netty4/codec/ObjectDecoder.java     |   0
 .../camel/component/netty4/codec/ObjectEncoder.java     |   0
 .../component/netty4/handlers/ClientChannelHandler.java |   0
 .../component/netty4/handlers/ServerChannelHandler.java |   0
 .../netty4/handlers/ServerResponseFutureListener.java   |   0
 .../camel/component/netty4/ssl/SSLEngineFactory.java    |   0
 .../apache/camel/component/netty4/util/SubnetUtils.java |   0
 .../src/test/data/message1.txt                          |   0
 .../apache/camel/component/netty4/BaseNettyTest.java    |   0
 .../netty4/DatagramPacketByteArrayCodecTest.java        |   0
 .../camel/component/netty4/LogCaptureAppender.java      |   0
 .../apache/camel/component/netty4/LogCaptureTest.java   |   0
 .../component/netty4/MultipleCodecsSpringTest.java      |   0
 .../camel/component/netty4/MultipleCodecsTest.java      |   4 ++--
 .../apache/camel/component/netty4/MyCustomCodec.java    |   0
 .../camel/component/netty4/Netty2978IssueTest.java      |   2 +-
 .../apache/camel/component/netty4/NettyBacklogTest.java |   2 +-
 .../netty4/NettyComponentWithConfigurationTest.java     |  12 ++++++------
 .../camel/component/netty4/NettyConcurrentTest.java     |   4 ++--
 .../netty4/NettyConsumerClientModeReconnectTest.java    |   2 +-
 .../netty4/NettyConsumerClientModeReuseChannelTest.java |   2 +-
 .../component/netty4/NettyConsumerClientModeTest.java   |   2 +-
 .../camel/component/netty4/NettyConverterTest.java      |   0
 .../camel/component/netty4/NettyCustomCodecTest.java    |   2 +-
 .../netty4/NettyCustomCorrelationManagerTest.java       |   4 ++--
 .../netty4/NettyCustomPipelineFactoryAsynchTest.java    |   4 ++--
 .../netty4/NettyCustomPipelineFactorySynchTest.java     |   4 ++--
 .../camel/component/netty4/NettyDisconnectTest.java     |   4 ++--
 .../apache/camel/component/netty4/NettyFileTcpTest.java |   4 ++--
 .../netty4/NettyGlobalSSLContextParametersTest.java     |   6 +++---
 .../netty4/NettyInOutCloseChannelWhenCompleteTest.java  |   4 ++--
 .../camel/component/netty4/NettyInOutFromSedaTest.java  |   4 ++--
 .../netty4/NettyInOutWithForcedNoResponseTest.java      |   6 +++---
 .../camel/component/netty4/NettyManualEndpointTest.java |   4 ++--
 .../netty4/NettyMultipleSimultaneousClientsTest.java    |   2 +-
 .../apache/camel/component/netty4/NettyOptionTest.java  |   2 +-
 .../netty4/NettyProducerAsyncEndpointTest.java          |   4 ++--
 .../camel/component/netty4/NettyProducerHangTest.java   |   8 ++++----
 .../component/netty4/NettyProducerPoolDisabledTest.java |   4 ++--
 .../apache/camel/component/netty4/NettyProxyTest.java   |   8 ++++----
 .../camel/component/netty4/NettyRedeliveryTest.java     |   2 +-
 .../component/netty4/NettyRequestTimeoutIssueTest.java  |   4 ++--
 .../camel/component/netty4/NettyRequestTimeoutTest.java |  12 ++++++------
 .../camel/component/netty4/NettyReuseChannelTest.java   |   6 +++---
 .../component/netty4/NettyReuseConnectionTest.java      |   2 +-
 .../camel/component/netty4/NettySSLClasspathTest.java   |   4 ++--
 .../component/netty4/NettySSLClientCertHeadersTest.java |   4 ++--
 .../netty4/NettySSLConsumerClientModeTest.java          |   2 +-
 .../component/netty4/NettySSLContextParametersTest.java |   4 ++--
 .../component/netty4/NettySSLPassphaseBeanTest.java     |   4 ++--
 .../org/apache/camel/component/netty4/NettySSLTest.java |   4 ++--
 .../camel/component/netty4/NettySingleCodecTest.java    |   4 ++--
 .../camel/component/netty4/NettySuspendResumeTest.java  |   8 ++++----
 .../camel/component/netty4/NettyTCPAsyncTest.java       |   4 ++--
 .../camel/component/netty4/NettyTCPChainedTest.java     |   4 ++--
 .../netty4/NettyTCPSyncNotLazyChannelTest.java          |   6 +++---
 .../apache/camel/component/netty4/NettyTCPSyncTest.java |  10 +++++-----
 .../netty4/NettyTcpWithInOutUsingPlainSocketTest.java   |   2 +-
 .../netty4/NettyTextlineInOnlyNullDelimiterTest.java    |   4 ++--
 .../camel/component/netty4/NettyTextlineInOnlyTest.java |   8 ++++----
 .../netty4/NettyTextlineInOutNonBlockingTest.java       |   4 ++--
 .../netty4/NettyTextlineInOutSynchronousFalseTest.java  |   4 ++--
 .../netty4/NettyTextlineInOutSynchronousTest.java       |   4 ++--
 .../camel/component/netty4/NettyTextlineInOutTest.java  |   4 ++--
 .../netty4/NettyTransferExchangeOptionTest.java         |   4 ++--
 .../camel/component/netty4/NettyUDPAsyncTest.java       |   4 ++--
 .../component/netty4/NettyUDPByteArrayConsumerTest.java |   6 +++---
 .../component/netty4/NettyUDPByteArrayProviderTest.java |   2 +-
 .../netty4/NettyUDPLargeMessageInOnlyTest.java          |   4 ++--
 .../NettyUDPMessageLargerThanDefaultBufferSizeTest.java |   4 ++--
 .../component/netty4/NettyUDPMulticastAsyncTest.java    |   4 ++--
 .../camel/component/netty4/NettyUDPObjectSyncTest.java  |   4 ++--
 .../apache/camel/component/netty4/NettyUDPSyncTest.java |   4 ++--
 .../component/netty4/NettyUdpConnectedSendTest.java     |   2 +-
 .../netty4/NettyUdpConnectionlessSendTest.java          |   2 +-
 .../netty4/NettyUdpWithInOutUsingPlainSocketTest.java   |   2 +-
 .../NettyUseSharedWorkerThreadPoolManyRoutesTest.java   |   2 +-
 .../netty4/NettyUseSharedWorkerThreadPoolTest.java      |  12 ++++++------
 .../java/org/apache/camel/component/netty4/Poetry.java  |   0
 .../SpringNettyUseSharedWorkerThreadPoolTest.java       |   6 +++---
 .../netty4/UnsharableCodecsConflicts2Test.java          |   2 +-
 .../component/netty4/UnsharableCodecsConflictsTest.java |   4 ++--
 .../src/test/resources/keystore.jks                     | Bin
 .../src/test/resources/log4j2.properties                |   2 +-
 .../netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml |   6 +++---
 .../apache/camel/component/netty4/multiple-codecs.xml   |   4 ++--
 .../src/test/resources/test.txt                         |   0
 .../endpoint/dsl/NettyEndpointBuilderFactory.java       |  16 ++++++++--------
 .../pom.xml                                             |   6 +++---
 .../springboot/NettyComponentAutoConfiguration.java     |   8 ++++----
 .../netty4/springboot/NettyComponentConfiguration.java  |   4 ++--
 .../src/main/resources/META-INF/LICENSE.txt             |   0
 .../src/main/resources/META-INF/NOTICE.txt              |   0
 .../src/main/resources/META-INF/spring.factories        |   1 +
 .../src/main/resources/META-INF/spring.provides         |   2 +-
 .../additional-spring-configuration-metadata.json       |  10 ----------
 platforms/spring-boot/components-starter/pom.xml        |   1 +
 143 files changed, 174 insertions(+), 182 deletions(-)

diff --git a/components/camel-netty4/pom.xml b/components/camel-netty/pom.xml
similarity index 97%
rename from components/camel-netty4/pom.xml
rename to components/camel-netty/pom.xml
index d146079..b0fdcfb 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -27,9 +27,9 @@
         <version>3.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>camel-netty4</artifactId>
+    <artifactId>camel-netty</artifactId>
     <packaging>jar</packaging>
-    <name>Camel :: Netty4</name>
+    <name>Camel :: Netty</name>
     <description>Camel Netty NIO based socket communication component</description>
 
     <properties>
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty/src/main/docs/netty4-component.adoc
similarity index 100%
rename from components/camel-netty4/src/main/docs/netty4-component.adoc
rename to components/camel-netty/src/main/docs/netty4-component.adoc
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
similarity index 99%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
index cd7fa96..95668a9 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.apache.camel.util.concurrent.CamelThreadFactory;
 
-@Component("netty,netty4")
+@Component("netty")
 public class NettyComponent extends DefaultComponent implements SSLContextParametersAware {
 
     @Metadata(label = "advanced")
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConstants.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
similarity index 95%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
index 421b5c5..bb672c4 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
@@ -40,7 +40,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Socket level networking using TCP or UDP with the Netty 4.x library.
  */
-@UriEndpoint(firstVersion = "2.14.0", scheme = "netty4,netty", title = "Netty4", syntax = "netty4:protocol:host:port", label = "networking,tcp,udp")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "netty", title = "Netty", syntax = "netty:protocol:host:port", label = "networking,tcp,udp")
 public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     @UriParam
     private NettyConfiguration configuration;
@@ -93,7 +93,7 @@ public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     @Override
     protected String createEndpointUri() {
         ObjectHelper.notNull(configuration, "configuration");
-        return "netty4:" + getConfiguration().getProtocol() + "://" + getConfiguration().getHost() + ":" + getConfiguration().getPort(); 
+        return "netty:" + getConfiguration().getProtocol() + "://" + getConfiguration().getHost() + ":" + getConfiguration().getPort(); 
     }
     
     protected SSLSession getSSLSession(ChannelHandlerContext ctx) {
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
diff --git a/components/camel-netty4/src/test/data/message1.txt b/components/camel-netty/src/test/data/message1.txt
similarity index 100%
rename from components/camel-netty4/src/test/data/message1.txt
rename to components/camel-netty/src/test/data/message1.txt
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
index b021f9d..8cae9ff 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
@@ -80,9 +80,9 @@ public class MultipleCodecsTest extends BaseNettyTest {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: routes
-                from("direct:multiple-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
+                from("direct:multiple-codec").to("netty:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
 
-                from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
+                from("netty:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
                 // START SNIPPET: routes
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
index d967c94..aee0440 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
@@ -104,7 +104,7 @@ public class Netty2978IssueTest extends BaseNettyTest {
         private final ProducerTemplate producerTemplate;
 
         CamelClient(CamelContext camelContext) {
-            this.endpoint = camelContext.getEndpoint("netty4:tcp://localhost:{{port}}?sync=true");
+            this.endpoint = camelContext.getEndpoint("netty:tcp://localhost:{{port}}?sync=true");
             this.producerTemplate = camelContext.createProducerTemplate();
         }
 
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
index 2cd8960..9fb5479 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
@@ -27,7 +27,7 @@ public class NettyBacklogTest extends NettyTCPSyncTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true&backlog=500")
+                from("netty:tcp://localhost:{{port}}?sync=true&backlog=500")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
similarity index 89%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
index 27aaa39..c3e6357 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
@@ -23,15 +23,15 @@ public class NettyComponentWithConfigurationTest extends CamelTestSupport {
 
     @Test
     public void testNettyComponentWithConfiguration() throws Exception {
-        NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
+        NettyComponent comp = context.getComponent("netty", NettyComponent.class);
 
         NettyConfiguration cfg = new NettyConfiguration();
 
         comp.setConfiguration(cfg);
         assertSame(cfg, comp.getConfiguration());
 
-        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:4455");
-        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:5566?sync=false&needClientAuth=true");
+        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:4455");
+        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:5566?sync=false&needClientAuth=true");
 
         // should not be same
         assertNotSame(e1, e2);
@@ -53,15 +53,15 @@ public class NettyComponentWithConfigurationTest extends CamelTestSupport {
 
     @Test
     public void testNettyComponentUdpWithConfiguration() throws Exception {
-        NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
+        NettyComponent comp = context.getComponent("netty", NettyComponent.class);
 
         NettyConfiguration cfg = new NettyConfiguration();
 
         comp.setConfiguration(cfg);
         assertSame(cfg, comp.getConfiguration());
 
-        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty4://udp://localhost:8601?sync=false");
-        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty4://udp://localhost:8602?sync=false&udpConnectionlessSending=true");
+        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty://udp://localhost:8601?sync=false");
+        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty://udp://localhost:8602?sync=false&udpConnectionlessSending=true");
 
         // should not be same
         assertNotSame(e1, e2);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
index 606d373..eaf1434 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
@@ -64,7 +64,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
             final int index = i;
             Future<String> out = executor.submit(new Callable<String>() {
                 public String call() throws Exception {
-                    String reply = template.requestBody("netty4:tcp://localhost:{{port}}", index, String.class);
+                    String reply = template.requestBody("netty:tcp://localhost:{{port}}", index, String.class);
                     log.debug("Sent {} received {}", index, reply);
                     assertEquals("Bye " + index, reply);
                     return reply;
@@ -92,7 +92,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
index a6cec2e..256c9c2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
@@ -81,7 +81,7 @@ public class NettyConsumerClientModeReconnectTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&reconnect=true&reconnectInterval=200").id("client")
+                from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&reconnect=true&reconnectInterval=200").id("client")
                         .process(new Processor() {
                             public void process(final Exchange exchange) {
                                 log.info("Processing exchange in Netty server {}", exchange);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
similarity index 98%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
index 633b732..6fb169f 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
@@ -78,7 +78,7 @@ public class NettyConsumerClientModeReuseChannelTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&reuseChannel=true").id("client")
+                from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&reuseChannel=true").id("client")
                     .process(new Processor() {
                         public void process(final Exchange exchange) {
                             final Channel channel = exchange.getProperty(NettyConstants.NETTY_CHANNEL, Channel.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
similarity index 98%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
index e59d6ea..b38f046 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
@@ -71,7 +71,7 @@ public class NettyConsumerClientModeTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true").id("client")
+                from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true").id("client")
                 .process(new Processor() {
                     public void process(final Exchange exchange) {
                         String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
index 03daedb..fcd286d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
@@ -34,7 +34,7 @@ public class NettyCustomCodecTest extends BaseNettyTest {
     @BindToRegistry("myCustomEncoder")
     private ChannelHandler customEnc = MyCustomCodec.createMyCustomEncoder();
 
-    private String uri = "netty4:tcp://localhost:{{port}}?disconnect=true&sync=false"
+    private String uri = "netty:tcp://localhost:{{port}}?disconnect=true&sync=false"
                          + "&allowDefaultCodec=false&decoders=#myCustomDecoder,#myCustomDecoder2&encoders=#myCustomEncoder";
 
     // use reaadble bytes
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
index f7f3efa..2342126 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
@@ -55,10 +55,10 @@ public class NettyCustomCorrelationManagerTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("seda:start").log("before ${body}").to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false&correlationManager=#myManager")
+                from("seda:start").log("before ${body}").to("netty:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false&correlationManager=#myManager")
                     .log("after ${body}").to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true").transform(body().prepend("Bye "));
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true").transform(body().prepend("Bye "));
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
index 72b7f20..3b8bb7d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
@@ -48,7 +48,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?serverInitializerFactory=#spf&textline=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?serverInitializerFactory=#spf&textline=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
                     }
@@ -59,7 +59,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
 
     @Test
     public void testCustomClientInitializerFactory() throws Exception {
-        String response = (String)template.requestBody("netty4:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&textline=true", "Forest Gump describing Vietnam...");
+        String response = (String)template.requestBody("netty:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&textline=true", "Forest Gump describing Vietnam...");
 
         assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);
         assertEquals(true, clientInvoked);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
index e15f30e..195261a 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
@@ -48,7 +48,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?serverInitializerFactory=#spf&sync=true&textline=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?serverInitializerFactory=#spf&sync=true&textline=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
                     }
@@ -59,7 +59,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
 
     @Test
     public void testCustomClientPipelineFactory() throws Exception {
-        String response = (String)template.requestBody("netty4:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&sync=true&textline=true",
+        String response = (String)template.requestBody("netty:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&sync=true&textline=true",
                                                        "Forest Gump describing Vietnam...");
 
         assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
index 68585c6..86af6a5 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
@@ -25,7 +25,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
 
     @Test
     public void testCloseSessionWhenComplete() throws Exception {
-        Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
+        Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
         assertEquals("Bye Claus", out);
     }
 
@@ -33,7 +33,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
index a0fd6fc..f179c36 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
@@ -36,11 +36,11 @@ public class NettyFileTcpTest extends BaseNettyTest {
         return new RouteBuilder() {
             public void configure() {
                 // lets setup a server
-                from("netty4:tcp://localhost:{{port}}?sync=false&textline=true")
+                from("netty:tcp://localhost:{{port}}?sync=false&textline=true")
                         .to("mock:results");
 
                 from("file:src/test/data?noop=true&fileName=message1.txt").
-                        to("netty4:tcp://localhost:{{port}}?sync=false&textline=true");
+                        to("netty:tcp://localhost:{{port}}?sync=false&textline=true");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
index d1b1d41..54d131b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
@@ -56,7 +56,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
         sslContextParameters.setServerParameters(scsp);
         context.setSSLContextParameters(sslContextParameters);
 
-        ((SSLContextParametersAware) context.getComponent("netty4")).setUseGlobalSslContextParameters(true);
+        ((SSLContextParametersAware) context.getComponent("netty")).setUseGlobalSslContextParameters(true);
         return context;
     }
     
@@ -74,7 +74,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true")
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");                           
@@ -85,7 +85,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true",
+                "netty:tcp://localhost:{{port}}?sync=true&ssl=true",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
index a5c53ed..0924c3d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
@@ -25,7 +25,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
 
     @Test
     public void testCloseSessionWhenComplete() throws Exception {
-        Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", "Claus");
+        Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true", "Claus");
         assertEquals("Bye Claus", out);
     }
 
@@ -33,7 +33,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
index 94cc0c3..1541acd 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
@@ -41,11 +41,11 @@ public class NettyInOutFromSedaTest extends BaseNettyTest {
             public void configure() throws Exception {
                 from("seda:start")
                     .log("before ${body}")
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .log("after ${body}")
                     .to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .transform(body().prepend("Bye "));
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
index f65c7bf..17a6ac9 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
@@ -24,14 +24,14 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
 
     @Test
     public void testResponse() throws Exception {
-        Object out = template.requestBody("netty4:tcp://localhost:{{port}}", "Copenhagen");
+        Object out = template.requestBody("netty:tcp://localhost:{{port}}", "Copenhagen");
         assertEquals("Hello Claus", out);
     }
 
     @Test
     public void testNoResponse() throws Exception {
         try {
-            template.requestBody("netty4:tcp://localhost:{{port}}", "London");
+            template.requestBody("netty:tcp://localhost:{{port}}", "London");
             fail("Should throw an exception");
         } catch (RuntimeCamelException e) {
             assertTrue(e.getCause().getMessage().startsWith("No response"));
@@ -42,7 +42,7 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}")
+                from("netty:tcp://localhost:{{port}}")
                     .choice()
                         .when(body().isEqualTo("Copenhagen")).transform(constant("Hello Claus"))
                         .otherwise().transform(constant(null));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
index c7bd637..9f8a0fe 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
@@ -39,7 +39,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
 
         assertMockEndpointsSatisfied();
 
-        assertEquals("netty4:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
+        assertEquals("netty:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
     }
 
     @Override
@@ -63,7 +63,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
                 // create and start component
                 NettyComponent component = new NettyComponent(getContext());
                 component.setConfiguration(nettyConfig);
-                getContext().addComponent("netty4", component);
+                getContext().addComponent("netty", component);
                 component.start();
 
                 // create and start endpoint, pass in null as endpoint uri
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
index 1fa2f65..d379ee3 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 @Ignore("TODO: investigate for Camel 3.0")
 public class NettyMultipleSimultaneousClientsTest extends BaseNettyTest {
 
-    private String uri = "netty4:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
+    private String uri = "netty:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
     private int clientCount = 20;
     private CountDownLatch startLatch = new CountDownLatch(1);
     private CountDownLatch finishLatch = new CountDownLatch(clientCount);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
index 0e25d30..10df704 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
@@ -27,7 +27,7 @@ public class NettyOptionTest extends NettyTCPSyncTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
+                from("netty:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
index 6bfe022..c13c6a2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
@@ -53,7 +53,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
                                 beforeThreadName = Thread.currentThread().getName();
                             }
                         })
-                        .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                        .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 afterThreadName = Thread.currentThread().getName();
@@ -63,7 +63,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
                         .to("mock:after")
                         .to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .delay(1000)
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
similarity index 85%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
index b5c0acc..9426d48 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
@@ -43,22 +43,22 @@ public class NettyProducerHangTest extends CamelTestSupport {
             }
         }).start();
 
-        String response1 = template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request1", String.class);
+        String response1 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request1", String.class);
         log.info("Received first response <" + response1 + ">");
 
         try {
             // our test server will close the socket now so we should get an error
-            template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request2", String.class);
+            template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request2", String.class);
         } catch (Exception e) {
             assertStringContains(e.getCause().getMessage(), "No response received from remote server");
         }
         
-        String response2 = template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request3", String.class);
+        String response2 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request3", String.class);
         log.info("Received 2nd response <" + response2 + ">");
 
         try {
             // our test server will close the socket now so we should get an error
-            template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request4", String.class);
+            template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request4", String.class);
         } catch (Exception e) {
             assertStringContains(e.getCause().getMessage(), "No response received from remote server");
         }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
index 84b9188..29893fb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
@@ -35,9 +35,9 @@ public class NettyProducerPoolDisabledTest extends BaseNettyTest {
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
similarity index 83%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
index b23e2e8..70855df 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
@@ -33,7 +33,7 @@ public class NettyProxyTest extends BaseNettyTest {
         getMockEndpoint("mock:proxy").expectedBodiesReceived("Camel");
         getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
 
-        Object body = template.requestBody("netty4:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
+        Object body = template.requestBody("netty:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
         assertEquals("Bye Camel", body);
 
         assertMockEndpointsSatisfied();
@@ -47,12 +47,12 @@ public class NettyProxyTest extends BaseNettyTest {
                 port1 = getPort();
                 port2 = getNextPort();
 
-                fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port1)
+                fromF("netty:tcp://localhost:%s?sync=true&textline=true", port1)
                     .to("mock:before")
-                    .toF("netty4:tcp://localhost:%s?sync=true&textline=true", port2)
+                    .toF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
                     .to("mock:after");
 
-                fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port2)
+                fromF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
                     .to("mock:proxy")
                     .transform().simple("Bye ${body}\n");
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
similarity index 99%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
index 0ffdbc3..183b7a7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
@@ -88,7 +88,7 @@ public class NettyRedeliveryTest extends CamelTestSupport {
 
                 from("direct:start")
                         .routeId("start")
-                        .to("netty4:tcp://localhost:" + port)
+                        .to("netty:tcp://localhost:" + port)
                         .to("log:downstream")
                         .to("mock:downstream");
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
index 89869a9..0b5744e 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
@@ -31,9 +31,9 @@ public class NettyRequestTimeoutIssueTest extends CamelTestSupport {
             @Override
             public void configure() throws Exception {
                 from("direct:out")
-                        .to("netty4:tcp://localhost:8080?requestTimeout=5000");
+                        .to("netty:tcp://localhost:8080?requestTimeout=5000");
 
-                from("netty4:tcp://localhost:8080")
+                from("netty:tcp://localhost:8080")
                         .to("log:nettyCase?showAll=true&multiline=true");
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
similarity index 78%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
index 365d22c..50f5f12 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
@@ -27,14 +27,14 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
 
     @Test
     public void testRequestTimeoutOK() throws Exception {
-        String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=500", "Hello Camel", String.class);
+        String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=500", "Hello Camel", String.class);
         assertEquals("Bye World", out);
     }
 
     @Test
     public void testRequestTimeout() throws Exception {
         try {
-            template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
+            template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
             fail("Should have thrown exception");
         } catch (CamelExecutionException e) {
             ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -45,7 +45,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
     @Test
     public void testRequestTimeoutViaHeader() throws Exception {
         try {
-            template.requestBodyAndHeader("netty4:tcp://localhost:{{port}}?textline=true&sync=true", "Hello Camel", NettyConstants.NETTY_REQUEST_TIMEOUT, 100, String.class);
+            template.requestBodyAndHeader("netty:tcp://localhost:{{port}}?textline=true&sync=true", "Hello Camel", NettyConstants.NETTY_REQUEST_TIMEOUT, 100, String.class);
             fail("Should have thrown exception");
         } catch (CamelExecutionException e) {
             ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -56,7 +56,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
     @Test
     public void testRequestTimeoutAndOk() throws Exception {
         try {
-            template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
+            template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
             fail("Should have thrown exception");
         } catch (CamelExecutionException e) {
             ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -64,7 +64,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
         }
 
         // now we try again but this time the is no delay on server and thus faster
-        String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello World", String.class);
+        String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello World", String.class);
         assertEquals("Bye World", out);
     }
 
@@ -73,7 +73,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         @Override
                         public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
index 7168c9f..e6ab685 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
@@ -56,7 +56,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
                     .process(new Processor() {
                         @Override
                         public void process(Exchange exchange) throws Exception {
@@ -66,7 +66,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
                         }
                     })
                     .to("mock:a")
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
                     .process(new Processor() {
                         @Override
                         public void process(Exchange exchange) throws Exception {
@@ -77,7 +77,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
                     })
                     .to("mock:b");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .transform(body().prepend("Hello "))
                     .to("mock:result");
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
index 3ba175c..5c0b4a8 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
  */
 public class NettyReuseConnectionTest extends BaseNettyTest {
 
-    private String uri = "netty4:tcp://localhost:{{port}}?sync=true&disconnect=false";
+    private String uri = "netty:tcp://localhost:{{port}}?sync=true&disconnect=false";
 
     @Test
     public void testReuseConnection() throws Exception {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
similarity index 85%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
index 41f9492..d8943ae 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
@@ -37,7 +37,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");                           
@@ -48,7 +48,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
index b903c2a..af37080 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
@@ -58,13 +58,13 @@ public class NettySSLClientCertHeadersTest extends BaseNettyTest {
             public void configure() {
                 // needClientAuth=true so we can get the client certificate
                 // details
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf"
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf"
                      + "&needClientAuth=true&sslClientCertHeaders=true").to("mock:input").transform().constant("Bye World");
             }
         });
         context.start();
 
-        String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
+        String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
                                                "Hello World", String.class);
         assertEquals("Bye World", response);
 
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
index f316092..91c0241 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
@@ -99,7 +99,7 @@ public class NettySSLConsumerClientModeTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf").id("sslclient")
+                from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf").id("sslclient")
                     .process(new Processor() {
                         public void process(final Exchange exchange) {
                             String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
index 4311b80..36f40fb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
@@ -73,7 +73,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
                     }
@@ -82,7 +82,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
         });
         context.start();
 
-        String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
+        String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
                                                "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds",
                                                String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
similarity index 86%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
index 1061f9b..5e71966 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
@@ -41,7 +41,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
@@ -52,7 +52,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
         context.start();
 
         String response = template
-            .requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+            .requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
                          "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
index 90f7e8b..6ad8f80 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
@@ -55,7 +55,7 @@ public class NettySSLTest extends BaseNettyTest {
             public void configure() {
                 // needClientAuth=true so we can get the client certificate
                 // details
-                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf&needClientAuth=true")
+                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf&needClientAuth=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             SSLSession session = exchange.getIn().getHeader(NettyConstants.NETTY_SSL_SESSION, SSLSession.class);
@@ -73,7 +73,7 @@ public class NettySSLTest extends BaseNettyTest {
         });
         context.start();
 
-        String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
+        String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
                                                "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds",
                                                String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
similarity index 89%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
index f13e96d..c155699 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
@@ -49,9 +49,9 @@ public class NettySingleCodecTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("direct:single-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoder&sync=false");
+                from("direct:single-codec").to("netty:tcp://localhost:{{port}}?encoders=#encoder&sync=false");
 
-                from("netty4:tcp://localhost:{{port}}?decoders=#decoder&sync=false").to("mock:single-codec");
+                from("netty:tcp://localhost:{{port}}?decoders=#decoder&sync=false").to("mock:single-codec");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
similarity index 80%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
index 8d1c64e..9f4f3a1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
@@ -25,13 +25,13 @@ public class NettySuspendResumeTest extends BaseNettyTest {
     public void testSuspendResume() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Camel", "Again");
 
-        String out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
+        String out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
         assertEquals("Bye Camel", out);
 
         context.getRouteController().suspendRoute("foo");
 
         try {
-            template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
+            template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
             fail("Should not allow connecting as its suspended");
         } catch (Exception e) {
             // expected
@@ -39,7 +39,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
 
         context.getRouteController().resumeRoute("foo");
 
-        out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
+        out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
         assertEquals("Bye Again", out);
 
         assertMockEndpointsSatisfied();
@@ -50,7 +50,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true").routeId("foo")
+                from("netty:tcp://localhost:{{port}}?sync=true").routeId("foo")
                     .to("log:result")
                     .to("mock:result")
                     .transform(body().prepend("Bye "));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
index 00e97ad..fff7574 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
@@ -54,7 +54,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
     public void testTCPInOnlyWithNettyConsumer() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
-        sendFile("netty4:tcp://localhost:{{port}}?sync=false");
+        sendFile("netty:tcp://localhost:{{port}}?sync=false");
         
         mock.assertIsSatisfied();
     }
@@ -64,7 +64,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=false")
+                from("netty:tcp://localhost:{{port}}?sync=false")
                     .to("log:result")
                     .to("mock:result");                
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
index 7dc2b0d..134c184 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
@@ -74,11 +74,11 @@ public class NettyTCPChainedTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=false")
+                from("netty:tcp://localhost:{{port}}?sync=false")
                     .to("log:result")
                     .to("mock:result");
                 from("direct:nettyCall")
-                        .to("netty4:tcp://localhost:{{port}}?sync=false&disconnect=true&workerCount=1");
+                        .to("netty:tcp://localhost:{{port}}?sync=false&disconnect=true&workerCount=1");
                 from("direct:chainedCalls")
                         .to("direct:nettyCall")
                         .to("direct:nettyCall");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
index 05f76f8..ecce11b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer() throws Exception {
         String response = template.requestBody(
-            "netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
+            "netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -34,7 +34,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
     @Test
     public void testTCPObjectInOutWithNettyConsumer() throws Exception {
         Poetry poetry = new Poetry();
-        Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
+        Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
         assertEquals("Dr. Sarojini Naidu", response.getPoet());
     }
 
@@ -43,7 +43,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true")
+                from("netty:tcp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
index 447be36..b92e8f4 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer() throws Exception {
         String response = template.requestBody(
-            "netty4:tcp://localhost:{{port}}?sync=true",
+            "netty:tcp://localhost:{{port}}?sync=true",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);        
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -34,12 +34,12 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer2Times() throws Exception {
         String response = template.requestBody(
-            "netty4:tcp://localhost:{{port}}?sync=true",
+            "netty:tcp://localhost:{{port}}?sync=true",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
 
         response = template.requestBody(
-            "netty4:tcp://localhost:{{port}}?sync=true",
+            "netty:tcp://localhost:{{port}}?sync=true",
             "Hello World", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -47,7 +47,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPObjectInOutWithNettyConsumer() throws Exception {
         Poetry poetry = new Poetry();
-        Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", poetry);
+        Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true", poetry);
         assertEquals("Dr. Sarojini Naidu", response.getPoet());
     }
     
@@ -56,7 +56,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?sync=true")
+                from("netty:tcp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
index bc090e9..b63c4ba 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
@@ -119,7 +119,7 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
                     public void process(Exchange e) {
                         String in = e.getIn().getBody(String.class);
                         if ("force-null-out-body".equals(in)) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
similarity index 87%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
index ab597c6..9e3b3a7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
     public void testTextlineInOnlyNull() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
+        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
 
         assertMockEndpointsSatisfied();
     }
@@ -35,7 +35,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
+                from("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
similarity index 83%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
index 82b1566..501e131 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnlyDual() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "how are you?");
 
-        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
+        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
 
         assertMockEndpointsSatisfied();
     }
@@ -34,7 +34,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnlyAutoAppend() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
+        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
 
         assertMockEndpointsSatisfied();
     }
@@ -43,7 +43,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnly() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
+        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
 
         assertMockEndpointsSatisfied();
     }
@@ -53,7 +53,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=false")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
index cd2779d..b046bbf 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
@@ -53,7 +53,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -62,7 +62,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             beforeThreadName2 = Thread.currentThread().getName();
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
index 9ed53f5..9824503 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
@@ -50,7 +50,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -59,7 +59,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
index 24b8c1d..a7f9cc7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
@@ -50,7 +50,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -59,7 +59,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
index c1043e6..14d4bda 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
     public void testTextlineInOut() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        String reply = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
+        String reply = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -36,7 +36,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result")
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
index db656e9..d64c582 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
@@ -42,7 +42,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
     }
 
     private Exchange sendExchange(boolean setException) throws Exception {
-        Endpoint endpoint = context.getEndpoint("netty4:tcp://localhost:{{port}}?transferExchange=true");
+        Endpoint endpoint = context.getEndpoint("netty:tcp://localhost:{{port}}?transferExchange=true");
         Exchange exchange = endpoint.createExchange();
 
         Message message = exchange.getIn();
@@ -93,7 +93,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("netty4:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
+                from("netty:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
                     public void process(Exchange e) throws InterruptedException {
                         assertNotNull(e.getIn().getBody());
                         assertNotNull(e.getIn().getHeaders());
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
index 4f16051..7c2f2f2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
@@ -42,7 +42,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
         mock.expectedMessageCount(1);
         mock.message(0).body().startsWith("Song Of A Dream".getBytes());
 
-        sendFile("netty4:udp://localhost:{{port}}?sync=false");
+        sendFile("netty:udp://localhost:{{port}}?sync=false");
 
         mock.assertIsSatisfied();
     }
@@ -52,7 +52,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:udp://localhost:{{port}}?sync=false")
+                from("netty:udp://localhost:{{port}}?sync=false")
                     .to("mock:result")
                     .to("log:Message"); 
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
index 4fb8df3..10f15ca 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
@@ -31,7 +31,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
         mock.expectedMessageCount(1);
         mock.message(0).body().isEqualTo("***Camel rocks ?=)".getBytes());
 
-        template.sendBody("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", "***Camel rocks ?=)".getBytes());
+        template.sendBody("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", "***Camel rocks ?=)".getBytes());
 
         mock.assertIsSatisfied();
     }
@@ -44,7 +44,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
         String toSend = "ef3e00559f5faf0262f5ff0962d9008daa91001cd46b0fa9330ef0f3030fff250e46f72444d1cc501678c351e04b8004c"
                 + "4000002080000fe850bbe011030000008031b031bfe9251305441593830354720020800050440ff";
         byte[] in = fromHexString(toSend);
-        template.sendBody("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", in);
+        template.sendBody("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", in);
 
         assertMockEndpointsSatisfied();
         List<Exchange> list = endpoint.getReceivedExchanges();
@@ -61,7 +61,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true")
+                from("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true")
                         .to("mock:result");
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
index a897102..d402b6b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
@@ -81,7 +81,7 @@ public class NettyUDPByteArrayProviderTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true&udpConnectionlessSending=true");
+                from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true&udpConnectionlessSending=true");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
index 838b15c..22d4572 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
@@ -36,7 +36,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
         String message = new String(msgBytes);
 
         getMockEndpoint("mock:result").expectedBodiesReceived(message);
-        template.sendBody("netty4:udp://localhost:{{port}}?sync=false", message);
+        template.sendBody("netty:udp://localhost:{{port}}?sync=false", message);
         assertMockEndpointsSatisfied();
     }
 
@@ -60,7 +60,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
+                from("netty:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
                     .to("mock:result");
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
index be1e2fd..8401de9 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
@@ -40,7 +40,7 @@ public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTes
         String message = new String(msgBytes);
 
         getMockEndpoint("mock:result").expectedBodiesReceived(message);
-        template.sendBody("netty4:udp://localhost:{{port}}?sync=false", message);
+        template.sendBody("netty:udp://localhost:{{port}}?sync=false", message);
         assertMockEndpointsSatisfied();
     }
 
@@ -61,7 +61,7 @@ public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTes
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:udp://localhost:{{port}}?option." + ChannelOption.RCVBUF_ALLOCATOR.name() + "=#" + ChannelOption.RCVBUF_ALLOCATOR.name()).to("mock:result");
+                from("netty:udp://localhost:{{port}}?option." + ChannelOption.RCVBUF_ALLOCATOR.name() + "=#" + ChannelOption.RCVBUF_ALLOCATOR.name()).to("mock:result");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
index ad01a17..5c843c6 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
@@ -70,7 +70,7 @@ public class NettyUDPMulticastAsyncTest extends BaseNettyTest {
         mock.message(0).body().startsWith("Song Of A Dream".getBytes());
 
         // any IP in the range of 224.0.0.0 through 239.255.255.255 does the job
-        sendFile("netty4:udp://224.1.2.3:{{port}}?sync=false");
+        sendFile("netty:udp://224.1.2.3:{{port}}?sync=false");
 
         mock.assertIsSatisfied();
     }
@@ -80,7 +80,7 @@ public class NettyUDPMulticastAsyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty4:udp://224.1.2.3:{{port}}?sync=false&networkInterface=en0")
+                from("netty:udp://224.1.2.3:{{port}}?sync=false&networkInterface=en0")
                     .to("mock:result")
                     .to("log:Message"); 
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
index 3c07284..cc9ef9d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
@@ -26,7 +26,7 @@ public class NettyUDPObjectSyncTest extends BaseNettyTest {
     @Test
     public void testUDPObjectInOutWithNettyConsumer() throws Exception {
         Poetry poetry = new Poetry();
-        Poetry response = template.requestBody("netty4:udp://localhost:{{port}}?sync=true", poetry, Poetry.class);
+        Poetry response = template.requestBody("netty:udp://localhost:{{port}}?sync=true", poetry, Poetry.class);
         assertEquals("Dr. Sarojini Naidu", response.getPoet());
     }
     
@@ -35,7 +35,7 @@ public class NettyUDPObjectSyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {                
-                from("netty4:udp://localhost:{{port}}?sync=true")
+                from("netty:udp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             Poetry poetry = (Poetry) exchange.getIn().getBody();
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
index 439d0fa..9f8cd8f 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
@@ -29,7 +29,7 @@ public class NettyUDPSyncTest extends BaseNettyTest {
     public void testUDPStringInOutWithNettyConsumer() throws Exception {
         for (int i = 0; i < 5; i++) {
             String response = template.requestBody(
-                "netty4:udp://localhost:{{port}}?sync=true",
+                "netty:udp://localhost:{{port}}?sync=true",
                 REQUEST, String.class);        
             assertEquals(RESPONSE, response);
         }
@@ -40,7 +40,7 @@ public class NettyUDPSyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {                
-                from("netty4:udp://localhost:{{port}}?sync=true")
+                from("netty:udp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody(RESPONSE);                           
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
index 8255128..a8e6087 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
@@ -101,7 +101,7 @@ public class NettyUdpConnectedSendTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&textline=true");
+                from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&textline=true");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
index 79f2b1b..b975465 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
@@ -93,7 +93,7 @@ public class NettyUdpConnectionlessSendTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&textline=true&udpConnectionlessSending=true");
+                from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&textline=true&udpConnectionlessSending=true");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
index f9a4b85..6ffa801 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
@@ -64,7 +64,7 @@ public class NettyUdpWithInOutUsingPlainSocketTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("netty4:udp://127.0.0.1:{{port}}?textline=true&sync=true").process(new Processor() {
+                from("netty:udp://127.0.0.1:{{port}}?textline=true&sync=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String s = exchange.getIn().getBody(String.class);
                         LOG.debug("Server got: " + s);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
index 769961d..e78cc02 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
@@ -61,7 +61,7 @@ public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest
             public void configure() throws Exception {
 
                 for (int i = 0; i < 60; i++) {
-                    from("netty4:tcp://localhost:" + getNextPort() + "?textline=true&sync=true&usingExecutorService=false" + "&bossGroup=#sharedBoss&workerGroup=#sharedWorker")
+                    from("netty:tcp://localhost:" + getNextPort() + "?textline=true&sync=true&usingExecutorService=false" + "&bossGroup=#sharedBoss&workerGroup=#sharedWorker")
                         .validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Bye"));
                 }
             }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
similarity index 77%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
index 5db4e32..328f1e5 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
@@ -42,13 +42,13 @@ public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest {
         getMockEndpoint("mock:result").expectedMessageCount(30);
 
         for (int i = 0; i < 10; i++) {
-            String reply = template.requestBody("netty4:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello World", String.class);
+            String reply = template.requestBody("netty:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello World", String.class);
             assertEquals("Bye World", reply);
 
-            reply = template.requestBody("netty4:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Camel", String.class);
+            reply = template.requestBody("netty:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Camel", String.class);
             assertEquals("Hi Camel", reply);
 
-            reply = template.requestBody("netty4:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Claus", String.class);
+            reply = template.requestBody("netty:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Claus", String.class);
             assertEquals("Hej Claus", reply);
         }
 
@@ -68,13 +68,13 @@ public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest {
                 port2 = getNextPort();
                 port3 = getNextPort();
 
-                from("netty4:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+                from("netty:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
                     .validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Bye"));
 
-                from("netty4:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+                from("netty:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
                     .validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Hi"));
 
-                from("netty4:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+                from("netty:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
                     .validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Hej"));
             }
         };
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Poetry.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Poetry.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Poetry.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/Poetry.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
similarity index 82%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
index da4647c..4c45012 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
@@ -28,13 +28,13 @@ public class SpringNettyUseSharedWorkerThreadPoolTest extends CamelSpringTestSup
         getMockEndpoint("mock:result").expectedMessageCount(30);
 
         for (int i = 0; i < 10; i++) {
-            String reply = template.requestBody("netty4:tcp://localhost:5021?textline=true&sync=true", "Hello World", String.class);
+            String reply = template.requestBody("netty:tcp://localhost:5021?textline=true&sync=true", "Hello World", String.class);
             assertEquals("Hello World", reply);
 
-            reply = template.requestBody("netty4:tcp://localhost:5022?textline=true&sync=true", "Hello Camel", String.class);
+            reply = template.requestBody("netty:tcp://localhost:5022?textline=true&sync=true", "Hello Camel", String.class);
             assertEquals("Hello Camel", reply);
 
-            reply = template.requestBody("netty4:tcp://localhost:5023?textline=true&sync=true", "Hello Claus", String.class);
+            reply = template.requestBody("netty:tcp://localhost:5023?textline=true&sync=true", "Hello Claus", String.class);
             assertEquals("Hello Claus", reply);
         }
 
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
index 2795092..6e14917 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
@@ -78,7 +78,7 @@ public class UnsharableCodecsConflicts2Test extends BaseNettyTest {
             public void configure() throws Exception {
                 port = getPort();
 
-                from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder&sync=false").process(processor).to("mock:result");
+                from("netty:tcp://localhost:{{port}}?decoders=#length-decoder&sync=false").process(processor).to("mock:result");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
index 3ead263..18debed 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
@@ -83,9 +83,9 @@ public class UnsharableCodecsConflictsTest extends BaseNettyTest {
                 port1 = getPort();
                 port2 = getNextPort();
 
-                from("netty4:tcp://localhost:" + port1 + "?decoders=#length-decoder&sync=false").process(processor);
+                from("netty:tcp://localhost:" + port1 + "?decoders=#length-decoder&sync=false").process(processor);
 
-                from("netty4:tcp://localhost:" + port2 + "?decoders=#length-decoder2&sync=false").process(processor).to("mock:result");
+                from("netty:tcp://localhost:" + port2 + "?decoders=#length-decoder2&sync=false").process(processor).to("mock:result");
             }
         };
     }
diff --git a/components/camel-netty4/src/test/resources/keystore.jks b/components/camel-netty/src/test/resources/keystore.jks
similarity index 100%
rename from components/camel-netty4/src/test/resources/keystore.jks
rename to components/camel-netty/src/test/resources/keystore.jks
diff --git a/components/camel-netty4/src/test/resources/log4j2.properties b/components/camel-netty/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-netty4/src/test/resources/log4j2.properties
rename to components/camel-netty/src/test/resources/log4j2.properties
index d3e9737..05d847e 100644
--- a/components/camel-netty4/src/test/resources/log4j2.properties
+++ b/components/camel-netty/src/test/resources/log4j2.properties
@@ -18,7 +18,7 @@
 configuration.packages=org.apache.camel.component.netty4
 appender.file.type = File
 appender.file.name = file
-appender.file.fileName = target/camel-netty4-test.log
+appender.file.fileName = target/camel-netty-test.log
 appender.file.layout.type = PatternLayout
 appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
 appender.out.type = Console
diff --git a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
similarity index 83%
rename from components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
rename to components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
index 3d56222..7a53960 100644
--- a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
+++ b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
@@ -33,19 +33,19 @@
 
   <camelContext xmlns="http://camel.apache.org/schema/spring">
     <route>
-      <from uri="netty4:tcp://localhost:5021?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
+      <from uri="netty:tcp://localhost:5021?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
       <to uri="log:result"/>
       <to uri="mock:result"/>
     </route>
 
     <route>
-      <from uri="netty4:tcp://localhost:5022?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
+      <from uri="netty:tcp://localhost:5022?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
       <to uri="log:result"/>
       <to uri="mock:result"/>
     </route>
 
     <route>
-      <from uri="netty4:tcp://localhost:5023?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
+      <from uri="netty:tcp://localhost:5023?textline=true&amp;sync=true&amp;workerGroup=#sharedPool&amp;usingExecutorService=false"/>
       <to uri="log:result"/>
       <to uri="mock:result"/>
     </route>
diff --git a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
similarity index 94%
rename from components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
rename to components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
index 18adda5..581c14a 100644
--- a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
+++ b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
@@ -28,10 +28,10 @@
     <camelContext id="multiple-netty-codecs-context" xmlns="http://camel.apache.org/schema/spring">
         <route>
             <from uri="direct:multiple-codec"/>
-            <to uri="netty4:tcp://localhost:5150?encoders=#encoders&amp;sync=false"/>
+            <to uri="netty:tcp://localhost:5150?encoders=#encoders&amp;sync=false"/>
         </route>
         <route>
-            <from uri="netty4:tcp://localhost:5150?decoders=#length-decoder,#string-decoder&amp;sync=false"/>
+            <from uri="netty:tcp://localhost:5150?decoders=#length-decoder,#string-decoder&amp;sync=false"/>
             <to uri="mock:multiple-codec"/>
         </route>
     </camelContext>
diff --git a/components/camel-netty4/src/test/resources/test.txt b/components/camel-netty/src/test/resources/test.txt
similarity index 100%
rename from components/camel-netty4/src/test/resources/test.txt
rename to components/camel-netty/src/test/resources/test.txt
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
index 82d3508..89a2669 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
@@ -37,7 +37,7 @@ public interface NettyEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint consumers for the Netty4 component.
+     * Builder for endpoint consumers for the Netty component.
      */
     public interface NettyEndpointConsumerBuilder
             extends
@@ -847,7 +847,7 @@ public interface NettyEndpointBuilderFactory {
     }
 
     /**
-     * Advanced builder for endpoint consumers for the Netty4 component.
+     * Advanced builder for endpoint consumers for the Netty component.
      */
     public interface AdvancedNettyEndpointConsumerBuilder
             extends
@@ -1594,7 +1594,7 @@ public interface NettyEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint producers for the Netty4 component.
+     * Builder for endpoint producers for the Netty component.
      */
     public interface NettyEndpointProducerBuilder
             extends
@@ -2340,7 +2340,7 @@ public interface NettyEndpointBuilderFactory {
     }
 
     /**
-     * Advanced builder for endpoint producers for the Netty4 component.
+     * Advanced builder for endpoint producers for the Netty component.
      */
     public interface AdvancedNettyEndpointProducerBuilder
             extends
@@ -3051,7 +3051,7 @@ public interface NettyEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint for the Netty4 component.
+     * Builder for endpoint for the Netty component.
      */
     public interface NettyEndpointBuilder
             extends
@@ -3695,7 +3695,7 @@ public interface NettyEndpointBuilderFactory {
     }
 
     /**
-     * Advanced builder for endpoint for the Netty4 component.
+     * Advanced builder for endpoint for the Netty component.
      */
     public interface AdvancedNettyEndpointBuilder
             extends
@@ -4099,12 +4099,12 @@ public interface NettyEndpointBuilderFactory {
         NULL;
     }
     /**
-     * Netty4 (camel-netty4)
+     * Netty (camel-netty)
      * Socket level networking using TCP or UDP with the Netty 4.x library.
      * 
      * Category: networking,tcp,udp
      * Available as of version: 2.14
-     * Maven coordinates: org.apache.camel:camel-netty4
+     * Maven coordinates: org.apache.camel:camel-netty
      * 
      * Syntax: <code>netty:protocol:host:port</code>
      * 
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
index 232ef9b..cf843fd 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>components-starter</artifactId>
     <version>3.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-netty4-starter</artifactId>
+  <artifactId>camel-netty-starter</artifactId>
   <packaging>jar</packaging>
-  <name>Spring-Boot Starter :: Camel :: Netty4</name>
+  <name>Spring-Boot Starter :: Camel :: Netty</name>
   <description>Spring-Boot Starter for Camel Netty NIO based socket communication component</description>
   <dependencies>
     <dependency>
@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty4</artifactId>
+      <artifactId>camel-netty</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--START OF GENERATED CODE-->
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
index bbedeb7..96b55c7 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class NettyComponentAutoConfiguration {
 
     static class GroupConditions extends GroupCondition {
         public GroupConditions() {
-            super("camel.component", "camel.component.netty4");
+            super("camel.component", "camel.component.netty");
         }
     }
 
     @Lazy
-    @Bean({"netty-component", "netty4-component"})
+    @Bean(name = "netty-component")
     @ConditionalOnMissingBean(NettyComponent.class)
     public NettyComponent configureNettyComponent() throws Exception {
         NettyComponent component = new NettyComponent();
@@ -110,12 +110,12 @@ public class NettyComponentAutoConfiguration {
                         ? HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.netty4.customizer",
+                                "camel.component.netty.customizer",
                                 ((HasId) customizer).getId())
                         : HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.netty4.customizer");
+                                "camel.component.netty.customizer");
                 if (useCustomizer) {
                     LOGGER.debug("Configure component {}, with customizer {}",
                             component, customizer);
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
index 1e543ff..d42b078 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
@@ -41,13 +41,13 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.netty4")
+@ConfigurationProperties(prefix = "camel.component.netty")
 public class NettyComponentConfiguration
         extends
             ComponentConfigurationPropertiesCommon {
 
     /**
-     * Whether to enable auto configuration of the netty4 component. This is
+     * Whether to enable auto configuration of the netty component. This is
      * enabled by default.
      */
     private Boolean enabled;
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
index f0a9b6a..4c1bf9b 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
+
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.apache.camel.component.netty4.springboot.NettyComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
index af59282..8690e05 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-provides: camel-netty4
+provides: camel-netty
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 52c632e..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": true,
-      "name": "camel.component.netty4.enabled",
-      "description": "Enable netty4 component",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 9401240..4f60202 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -281,6 +281,7 @@
     <module>camel-mybatis-starter</module>
     <module>camel-nagios-starter</module>
     <module>camel-nats-starter</module>
+    <module>camel-netty-starter</module>
     <module>camel-netty4-http-starter</module>
     <module>camel-netty4-starter</module>
     <module>camel-nsq-starter</module>


Mime
View raw message