diff --git a/ragconnect.base/src/main/resources/JavaHandler.jadd b/ragconnect.base/src/main/resources/JavaHandler.jadd
index 44ac211cb02c8a6a7ab1b49f9898ff9334f61bef..217ae63bce14a4cfe64e97aa3d5212fc82d783cb 100644
--- a/ragconnect.base/src/main/resources/JavaHandler.jadd
+++ b/ragconnect.base/src/main/resources/JavaHandler.jadd
@@ -14,7 +14,7 @@ aspect JavaHandler {
 
         public static JavaHandler JAVA_HANDLER_INSTANCE = null;
 
-        private final org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger(avaHandler.class);
+        private final org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger(JavaHandler.class);
 
         private Map<String, List<Consumer<byte[]>>> callbackList = new ConcurrentHashMap<>();
 
diff --git a/ragconnect.base/src/main/resources/receiveDefinition.mustache b/ragconnect.base/src/main/resources/receiveDefinition.mustache
index 4abe2cbcffbb385fa340f2619c426e9bbd45ee0f..86523f5c74a03f009c98ae5abb796af42e1823af 100644
--- a/ragconnect.base/src/main/resources/receiveDefinition.mustache
+++ b/ragconnect.base/src/main/resources/receiveDefinition.mustache
@@ -15,7 +15,7 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam
     case "mqtt": return {{javaHandlerAttribute}}().registerCallback(uri, consumer);
   {{/usesJava}}
   {{#usesRest}}
-    case "rest": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
+    case "java": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
       consumer.accept(input.getBytes());
     });
   {{/usesRest}}
diff --git a/ragconnect.base/src/main/resources/sendDefinition.mustache b/ragconnect.base/src/main/resources/sendDefinition.mustache
index 56fde1d63b2620763f570c7f4e1dcb7e6e2003f3..a91371020903b8f146bb3453d39abec877855e6a 100644
--- a/ragconnect.base/src/main/resources/sendDefinition.mustache
+++ b/ragconnect.base/src/main/resources/sendDefinition.mustache
@@ -21,8 +21,8 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam
       break;
   {{/usesMqtt}}
   {{#usesJava}}
-      case "mqtt":
-      final MqttHandler handler = {{javaHandlerAttribute}}().resolveHandler(uri);
+      case "java":
+      final JavaHandler handler = {{javaHandlerAttribute}}().resolveHandler(uri);
       final String topic = {{javaHandlerAttribute}}().extractTopic(uri);
       {{sender}} = () -> {
         {{#loggingEnabledForWrites}}