diff --git a/release/experimental/vcits/exceptions/DecodingException.h b/release/experimental/vcits/exceptions/DecodingException.h
index 12ceebc..247703b 100644
--- a/release/experimental/vcits/exceptions/DecodingException.h
+++ b/release/experimental/vcits/exceptions/DecodingException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_DECODINGEXCEPTION_H
-#define V2X_LIBRARY_DECODINGEXCEPTION_H
+#ifndef VC_ITS_DECODINGEXCEPTION_H
+#define VC_ITS_DECODINGEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class DecodingException : public std::runtime_error
     DecodingException(size_t consumed) : std::runtime_error(std::string("Broken encoding at byte: " + std::to_string(consumed))) { };
 };
 
-#endif //V2X_LIBRARY_DECODINGEXCEPTION_H
+#endif //VC_ITS_DECODINGEXCEPTION_H
diff --git a/release/experimental/vcits/exceptions/EncodingException.h b/release/experimental/vcits/exceptions/EncodingException.h
index 3d150dd..cfc55e6 100644
--- a/release/experimental/vcits/exceptions/EncodingException.h
+++ b/release/experimental/vcits/exceptions/EncodingException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_ENCODINGEXCEPTION_H
-#define V2X_LIBRARY_ENCODINGEXCEPTION_H
+#ifndef VC_ITS_ENCODINGEXCEPTION_H
+#define VC_ITS_ENCODINGEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class EncodingException : public std::runtime_error
     EncodingException() : std::runtime_error("Encoding failed: values may be out of range") { };
 };
 
-#endif //V2X_LIBRARY_ENCODINGEXCEPTION_H
+#endif //VC_ITS_ENCODINGEXCEPTION_H
diff --git a/release/experimental/vcits/exceptions/V2XLibExceptions.h b/release/experimental/vcits/exceptions/V2XLibExceptions.h
index 613ee7c..c1c6b51 100644
--- a/release/experimental/vcits/exceptions/V2XLibExceptions.h
+++ b/release/experimental/vcits/exceptions/V2XLibExceptions.h
@@ -5,20 +5,20 @@
 // Single header, to include all V2X library exceptions
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Library"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_V2XLIBEXCEPTIONS_H
-#define V2X_LIBRARY_V2XLIBEXCEPTIONS_H
+#ifndef VC_ITS_V2XLIBEXCEPTIONS_H
+#define VC_ITS_V2XLIBEXCEPTIONS_H
 
 #pragma once
 
@@ -26,4 +26,4 @@
 #include "EncodingException.h"
 #include "ValidateConstraintsException.h"
 
-#endif //V2X_LIBRARY_V2XLIBEXCEPTIONS_H
+#endif //VC_ITS_V2XLIBEXCEPTIONS_H
diff --git a/release/experimental/vcits/exceptions/ValidateConstraintsException.h b/release/experimental/vcits/exceptions/ValidateConstraintsException.h
index 3e0859b..099878b 100644
--- a/release/experimental/vcits/exceptions/ValidateConstraintsException.h
+++ b/release/experimental/vcits/exceptions/ValidateConstraintsException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
-#define V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
+#ifndef VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
+#define VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class ValidateConstraintsException : public std::logic_error
     ValidateConstraintsException() : std::logic_error("Validation failed: parameters may be defined wrong") { };
 };
 
-#endif //V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
+#endif //VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
diff --git a/release/experimental/vcits/parser/Decoder.h b/release/experimental/vcits/parser/Decoder.h
index c916aa7..844d446 100644
--- a/release/experimental/vcits/parser/Decoder.h
+++ b/release/experimental/vcits/parser/Decoder.h
@@ -1,13 +1,25 @@
 //
 // Created by christophpilz on 19.05.2021.
 //
+// Description:
+// Decoder Wrapper for C++
+//
+// Author(s): "Christoph Pilz"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
+// Credits: ["Thispointer.com"]
+// License: "BSD 3-Clause"
+// Version: "1.0"
+// Maintainer: "Christoph Pilz"
+// E-Mail: "christoph.pilz@v2c2.at"
+// Status = "Production"
+//
 // Possible Improvements:
-// - have a decode method without type descriptor -> automatically find out which type of message it is and decode the right one
-// - refactor C++ style
+// - [] have a decode method without type descriptor -> automatically find out which type of message it is and decode the right one
+// - [] refactor C++ style
 //
 
