diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a2c8aea383bcf25376724cfc4be931928d337eda..29153affeed7f66a1a56707d385220da8c36f75b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -115,7 +115,7 @@ module OneM2M_Functions {
       if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.httpBindingDesc)) {
         v_binding_in := "HTTP";
       } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.coapBindingDesc)) {
-        v_binding_in := "HTTP";
+        v_binding_in := "COAP";
       } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.mqttBindingDesc)) {
         v_binding_in := "MQTT";
       } else {
@@ -149,7 +149,7 @@ module OneM2M_Functions {
         v_binding := "HTTP";
         v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
       } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
-        v_binding := "HTTP";
+        v_binding := "COAP";
         v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
       } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
         v_binding := "MQTT";
@@ -210,7 +210,7 @@ module OneM2M_Functions {
       if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
         v_binding_in := "HTTP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
-        v_binding_in := "HTTP";
+        v_binding_in := "COAP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
         v_binding_in := "MQTT";
       } else {
@@ -267,7 +267,7 @@ module OneM2M_Functions {
       if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
         v_binding_in := "HTTP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
-        v_binding_in := "HTTP";
+        v_binding_in := "COAP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
         v_binding_in := "MQTT";
       } else {
@@ -309,7 +309,7 @@ module OneM2M_Functions {
 			  v_binding := "HTTP";
 			  v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
 			} else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
-			  v_binding := "HTTP";
+			  v_binding := "COAP";
 			  v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
 			} else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
 			  v_binding := "MQTT";
@@ -360,7 +360,7 @@ module OneM2M_Functions {
 			  v_binding := "HTTP";
 			  v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
 			} else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) {
-			  v_binding := "HTTP";
+			  v_binding := "COAP";
 			  v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
 			} else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) {
 			  v_binding := "MQTT";
@@ -422,7 +422,7 @@ module OneM2M_Functions {
       if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
         v_binding_in := "HTTP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
-        v_binding_in := "HTTP";
+        v_binding_in := "COAP";
       } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
         v_binding_in := "MQTT";
       } else {