File names and module names synced
diff --git a/src/Mqtt_v3.1.1_EncDec.cc b/src/MQTT_v3_1_1_EncDec.cc
similarity index 100%
rename from src/Mqtt_v3.1.1_EncDec.cc
rename to src/MQTT_v3_1_1_EncDec.cc
diff --git a/src/Mqtt_v3_1_1_IPL4SizeFunction.ttcn b/src/MQTT_v3_1_1_IPL4SizeFunction.ttcn
similarity index 95%
rename from src/Mqtt_v3_1_1_IPL4SizeFunction.ttcn
rename to src/MQTT_v3_1_1_IPL4SizeFunction.ttcn
index 243ebaa..0984353 100644
--- a/src/Mqtt_v3_1_1_IPL4SizeFunction.ttcn
+++ b/src/MQTT_v3_1_1_IPL4SizeFunction.ttcn
@@ -17,7 +17,7 @@
 // f_IPL4_setGetMsgLen(IPL4_port,connectionId, getMsg_Func, {});      *
 //*********************************************************************
 
-module Mqtt_v3_1_1_IPL4SizeFunction{
+module MQTT_v3_1_1_IPL4SizeFunction{
 
 
 import from Socket_API_Definitions all;
@@ -30,7 +30,7 @@
 
 
 //*************************************************************************
-function f_GetMsgLengthMQTT(  in octetstring stream,   inout ro_integer args) return integer
+function f_GetMsgLengthMQTT(  in octetstring stream,   inout ro_integer args ) return integer
 //*************************************************************************
 
 {
diff --git a/src/Mqtt_v3.1.1_Size.cc b/src/MQTT_v3_1_1_Size.cc
similarity index 93%
rename from src/Mqtt_v3.1.1_Size.cc
rename to src/MQTT_v3_1_1_Size.cc
index 6ebcba5..ffff3b9 100644
--- a/src/Mqtt_v3.1.1_Size.cc
+++ b/src/MQTT_v3_1_1_Size.cc
@@ -9,10 +9,10 @@
 *  Spaseski Naum - initial implementation
 ******************************************************************************/
 
-#include "Mqtt_v3_1_1_IPL4SizeFunction.hh"
+#include "MQTT_v3_1_1_IPL4SizeFunction.hh"
 
 
-namespace Mqtt__v3__1__1__IPL4SizeFunction {
+namespace MQTT__v3__1__1__IPL4SizeFunction {
 
 INTEGER f__calc__MQTT__length(const OCTETSTRING& data){
     
diff --git a/src/Mqtt_v3.1.1_Types.ttcn b/src/MQTT_v3_1_1_Types.ttcn
similarity index 100%
rename from src/Mqtt_v3.1.1_Types.ttcn
rename to src/MQTT_v3_1_1_Types.ttcn
diff --git a/src/negative_testing/Mqtt_v3.1.1_EncDec.cc b/src/negative_testing/MQTT_v3_1_1_EncDec.cc
similarity index 100%
rename from src/negative_testing/Mqtt_v3.1.1_EncDec.cc
rename to src/negative_testing/MQTT_v3_1_1_EncDec.cc
diff --git a/src/negative_testing/Mqtt_v3_1_1_IPL4SizeFunction.ttcn b/src/negative_testing/MQTT_v3_1_1_IPL4SizeFunction.ttcn
similarity index 89%
rename from src/negative_testing/Mqtt_v3_1_1_IPL4SizeFunction.ttcn
rename to src/negative_testing/MQTT_v3_1_1_IPL4SizeFunction.ttcn
index dae630a..1ce63fa 100644
--- a/src/negative_testing/Mqtt_v3_1_1_IPL4SizeFunction.ttcn
+++ b/src/negative_testing/MQTT_v3_1_1_IPL4SizeFunction.ttcn
@@ -18,10 +18,10 @@
 // f_IPL4_setGetMsgLen(IPL4_port,connectionId, getMsg_Func, {});      *
 //*********************************************************************
 
-module Mqtt_v3_1_1_IPL4SizeFunction{
+module MQTT_v3_1_1_IPL4SizeFunction {
 
 
-import from Socket_API_Definitions all;
+//import from Socket_API_Definitions all;
 
 //-----------------------------------------------------------------------------
 //External functions
@@ -31,7 +31,7 @@
 
 
 //*************************************************************************
-function f_GetMsgLengthMQTT(  in octetstring stream,   inout ro_integer args) return integer
+function f_GetMsgLengthMQTT(  in octetstring stream) return integer
 //*************************************************************************
 
 {
diff --git a/src/negative_testing/Mqtt_v3.1.1_Size.cc b/src/negative_testing/MQTT_v3_1_1_Size.cc
similarity index 93%
rename from src/negative_testing/Mqtt_v3.1.1_Size.cc
rename to src/negative_testing/MQTT_v3_1_1_Size.cc
index 6c53de3..6ccc6f8 100644
--- a/src/negative_testing/Mqtt_v3.1.1_Size.cc
+++ b/src/negative_testing/MQTT_v3_1_1_Size.cc
@@ -10,10 +10,10 @@
 *  Bence Janos Szabo - negative testing branch 
 ******************************************************************************/
 
-#include "Mqtt_v3_1_1_IPL4SizeFunction.hh"
+#include "MQTT_v3_1_1_IPL4SizeFunction.hh"
 
 
-namespace Mqtt__v3__1__1__IPL4SizeFunction {
+namespace MQTT__v3__1__1__IPL4SizeFunction {
 
 INTEGER f__calc__MQTT__length(const OCTETSTRING& data){
     
diff --git a/src/negative_testing/Mqtt_v3.1.1_Types.ttcn b/src/negative_testing/MQTT_v3_1_1_Types.ttcn
similarity index 100%
rename from src/negative_testing/Mqtt_v3.1.1_Types.ttcn
rename to src/negative_testing/MQTT_v3_1_1_Types.ttcn