-#ifndef VIF_ITS_LIB_DECODER_H
-#define VIF_ITS_LIB_DECODER_H
+#ifndef VC_ITS_LIB_DECODER_H
+#define VC_ITS_LIB_DECODER_H
 
 extern "C" {
 #include "asn_application.h"
@@ -27,4 +39,4 @@ class Decoder {
 };
 
 
-#endif //VIF_ITS_LIB_DECODER_H
+#endif //VC_ITS_LIB_DECODER_H
diff --git a/release/experimental/vcits/parser/Encoder.h b/release/experimental/vcits/parser/Encoder.h
index 83ccf22..a0b0acd 100644
--- a/release/experimental/vcits/parser/Encoder.h
+++ b/release/experimental/vcits/parser/Encoder.h
@@ -1,12 +1,24 @@
 //
 // Created by christophpilz on 19.05.2021.
 //
+// Description:
+// Decoder Wrapper for C++
+//
+// Author(s): "Christoph Pilz"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
+// Credits: ["Thispointer.com"]
+// License: "BSD 3-Clause"
+// Version: "1.0"
+// Maintainer: "Christoph Pilz"
+// E-Mail: "christoph.pilz@v2c2.at"
+// Status = "Production"
+//
 // Possible Improvements:
-// - refactor C++ style
+// - [] refactor C++ style
 //
 
-#ifndef VIF_ITS_LIB_ENCODER_H
-#define VIF_ITS_LIB_ENCODER_H
+#ifndef VC_ITS_LIB_ENCODER_H
+#define VC_ITS_LIB_ENCODER_H
 
 extern "C" {
 #include "asn_application.h"
@@ -34,4 +46,4 @@ class Encoder {
 };
 
 
-#endif //VIF_ITS_LIB_ENCODER_H
+#endif //VC_ITS_LIB_ENCODER_H
diff --git a/release/standard/vcits/exceptions/DecodingException.h b/release/standard/vcits/exceptions/DecodingException.h
index 12ceebc..247703b 100644
--- a/release/standard/vcits/exceptions/DecodingException.h
+++ b/release/standard/vcits/exceptions/DecodingException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_DECODINGEXCEPTION_H
-#define V2X_LIBRARY_DECODINGEXCEPTION_H
+#ifndef VC_ITS_DECODINGEXCEPTION_H
+#define VC_ITS_DECODINGEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class DecodingException : public std::runtime_error
     DecodingException(size_t consumed) : std::runtime_error(std::string("Broken encoding at byte: " + std::to_string(consumed))) { };
 };
 
-#endif //V2X_LIBRARY_DECODINGEXCEPTION_H
+#endif //VC_ITS_DECODINGEXCEPTION_H
diff --git a/release/standard/vcits/exceptions/EncodingException.h b/release/standard/vcits/exceptions/EncodingException.h
index 3d150dd..cfc55e6 100644
--- a/release/standard/vcits/exceptions/EncodingException.h
+++ b/release/standard/vcits/exceptions/EncodingException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_ENCODINGEXCEPTION_H
-#define V2X_LIBRARY_ENCODINGEXCEPTION_H
+#ifndef VC_ITS_ENCODINGEXCEPTION_H
+#define VC_ITS_ENCODINGEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class EncodingException : public std::runtime_error
     EncodingException() : std::runtime_error("Encoding failed: values may be out of range") { };
 };
 
-#endif //V2X_LIBRARY_ENCODINGEXCEPTION_H
+#endif //VC_ITS_ENCODINGEXCEPTION_H
diff --git a/release/standard/vcits/exceptions/V2XLibExceptions.h b/release/standard/vcits/exceptions/V2XLibExceptions.h
index 613ee7c..c1c6b51 100644
--- a/release/standard/vcits/exceptions/V2XLibExceptions.h
+++ b/release/standard/vcits/exceptions/V2XLibExceptions.h
@@ -5,20 +5,20 @@
 // Single header, to include all V2X library exceptions
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Library"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_V2XLIBEXCEPTIONS_H
-#define V2X_LIBRARY_V2XLIBEXCEPTIONS_H
+#ifndef VC_ITS_V2XLIBEXCEPTIONS_H
+#define VC_ITS_V2XLIBEXCEPTIONS_H
 
 #pragma once
 
@@ -26,4 +26,4 @@
 #include "EncodingException.h"
 #include "ValidateConstraintsException.h"
 
-#endif //V2X_LIBRARY_V2XLIBEXCEPTIONS_H
+#endif //VC_ITS_V2XLIBEXCEPTIONS_H
diff --git a/release/standard/vcits/exceptions/ValidateConstraintsException.h b/release/standard/vcits/exceptions/ValidateConstraintsException.h
index 3e0859b..099878b 100644
--- a/release/standard/vcits/exceptions/ValidateConstraintsException.h
+++ b/release/standard/vcits/exceptions/ValidateConstraintsException.h
@@ -5,20 +5,20 @@
 // Exception, if something is not yet implemented
 //
 // Author(s): "Christoph Pilz"
-// Copyright: "Copyright 2021, VIF V2X Platform"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
 // Credits: ["Thispointer.com"]
-// License: "TBD"
-// Version: "TBD"
+// License: "BSD 3-Clause"
+// Version: "1.0"
 // Maintainer: "Christoph Pilz"
 // E-Mail: "christoph.pilz@v2c2.at"
 // Status = "Production"
 //
 // Possible Improvements:
-// [] License
+// - [ ]
 //
 
-#ifndef V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
-#define V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
+#ifndef VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
+#define VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
 
 #pragma once
 
@@ -30,4 +30,4 @@ class ValidateConstraintsException : public std::logic_error
     ValidateConstraintsException() : std::logic_error("Validation failed: parameters may be defined wrong") { };
 };
 
-#endif //V2X_LIBRARY_VALIDATECONSTRAINTSEXCEPTION_H
+#endif //VC_ITS_VALIDATECONSTRAINTSEXCEPTION_H
diff --git a/release/standard/vcits/parser/Decoder.h b/release/standard/vcits/parser/Decoder.h
index c916aa7..844d446 100644
--- a/release/standard/vcits/parser/Decoder.h
+++ b/release/standard/vcits/parser/Decoder.h
@@ -1,13 +1,25 @@
 //
 // Created by christophpilz on 19.05.2021.
 //
+// Description:
+// Decoder Wrapper for C++
+//
+// Author(s): "Christoph Pilz"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
+// Credits: ["Thispointer.com"]
+// License: "BSD 3-Clause"
+// Version: "1.0"
+// Maintainer: "Christoph Pilz"
+// E-Mail: "christoph.pilz@v2c2.at"
+// Status = "Production"
+//
 // Possible Improvements:
-// - have a decode method without type descriptor -> automatically find out which type of message it is and decode the right one
-// - refactor C++ style
+// - [] have a decode method without type descriptor -> automatically find out which type of message it is and decode the right one
+// - [] refactor C++ style
 //
 
-#ifndef VIF_ITS_LIB_DECODER_H
-#define VIF_ITS_LIB_DECODER_H
+#ifndef VC_ITS_LIB_DECODER_H
+#define VC_ITS_LIB_DECODER_H
 
 extern "C" {
 #include "asn_application.h"
@@ -27,4 +39,4 @@ class Decoder {
 };
 
 
-#endif //VIF_ITS_LIB_DECODER_H
+#endif //VC_ITS_LIB_DECODER_H
diff --git a/release/standard/vcits/parser/Encoder.h b/release/standard/vcits/parser/Encoder.h
index 83ccf22..a0b0acd 100644
--- a/release/standard/vcits/parser/Encoder.h
+++ b/release/standard/vcits/parser/Encoder.h
@@ -1,12 +1,24 @@
 //
 // Created by christophpilz on 19.05.2021.
 //
+// Description:
+// Decoder Wrapper for C++
+//
+// Author(s): "Christoph Pilz"
+// Copyright: "Copyright 2023, vehicleCAPTAIN toolbox"
+// Credits: ["Thispointer.com"]
+// License: "BSD 3-Clause"
+// Version: "1.0"
+// Maintainer: "Christoph Pilz"
+// E-Mail: "christoph.pilz@v2c2.at"
+// Status = "Production"
+//
 // Possible Improvements:
-// - refactor C++ style
+// - [] refactor C++ style
 //
 
-#ifndef VIF_ITS_LIB_ENCODER_H
-#define VIF_ITS_LIB_ENCODER_H
+#ifndef VC_ITS_LIB_ENCODER_H
+#define VC_ITS_LIB_ENCODER_H
 
 extern "C" {
 #include "asn_application.h"
@@ -34,4 +46,4 @@ class Encoder {
 };
 
 
-#endif //VIF_ITS_LIB_ENCODER_H
+#endif //VC_ITS_LIB_ENCODER_H