CommonAPI-D-Bus 3.1.53.1.5

142 files changed, 1427 insertions, 526 deletions

diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
index 5d19435..9f4fc7e 100644
--- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
+++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -14,14 +14,6 @@ namespace commonapi {
 namespace tests {
 
 
-bool DerivedTypeCollection::TestStructExtended::operator==(const DerivedTypeCollection::TestStructExtended& _other) const {
-	return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2());
-}
-
-
-bool DerivedTypeCollection::TestStruct::operator==(const DerivedTypeCollection::TestStruct& _other) const {
-	return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
-}
 
 std::shared_ptr<DerivedTypeCollection::TestPolymorphicStruct> DerivedTypeCollection::TestPolymorphicStruct::create(CommonAPI::Serial _serial) {
 	switch (_serial) {
@@ -35,24 +27,8 @@ std::shared_ptr<DerivedTypeCollection::TestPolymorphicStruct> DerivedTypeCollect
 	return std::shared_ptr<DerivedTypeCollection::TestPolymorphicStruct>();
 }
 
-bool DerivedTypeCollection::TestPolymorphicStruct::operator==(const DerivedTypeCollection::TestPolymorphicStruct& _other) const {
-	return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
-}
-
-
-bool DerivedTypeCollection::TestExtendedPolymorphicStruct::operator==(const DerivedTypeCollection::TestExtendedPolymorphicStruct& _other) const {
-	return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getAdditionalValue() == _other.getAdditionalValue());
-}
-
-
-bool DerivedTypeCollection::StructWithPolymorphicMember::operator==(const DerivedTypeCollection::StructWithPolymorphicMember& _other) const {
-	return (getNumberValue() == _other.getNumberValue() && getPolymorphicMember() == _other.getPolymorphicMember());
-}
 
 
-bool DerivedTypeCollection::StructWithEnumKeyMap::operator==(const DerivedTypeCollection::StructWithEnumKeyMap& _other) const {
-	return (getTestMap() == _other.getTestMap());
-}
 
 
 } // namespace tests
diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
index 201d486..3a8ade3 100644
--- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
+++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -52,7 +52,9 @@ struct DerivedTypeCollection {
     	 */
     	inline const uint16_t &getUintValue() const { return std::get<1>(values_); }
     	inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; }
-    	bool operator==(const TestStruct &_other) const;
+    	inline bool operator==(const TestStruct& _other) const {
+                return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
+        }
     	inline bool operator!=(const TestStruct &_other) const {
     		return !((*this) == _other);
     	}
@@ -69,19 +71,17 @@ struct DerivedTypeCollection {
             E_NOT_USED = 3
         };
         
-        TestEnum()
+        TestEnum() 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E_UNKNOWN)) {}
-        TestEnum(const Literal &_value) 
-            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
-        TestEnum(const int32_t &_value) 
-            : CommonAPI::Enumeration<int32_t>(_value) {}
+        TestEnum(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::E_UNKNOWN):
-            case static_cast<int32_t>(Literal::E_OK):
-            case static_cast<int32_t>(Literal::E_OUT_OF_RANGE):
-            case static_cast<int32_t>(Literal::E_NOT_USED):
+                case static_cast<int32_t>(Literal::E_UNKNOWN):
+                case static_cast<int32_t>(Literal::E_OK):
+                case static_cast<int32_t>(Literal::E_OUT_OF_RANGE):
+                case static_cast<int32_t>(Literal::E_NOT_USED):
                 return true;
             default:
                 return false;
@@ -103,19 +103,19 @@ struct DerivedTypeCollection {
         inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
     };
     
-    struct TestEnumExtended : TestEnum {
+    struct TestEnumExtended : CommonAPI::Enumeration<int32_t> {
         enum Literal : int32_t {
+            E_UNKNOWN = 0,
+            E_OK = 1,
+            E_OUT_OF_RANGE = 2,
+            E_NOT_USED = 3,
             E_NEW = 4
         };
         
-        TestEnumExtended()
-            : TestEnum(static_cast<TestEnum::Literal>(Literal::E_NEW)) {}
-        TestEnumExtended(const Literal &_value) 
-            : TestEnum(static_cast<int32_t>(_value)) {}
-        TestEnumExtended(const int32_t &_value) 
-            : TestEnum(_value) {}
-        TestEnumExtended(const TestEnum::Literal &_value)
-            : TestEnum(_value) {}
+        TestEnumExtended() 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E_UNKNOWN)) {}
+        TestEnumExtended(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
         TestEnumExtended &operator=(const TestEnum::Literal &_value) {
             value_ = static_cast<int32_t>(_value);
             return (*this);
@@ -123,10 +123,14 @@ struct DerivedTypeCollection {
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::E_NEW):
+                case static_cast<int32_t>(Literal::E_UNKNOWN):
+                case static_cast<int32_t>(Literal::E_OK):
+                case static_cast<int32_t>(Literal::E_OUT_OF_RANGE):
+                case static_cast<int32_t>(Literal::E_NOT_USED):
+                case static_cast<int32_t>(Literal::E_NEW):
                 return true;
             default:
-                return TestEnum::validate();
+                return false;
             }
         }
     
@@ -145,36 +149,40 @@ struct DerivedTypeCollection {
         inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
     };
     
-    struct TestEnumExtended2 : TestEnumExtended {
+    struct TestEnumExtended2 : CommonAPI::Enumeration<int32_t> {
         enum Literal : int32_t {
+            E_UNKNOWN = 0,
+            E_OK = 1,
+            E_OUT_OF_RANGE = 2,
+            E_NOT_USED = 3,
+            E_NEW = 4,
             E_NEW2 = 5
         };
         
-        TestEnumExtended2()
-            : TestEnumExtended(static_cast<TestEnumExtended::Literal>(Literal::E_NEW2)) {}
-        TestEnumExtended2(const Literal &_value) 
-            : TestEnumExtended(static_cast<int32_t>(_value)) {}
-        TestEnumExtended2(const int32_t &_value) 
-            : TestEnumExtended(_value) {}
-        TestEnumExtended2(const TestEnum::Literal &_value)
-            : TestEnumExtended(_value) {}
-        TestEnumExtended2(const TestEnumExtended::Literal &_value)
-            : TestEnumExtended(_value) {}
+        TestEnumExtended2() 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E_UNKNOWN)) {}
+        TestEnumExtended2(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
         TestEnumExtended2 &operator=(const TestEnumExtended::Literal &_value) {
             value_ = static_cast<int32_t>(_value);
             return (*this);
         }
-        TestEnumExtended &operator=(const TestEnum::Literal &_value) {
+        TestEnumExtended2 &operator=(const TestEnum::Literal &_value) {
             value_ = static_cast<int32_t>(_value);
             return (*this);
         }
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::E_NEW2):
+                case static_cast<int32_t>(Literal::E_UNKNOWN):
+                case static_cast<int32_t>(Literal::E_OK):
+                case static_cast<int32_t>(Literal::E_OUT_OF_RANGE):
+                case static_cast<int32_t>(Literal::E_NOT_USED):
+                case static_cast<int32_t>(Literal::E_NEW):
+                case static_cast<int32_t>(Literal::E_NEW2):
                 return true;
             default:
-                return TestEnumExtended::validate();
+                return false;
             }
         }
     
@@ -214,7 +222,9 @@ struct DerivedTypeCollection {
     	inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; }
     	inline const TestEnumExtended2 &getTestEnumExtended2() const { return std::get<2>(values_); }
     	inline void setTestEnumExtended2(const TestEnumExtended2 &_value) { std::get<2>(values_) = _value; }
-    	bool operator==(const TestStructExtended &_other) const;
+    	inline bool operator==(const TestStructExtended& _other) const {
+                return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2());
+        }
     	inline bool operator!=(const TestStructExtended &_other) const {
     		return !((*this) == _other);
     	}
@@ -229,18 +239,16 @@ struct DerivedTypeCollection {
             E3 = 2
         };
         
-        TestEnumMissingValue()
+        TestEnumMissingValue() 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E1)) {}
-        TestEnumMissingValue(const Literal &_value) 
-            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
-        TestEnumMissingValue(const int32_t &_value) 
-            : CommonAPI::Enumeration<int32_t>(_value) {}
+        TestEnumMissingValue(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::E1):
-            case static_cast<int32_t>(Literal::E2):
-            case static_cast<int32_t>(Literal::E3):
+                case static_cast<int32_t>(Literal::E1):
+                case static_cast<int32_t>(Literal::E2):
+                case static_cast<int32_t>(Literal::E3):
                 return true;
             default:
                 return false;
@@ -363,7 +371,9 @@ struct DerivedTypeCollection {
     	inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; }
     	
     	std::tuple<::commonapi::tests::PredefinedTypeCollection::TestString, uint16_t> values_;
-    	bool operator==(const TestPolymorphicStruct &_other) const;
+    	inline bool operator==(const TestPolymorphicStruct& _other) const {
+                return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
+        }
     	inline bool operator!=(const TestPolymorphicStruct &_other) const {
     		return !((*this) == _other);
     	}
@@ -412,7 +422,9 @@ struct DerivedTypeCollection {
     	inline void setAdditionalValue(const uint32_t &_value) { std::get<0>(values_) = _value; }
     	
     	std::tuple<uint32_t> values_;
-    	bool operator==(const TestExtendedPolymorphicStruct &_other) const;
+    	inline bool operator==(const TestExtendedPolymorphicStruct& _other) const {
+                return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getAdditionalValue() == _other.getAdditionalValue());
+        }
     	inline bool operator!=(const TestExtendedPolymorphicStruct &_other) const {
     		return !((*this) == _other);
     	}
@@ -432,7 +444,9 @@ struct DerivedTypeCollection {
     	inline void setNumberValue(const uint32_t &_value) { std::get<0>(values_) = _value; }
     	inline const std::shared_ptr<TestPolymorphicStruct> &getPolymorphicMember() const { return std::get<1>(values_); }
     	inline void setPolymorphicMember(const std::shared_ptr<TestPolymorphicStruct> &_value) { std::get<1>(values_) = _value; }
-    	bool operator==(const StructWithPolymorphicMember &_other) const;
+    	inline bool operator==(const StructWithPolymorphicMember& _other) const {
+                return (getNumberValue() == _other.getNumberValue() && getPolymorphicMember() == _other.getPolymorphicMember());
+        }
     	inline bool operator!=(const StructWithPolymorphicMember &_other) const {
     		return !((*this) == _other);
     	}
@@ -448,7 +462,9 @@ struct DerivedTypeCollection {
     	}
     	inline const TestEnumMap &getTestMap() const { return std::get<0>(values_); }
     	inline void setTestMap(const TestEnumMap &_value) { std::get<0>(values_) = _value; }
-    	bool operator==(const StructWithEnumKeyMap &_other) const;
+    	inline bool operator==(const StructWithEnumKeyMap& _other) const {
+                return (getTestMap() == _other.getTestMap());
+        }
     	inline bool operator!=(const StructWithEnumKeyMap &_other) const {
     		return !((*this) == _other);
     	}
diff --git a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
index beb2ed8..3a98d9b 100644
--- a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
+++ b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp
index 2c47dda..2f401f1 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
-#define COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
 
 
 
@@ -55,4 +55,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp
index daebf8c..077c236 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
 
@@ -158,4 +158,4 @@ CommonAPI::InterfaceVersionAttribute& ExtendedInterfaceProxy<_AttributeExtension
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp
index 3dfb547..9a3080f 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/ExtendedInterface.hpp>
 #include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
@@ -51,4 +51,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp
index 7618ad1..432640f 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -109,4 +109,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp
index 6f9de13..f3bc8ac 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp
index 3f36ee3..d353919 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceStubDefault.hpp>
 
@@ -68,4 +68,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp
index 4383045..5ce8a0e 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
-#define COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
 
 
 
@@ -55,4 +55,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
index de0af83..edc78ab 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
 
@@ -170,4 +170,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopDerive
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
index 65f35f8..d1496e4 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
 #include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
@@ -48,4 +48,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
index 54e7c1c..4f2f3fe 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -113,4 +113,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
index 0e72205..255ad8b 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
index 02cacc6..63d7b42 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
 
@@ -79,4 +79,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp
index 9d726d3..801533d 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
-#define COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
 
 
 
@@ -53,4 +53,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
index 08b45ac..e1dc664 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
 
@@ -251,4 +251,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopInterf
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
index a4efed7..fec0ce3 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopInterface.hpp>
 
@@ -56,4 +56,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp
index 9af7df6..c354509 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -132,4 +132,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
index e06ecaa..4dd9cda 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
index d81fb94..ba97beb 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
@@ -108,4 +108,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp
index ab6a78b..2177ee6 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_TEST_INTERFACE_HPP_
-#define COMMONAPI_TESTS_TEST_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_
 
 
 
@@ -53,4 +53,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_TEST_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp
index 792309c..53e2afb 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
-#define COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
+#ifndef V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
+#define V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
 
 
 #include <set>
@@ -54,4 +54,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
+#endif // V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp
index d302418..41cbd78 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp>
 
@@ -128,4 +128,4 @@ CommonAPI::ProxyManager& TestInterfaceManagerProxy<_AttributeExtensions...>::get
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp
index 29740a5..5a0e67f 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceManager.hpp>
 
@@ -47,4 +47,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp
index 7b341f8..640df57 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
 
 #include <functional>
 
@@ -108,4 +108,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp
index 57442e0..0241f20 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp
index 1dfb361..67f21e8 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/TestInterfaceManagerStub.hpp>
@@ -70,4 +70,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp
index f22aea7..82b94ce 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
 
@@ -524,4 +524,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestInterfaceProxy,
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp
index f719377..5c6f74e 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/TestInterface.hpp>
 
@@ -99,4 +99,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp
index 0330129..dcf9441 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_Test_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -213,4 +213,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp
index ebb5b5e..f669169 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp
index a5ddbb3..215345d 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/TestInterfaceStub.hpp>
@@ -123,4 +123,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp
deleted file mode 100644
index 46bfa98..0000000
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include "BranchInterface.hpp"
-
-namespace v1 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp
index 4b95f46..3381172 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
-#define COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
 
 
 
@@ -41,17 +41,15 @@ public:
             NOTOK = 1
         };
         
-        testBranchMethodError()
+        testBranchMethodError() 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
-        testBranchMethodError(const Literal &_value) 
-            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
-        testBranchMethodError(const int32_t &_value) 
-            : CommonAPI::Enumeration<int32_t>(_value) {}
+        testBranchMethodError(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::OK):
-            case static_cast<int32_t>(Literal::NOTOK):
+                case static_cast<int32_t>(Literal::OK):
+                case static_cast<int32_t>(Literal::NOTOK):
                 return true;
             default:
                 return false;
@@ -95,4 +93,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp
index a8a4f49..bdd01f3 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
 
@@ -155,4 +155,4 @@ CommonAPI::InterfaceVersionAttribute& BranchInterfaceProxy<_AttributeExtensions.
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
index de4d3ef..72507e9 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/managed/BranchInterface.hpp>
 
@@ -52,4 +52,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp
index b2cd06b..2122252 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -107,4 +107,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
index d8e59bd..669bd1d 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
index 5e494f0..4913639 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
@@ -68,4 +68,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp
deleted file mode 100644
index 285a8d6..0000000
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include "LeafInterface.hpp"
-
-namespace v1 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp
index a8332b4..f27f3e7 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
-#define COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
 
 
 
@@ -41,17 +41,15 @@ public:
             NOTOK = 1
         };
         
-        testLeafMethodError()
+        testLeafMethodError() 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
-        testLeafMethodError(const Literal &_value) 
-            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
-        testLeafMethodError(const int32_t &_value) 
-            : CommonAPI::Enumeration<int32_t>(_value) {}
+        testLeafMethodError(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::OK):
-            case static_cast<int32_t>(Literal::NOTOK):
+                case static_cast<int32_t>(Literal::OK):
+                case static_cast<int32_t>(Literal::NOTOK):
                 return true;
             default:
                 return false;
@@ -95,4 +93,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp
index 852a916..cce9ffa 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
 
@@ -155,4 +155,4 @@ CommonAPI::InterfaceVersionAttribute& LeafInterfaceProxy<_AttributeExtensions...
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
index bd4c9ff..752d4aa 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/managed/LeafInterface.hpp>
 
@@ -52,4 +52,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp
index 43b58f9..2193b8c 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -107,4 +107,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
index c30041d..4e8b9a8 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
index b66a486..d388742 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
@@ -68,4 +68,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp
deleted file mode 100644
index b1f04dc..0000000
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include "RootInterface.hpp"
-
-namespace v1 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp
index c505b5c..d7f9e33 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
-#define COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
 
 
 #include <set>
@@ -42,17 +42,15 @@ public:
             NOTOK = 1
         };
         
-        testRootMethodError()
+        testRootMethodError() 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
-        testRootMethodError(const Literal &_value) 
-            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
-        testRootMethodError(const int32_t &_value) 
-            : CommonAPI::Enumeration<int32_t>(_value) {}
+        testRootMethodError(Literal _literal) 
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_literal)) {}
     
         inline bool validate() const {
             switch (value_) {
-            case static_cast<int32_t>(Literal::OK):
-            case static_cast<int32_t>(Literal::NOTOK):
+                case static_cast<int32_t>(Literal::OK):
+                case static_cast<int32_t>(Literal::NOTOK):
                 return true;
             default:
                 return false;
@@ -96,4 +94,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp
index c2b8aa2..767ac1b 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
 
@@ -165,4 +165,4 @@ CommonAPI::ProxyManager& RootInterfaceProxy<_AttributeExtensions...>::getProxyMa
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp
index 70f7c49..248235a 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/managed/RootInterface.hpp>
 
@@ -57,4 +57,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp
index da4abbc..0513590 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -121,4 +121,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp
index 9a06017..5c129f0 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp
index c207d38..ba18f95 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/managed/RootInterfaceStub.hpp>
@@ -77,4 +77,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp
index 57c1225..360a1ea 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
-#define COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
 
 
 #include <set>
@@ -56,4 +56,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp
index 0aec7bb..0bcf226 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/SecondRootProxyBase.hpp>
 
@@ -130,4 +130,4 @@ CommonAPI::ProxyManager& SecondRootProxy<_AttributeExtensions...>::getProxyManag
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp
index 11dda50..41a4cc2 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
 
 #include <v1/commonapi/tests/managed/SecondRoot.hpp>
 
@@ -49,4 +49,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp
index 16526e5..ccdddfd 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
 
 #include <functional>
 
@@ -110,4 +110,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp
index 8bd5886..af9be9f 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp
index e1b9ba2..dd7bb14 100644
--- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_
 
 
 #include <v1/commonapi/tests/managed/SecondRootStub.hpp>
@@ -72,4 +72,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp
index 8a09882..d193bb8 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
-#define FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
+#define V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
 
 
 
@@ -55,4 +55,4 @@ namespace CommonAPI {
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp
new file mode 100644
index 0000000..25df376
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp
@@ -0,0 +1,60 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_
+#define V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_
+
+
+
+#include <v1/fake/legacy/service/LegacyInterface.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+class LegacyInterfaceNoObjectManager
+: virtual public LegacyInterface {
+public:
+    virtual ~LegacyInterfaceNoObjectManager() { }
+
+    static inline const char* getInterface();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* LegacyInterfaceNoObjectManager::getInterface() {
+    return ("fake.legacy.service.LegacyInterfaceNoObjectManager");
+}
+
+CommonAPI::Version LegacyInterfaceNoObjectManager::getInterfaceVersion() {
+    return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+namespace CommonAPI {
+}
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp
new file mode 100644
index 0000000..4397b30
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp
@@ -0,0 +1,134 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp>
+
+#include "v1/fake/legacy/service/LegacyInterfaceProxy.hpp"
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+template <typename ... _AttributeExtensions>
+class LegacyInterfaceNoObjectManagerProxy
+    : virtual public LegacyInterfaceNoObjectManager, 
+      virtual public LegacyInterfaceNoObjectManagerProxyBase,
+      public LegacyInterfaceProxy<_AttributeExtensions...>,
+      virtual public _AttributeExtensions... {
+public:
+    LegacyInterfaceNoObjectManagerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+    ~LegacyInterfaceNoObjectManagerProxy();
+
+    typedef LegacyInterfaceNoObjectManager InterfaceType;
+
+    inline static const char* getInterface() {
+        return(LegacyInterfaceNoObjectManager::getInterface());
+    }
+
+
+
+
+
+    /**
+     * Returns the CommonAPI address of the remote partner this proxy communicates with.
+     */
+    virtual const CommonAPI::Address &getAddress() const;
+
+    /**
+     * Returns true if the remote partner for this proxy is currently known to be available.
+     */
+    virtual bool isAvailable() const;
+
+    /**
+     * Returns true if the remote partner for this proxy is available.
+     */
+    virtual bool isAvailableBlocking() const;
+
+    /**
+     * Returns the wrapper class that is used to (de-)register for notifications about
+     * the availability of the remote partner of this proxy.
+     */
+    virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
+
+    /**
+     * Returns the wrapper class that is used to access version information of the remote
+     * partner of this proxy.
+     */
+    virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
+
+ private:
+    std::shared_ptr<LegacyInterfaceNoObjectManagerProxyBase> delegate_;
+};
+
+typedef LegacyInterfaceNoObjectManagerProxy<> LegacyInterfaceNoObjectManagerProxyDefault;
+
+
+//
+// LegacyInterfaceNoObjectManagerProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::LegacyInterfaceNoObjectManagerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+        ::v1::fake::legacy::service::LegacyInterfaceProxy<_AttributeExtensions...>(delegate),
+        _AttributeExtensions(*(std::dynamic_pointer_cast<LegacyInterfaceNoObjectManagerProxyBase>(delegate)))...,
+        delegate_(std::dynamic_pointer_cast<LegacyInterfaceNoObjectManagerProxyBase>(delegate)) {
+}
+
+template <typename ... _AttributeExtensions>
+LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::~LegacyInterfaceNoObjectManagerProxy() {
+}
+
+
+template <typename ... _AttributeExtensions>
+const CommonAPI::Address &LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getAddress() const {
+    return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+bool LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::isAvailable() const {
+    return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+bool LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::isAvailableBlocking() const {
+    return delegate_->isAvailableBlocking();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+    return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+    return delegate_->getInterfaceVersionAttribute();
+}
+
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp
new file mode 100644
index 0000000..34ff82e
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp
@@ -0,0 +1,50 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/Proxy.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+class LegacyInterfaceNoObjectManagerProxyBase
+    : virtual public LegacyInterfaceProxyBase {
+public:
+
+
+
+
+};
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp
new file mode 100644
index 0000000..3afdae2
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp
@@ -0,0 +1,110 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_
+
+#include <functional>
+
+
+
+#include <v1/fake/legacy/service/LegacyInterfaceStub.hpp>
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/Stub.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service LegacyInterfaceNoObjectManager. Also provides means to send broadcasts
+ * and attribute-changed-notifications of observable attributes as defined by this service.
+ * An application developer should not need to bother with this class.
+ */
+class LegacyInterfaceNoObjectManagerStubAdapter
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual LegacyInterfaceNoObjectManager, 
+      public virtual LegacyInterfaceStubAdapter {
+ public:
+
+
+
+    virtual void deactivateManagedInstances() = 0;
+protected:
+    /**
+     * Defines properties for storing the ClientIds of clients / proxies that have
+     * subscribed to the selective broadcasts
+     */
+};
+
+/**
+ * Defines the necessary callbacks to handle remote set events related to the attributes
+ * defined in the IDL description for LegacyInterfaceNoObjectManager.
+ * For each attribute two callbacks are defined:
+ * - a verification callback that allows to verify the requested value and to prevent setting
+ *   e.g. an invalid value ("onRemoteSet<AttributeName>").
+ * - an action callback to do local work after the attribute value has been changed
+ *   ("onRemote<AttributeName>Changed").
+ *
+ * This class and the one below are the ones an application developer needs to have
+ * a look at if he wants to implement a service.
+ */
+class LegacyInterfaceNoObjectManagerStubRemoteEvent
+: public virtual LegacyInterfaceStubRemoteEvent
+{
+public:
+    virtual ~LegacyInterfaceNoObjectManagerStubRemoteEvent() { }
+
+};
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service LegacyInterfaceNoObjectManager to remote clients.
+ * This class and the one above are the ones an application developer needs to have
+ * a look at if he wants to implement a service.
+ */
+class LegacyInterfaceNoObjectManagerStub
+    : public virtual CommonAPI::Stub<LegacyInterfaceNoObjectManagerStubAdapter, LegacyInterfaceNoObjectManagerStubRemoteEvent>, 
+      public virtual LegacyInterfaceStub
+{
+public:
+
+    virtual ~LegacyInterfaceNoObjectManagerStub() {}
+    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
+
+
+
+    using CommonAPI::Stub<LegacyInterfaceNoObjectManagerStubAdapter, LegacyInterfaceNoObjectManagerStubRemoteEvent>::initStubAdapter;
+    typedef CommonAPI::Stub<LegacyInterfaceNoObjectManagerStubAdapter, LegacyInterfaceNoObjectManagerStubRemoteEvent>::StubAdapterType StubAdapterType;
+    typedef CommonAPI::Stub<LegacyInterfaceNoObjectManagerStubAdapter, LegacyInterfaceNoObjectManagerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
+    typedef LegacyInterfaceNoObjectManagerStubRemoteEvent RemoteEventType;
+    typedef LegacyInterfaceNoObjectManager StubInterface;
+};
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp
new file mode 100644
index 0000000..a195973
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp
@@ -0,0 +1,46 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp>
+#include <assert.h>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+LegacyInterfaceNoObjectManagerStubDefault::LegacyInterfaceNoObjectManagerStubDefault():
+        remoteEventHandler_(this),
+        interfaceVersion_(LegacyInterfaceNoObjectManager::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& LegacyInterfaceNoObjectManagerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
+    return interfaceVersion_;
+}
+
+LegacyInterfaceNoObjectManagerStubRemoteEvent* LegacyInterfaceNoObjectManagerStubDefault::initStubAdapter(const std::shared_ptr<LegacyInterfaceNoObjectManagerStubAdapter> &_adapter) {
+    LegacyInterfaceStubDefault::initStubAdapter(_adapter);
+    CommonAPI::Stub<LegacyInterfaceNoObjectManagerStubAdapter, LegacyInterfaceNoObjectManagerStubRemoteEvent>::stubAdapter_ = _adapter;
+    return &remoteEventHandler_;
+}
+
+
+
+
+
+LegacyInterfaceNoObjectManagerStubDefault::RemoteEventHandler::RemoteEventHandler(LegacyInterfaceNoObjectManagerStubDefault *_defaultStub)
+    : LegacyInterfaceStubDefault::RemoteEventHandler(_defaultStub),
+      defaultStub_(_defaultStub) {
+}
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp
new file mode 100644
index 0000000..b970bcc
--- /dev/null
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp
@@ -0,0 +1,72 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT_HPP_
+
+#include <v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp>
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp>
+#include <sstream>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+/**
+ * Provides a default implementation for LegacyInterfaceNoObjectManagerStubRemoteEvent and
+ * LegacyInterfaceNoObjectManagerStub. Method callbacks have an empty implementation,
+ * remote set calls on attributes will always change the value of the attribute
+ * to the one received.
+ *
+ * Override this stub if you only want to provide a subset of the functionality
+ * that would be defined for this service, and/or if you do not need any non-default
+ * behaviour.
+ */
+class LegacyInterfaceNoObjectManagerStubDefault
+    : public virtual LegacyInterfaceNoObjectManagerStub,
+      public virtual LegacyInterfaceStubDefault {
+public:
+    LegacyInterfaceNoObjectManagerStubDefault();
+
+    LegacyInterfaceNoObjectManagerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LegacyInterfaceNoObjectManagerStubAdapter> &_adapter);
+
+    const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client);
+
+
+
+
+
+protected:
+    class RemoteEventHandler: public virtual LegacyInterfaceNoObjectManagerStubRemoteEvent, public virtual LegacyInterfaceStubDefault::RemoteEventHandler {
+    public:
+        RemoteEventHandler(LegacyInterfaceNoObjectManagerStubDefault *_defaultStub);
+
+
+    private:
+        LegacyInterfaceNoObjectManagerStubDefault *defaultStub_;
+    };
+private:
+    LegacyInterfaceNoObjectManagerStubDefault::RemoteEventHandler remoteEventHandler_;
+
+
+    CommonAPI::Version interfaceVersion_;
+};
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp
index d2173da..e4484ef 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
 
 #include <v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
 
@@ -212,4 +212,4 @@ CommonAPI::InterfaceVersionAttribute& LegacyInterfaceProxy<_AttributeExtensions.
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp
index dae25c5..03eb9a1 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
 
 #include <v1/fake/legacy/service/LegacyInterface.hpp>
 
@@ -58,4 +58,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp
index 0824f31..8aeca14 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
 
 #include <functional>
 
@@ -113,4 +113,4 @@ public:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp
index 6a8bae2..9c8237c 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp
index 4f06bbd..f5e459d 100644
--- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.genivi.commonapi.core 3.1.5.v201512091035.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_
 
 
 #include <v1/fake/legacy/service/LegacyInterfaceStub.hpp>
@@ -70,4 +70,4 @@ private:
 // Compatibility
 namespace v1_0 = v1;
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
index 34c8d55..c38adac 100644
--- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
@@ -1,6 +1,6 @@
         /*
         * This file was generated by the CommonAPI Generators.
-        * Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+        * Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
         * Used org.franca.core 0.9.1.201412191134.
         *
         * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
index b963cc7..f40ca1d 100644
--- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp
index 1e846e6..7bd03b9 100644
--- a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp
@@ -1,6 +1,6 @@
         /*
         * This file was generated by the CommonAPI Generators.
-        * Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+        * Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
         * Used org.franca.core 0.9.1.201412191134.
         *
         * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp
index 5d04aa4..7fe7971 100644
--- a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
index 5350a38..0bd7ed8 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
index 3cae58f..5253b0b 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -40,4 +40,4 @@ namespace ExtendedInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
index 1dacb44..0b7e3f7 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
index f4ba72f..fc3cb8b 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
 #include <v1/commonapi/tests/TestInterfaceDBusProxy.hpp>
@@ -59,5 +59,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
index cb579a5..5eb09b1 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
index 26fc51b..f87194d 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/ExtendedInterfaceStub.hpp>
 #include <v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp>
@@ -271,4 +271,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
index 2d53d35..c958881 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
index 6169af6..f5d7490 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -40,4 +40,4 @@ namespace TestFreedesktopDerivedInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
index 09aac22..07761c9 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
index e7bd68a..ec25b27 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
 #include <v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp>
@@ -61,5 +61,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
index 77577e1..3efb939 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
index 52f645e..a261c2e 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
 #include <v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp>
@@ -169,4 +169,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
index 7c2dabd..50dcd15 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
index eb509d2..61a02b5 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_
 
 #include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
@@ -42,4 +42,4 @@ namespace TestFreedesktopInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
index 79f9fb1..7a6ff88 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
index be3c892..c9111cd 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
 #include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp"
@@ -66,5 +66,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
index ed77a4e..b809c44 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
index dbbfa5a..88a7d6d 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
 #include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp"        
@@ -138,4 +138,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp
index 76d5d69..e01f5b8 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp
index 38acd4c..e534f66 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_
 
 #include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
@@ -42,4 +42,4 @@ namespace TestInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp
index e4eeee7..2b4f03e 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp
index c7c1389..372ceaa 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
 #include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp"
@@ -90,5 +90,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index 67a8b07..46562ab 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
index e2a7787..a3e1d1b 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceStub.hpp>
 #include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp"        
@@ -250,4 +250,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp
index 8cfbdf1..db4511e 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp
index d1ea4b5..01e3e12 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -40,4 +40,4 @@ namespace TestInterfaceManager_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp
index 594c9f3..523088a 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp
index ca52bac..f39b1fa 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp>
 #include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp"
@@ -59,5 +59,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp
index 511b538..c2b7ca2 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp
index 1d2fd09..579bae9 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/TestInterfaceManagerStub.hpp>
 #include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp"        
@@ -105,4 +105,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
index 19e51f5..0d1717d 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
index 49bdd2c..8e1e77d 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -42,4 +42,4 @@ namespace BranchInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
index 43872d8..0cc455a 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
index 36987e2..ff5db78 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
 #include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp"
@@ -60,5 +60,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
index 7fb3e68..f29d7dd 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
index a66319e..febb27b 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
 #include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp"        
@@ -111,4 +111,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
index ad090e2..cf1954e 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
index 2263af3..8af07cd 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -42,4 +42,4 @@ namespace LeafInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
index fd4df47..0f195aa 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
index 8eff349..8ae1945 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
 #include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp"
@@ -60,5 +60,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
index dbf3f36..7cfe184 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
index ca99f2f..996d9ee 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 #include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp"        
@@ -111,4 +111,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
index 7df2021..0df6d39 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
index 1d3e157..c12f214 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -42,4 +42,4 @@ namespace RootInterface_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
index 8115315..e498af5 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
index f0a458f..a10ede2 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
 #include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp"
@@ -65,5 +65,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
index 6466b61..956c206 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
index de6ffe9..b09573a 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/managed/RootInterfaceStub.hpp>
 #include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp"        
@@ -120,4 +120,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp
index 596e267..9586b10 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp
index 423adf0..f7f1ac5 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -42,4 +42,4 @@ namespace SecondRoot_ {
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp
index 35fac99..d5c8df1 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp
index ed2e0d3..a84fce2 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
 
 #include <v1/commonapi/tests/managed/SecondRootProxyBase.hpp>
 #include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp"
@@ -61,5 +61,5 @@ private:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
index 355c97c..58d33f3 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
index f68ffa7..d0bdeed 100644
--- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
-#define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
+#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/commonapi/tests/managed/SecondRootStub.hpp>
 #include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp"        
@@ -107,4 +107,4 @@ public:
 } // namespace commonapi
 } // namespace v1
 
-#endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
index 71bbbe1..8ed45be 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
index 5497d10..0d84e65 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_
 
 
 
@@ -42,4 +42,4 @@ namespace LegacyInterface_ {
 } // namespace fake
 } // namespace v1
 
-#endif // COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
index d0c7aba..3f731dd 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
index 19b7d79..2978fbc 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
 
 #include <v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
 #include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp"
@@ -64,5 +64,5 @@ private:
 } // namespace fake
 } // namespace v1
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
index 9c145ea..ed34480 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
index 95b2423..1010478 100644
--- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
@@ -1,14 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
-#define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
 
 #include <v1/fake/legacy/service/LegacyInterfaceStub.hpp>
 #include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp"        
@@ -129,4 +129,4 @@ public:
 } // namespace fake
 } // namespace v1
 
-#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp
new file mode 100644
index 0000000..9253afc
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp
@@ -0,0 +1,30 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include "LegacyInterfaceNoObjectManagerDBusDeployment.hpp"
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+namespace LegacyInterfaceNoObjectManager_ {
+
+// Type-specific deployments
+
+// Attribute-specific deployments
+
+// Argument-specific deployments
+
+// Broadcast-specific deployments
+ 
+} // namespace LegacyInterfaceNoObjectManager_
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp
new file mode 100644
index 0000000..58cb658
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp
@@ -0,0 +1,45 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+#include <CommonAPI/DBus/DBusDeployment.hpp>
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+namespace LegacyInterfaceNoObjectManager_ {
+
+// Interface-specific deployment types
+
+// Type-specific deployments
+
+// Attribute-specific deployments
+
+// Argument-specific deployments
+
+// Broadcast-specific deployments
+
+
+} // namespace LegacyInterfaceNoObjectManager_
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp
new file mode 100644
index 0000000..2098d31
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createLegacyInterfaceNoObjectManagerDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<LegacyInterfaceNoObjectManagerDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerLegacyInterfaceNoObjectManagerDBusProxy) {
+     CommonAPI::DBus::DBusAddressTranslator::get()->insert(
+         "local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service.LegacyInterfaceNoObjectManager",
+         "",
+         "",
+         "");
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		LegacyInterfaceNoObjectManager::getInterface(),
+		&createLegacyInterfaceNoObjectManagerDBusProxy);
+}
+
+LegacyInterfaceNoObjectManagerDBusProxy::LegacyInterfaceNoObjectManagerDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection),
+		LegacyInterfaceDBusProxy(_address, _connection)
+{
+    CommonAPI::DBus::DBusServiceRegistry::get(_connection)->setDBusServicePredefined(_address.getService());
+}
+
+
+    
+
+
+void LegacyInterfaceNoObjectManagerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace service
+      } // namespace legacy
+      } // namespace fake
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp
new file mode 100644
index 0000000..8968f71
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp
@@ -0,0 +1,63 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp>
+#include "v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp"
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusAddress.hpp>
+#include <CommonAPI/DBus/DBusFactory.hpp>
+#include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+#include <string>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+class LegacyInterfaceNoObjectManagerDBusProxy
+    : virtual public LegacyInterfaceNoObjectManagerProxyBase, 
+      virtual public LegacyInterfaceDBusProxy {
+public:
+    LegacyInterfaceNoObjectManagerDBusProxy(
+        const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection);
+
+    virtual ~LegacyInterfaceNoObjectManagerDBusProxy() { }
+
+
+
+
+
+    virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
+
+private:
+   
+
+
+};
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_
+
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp
new file mode 100644
index 0000000..0eb82b0
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp
@@ -0,0 +1,157 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLegacyInterfaceNoObjectManagerDBusStubAdapter(
+                   const CommonAPI::DBus::DBusAddress &_address,
+                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+                   const std::shared_ptr<CommonAPI::StubBase> &_stub) {
+    return std::make_shared<LegacyInterfaceNoObjectManagerDBusStubAdapter>(_address, _connection, _stub);
+}
+
+INITIALIZER(registerLegacyInterfaceNoObjectManagerDBusStubAdapter) {
+     CommonAPI::DBus::DBusAddressTranslator::get()->insert(
+         "local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service.LegacyInterfaceNoObjectManager",
+         "",
+         "",
+         "");
+    CommonAPI::DBus::Factory::get()->registerStubAdapterCreateMethod(
+    	LegacyInterfaceNoObjectManager::getInterface(), &createLegacyInterfaceNoObjectManagerDBusStubAdapter);
+}
+
+LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::~LegacyInterfaceNoObjectManagerDBusStubAdapterInternal() {
+    deactivateManagedInstances();
+    LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::deinit();
+}
+
+void LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::deactivateManagedInstances() {
+
+}
+
+const char* LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        std::string(LegacyInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData()) +
+
+        ""
+    ;
+    return introspectionData.c_str();
+}
+
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+        CommonAPI::Version
+        > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher(&LegacyInterfaceNoObjectManagerStub::getInterfaceVersion, "uu");
+
+
+#ifdef WIN32
+#endif
+
+
+#ifdef WIN32
+
+CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<int32_t>,
+    std::tuple<int32_t, int32_t>,
+    std::tuple<CommonAPI::EmptyDeployment>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment>
+    
+    > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::testMethodStubDispatcher(
+    &LegacyInterfaceNoObjectManagerStub::TestMethod, "ii",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
+                	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr)));
+
+CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<>,
+    std::tuple<std::string, int32_t>,
+    std::tuple<>,
+    std::tuple<CommonAPI::DBus::StringDeployment, CommonAPI::EmptyDeployment>
+    
+    > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::otherTestMethodStubDispatcher(
+    &LegacyInterfaceNoObjectManagerStub::OtherTestMethod, "si",
+					std::make_tuple(),
+                	std::make_tuple(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr)));
+
+CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<>,
+    std::tuple<>,
+    std::tuple<>,
+    std::tuple<>
+    
+    > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::finishStubDispatcher(
+    &LegacyInterfaceNoObjectManagerStub::finish, "",
+					std::make_tuple(),
+                	std::make_tuple());
+#endif
+
+
+
+#ifdef WIN32
+#endif
+
+const LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable& LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
+}
+
+const CommonAPI::DBus::StubAttributeTable& LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getStubAttributeTable() {
+    return stubAttributeTable_;
+}
+
+LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal(
+        const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+        const std::shared_ptr<CommonAPI::StubBase> &_stub)
+	: CommonAPI::DBus::DBusStubAdapter(_address, _connection,false),
+      LegacyInterfaceNoObjectManagerDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<LegacyInterfaceNoObjectManagerStub>(_stub), false),
+      LegacyInterfaceDBusStubAdapterInternal(_address, _connection, _stub),
+      stubDispatcherTable_({
+            #ifdef WIN32
+            { { "TestMethod", "i" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::testMethodStubDispatcher },
+            { { "OtherTestMethod", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::otherTestMethodStubDispatcher },
+            { { "finish", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::finishStubDispatcher }
+            #endif
+            }),
+        stubAttributeTable_() {
+
+    #ifdef WIN32
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher });
+    #else
+    auto parentDispatcherTable = LegacyInterfaceDBusStubAdapterInternal::getStubDispatcherTable();
+    stubDispatcherTable_.insert(parentDispatcherTable.begin(), parentDispatcherTable.end());
+
+    auto interfaceVersionGetter = stubDispatcherTable_.find({ "getInterfaceVersion", "" });
+    if(interfaceVersionGetter != stubDispatcherTable_.end()) {
+        interfaceVersionGetter->second = &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher;
+    } else {
+        stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher });
+    }
+
+    auto parentAttributeTable = LegacyInterfaceDBusStubAdapterInternal::getStubAttributeTable();
+    stubAttributeTable_.insert(parentAttributeTable.begin(), parentAttributeTable.end());
+
+    #endif
+}
+
+bool LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::hasFreedesktopProperties() {
+    return false;
+}
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp
new file mode 100644
index 0000000..9c6fd92
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp
@@ -0,0 +1,159 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.5.v201512091037.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_
+#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_
+
+#include <v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp>
+#include "v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp"        
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
+#include <CommonAPI/DBus/DBusFactory.hpp>
+#include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
+#include <CommonAPI/DBus/DBusStubAdapter.hpp>
+#include <CommonAPI/DBus/DBusDeployment.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<LegacyInterfaceNoObjectManagerStub> LegacyInterfaceNoObjectManagerDBusStubAdapterHelper;
+
+class LegacyInterfaceNoObjectManagerDBusStubAdapterInternal
+    : public virtual LegacyInterfaceNoObjectManagerStubAdapter,
+      public LegacyInterfaceNoObjectManagerDBusStubAdapterHelper,
+      public LegacyInterfaceDBusStubAdapterInternal
+{
+public:
+    LegacyInterfaceNoObjectManagerDBusStubAdapterInternal(
+            const CommonAPI::DBus::DBusAddress &_address,
+            const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+            const std::shared_ptr<CommonAPI::StubBase> &_stub);
+
+    ~LegacyInterfaceNoObjectManagerDBusStubAdapterInternal();
+
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return LegacyInterfaceNoObjectManager::getInterface();
+    }
+
+
+
+
+    const LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+    const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable();
+
+    void deactivateManagedInstances();
+    
+    virtual const CommonAPI::Address &getAddress() const {
+        return DBusStubAdapter::getAddress();
+    }
+
+    virtual void init(std::shared_ptr<DBusStubAdapter> instance) {
+        return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::init(instance);
+    }
+
+    virtual void deinit() {
+        return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::deinit();
+    }
+
+    virtual bool onInterfaceDBusMessage(const CommonAPI::DBus::DBusMessage& dbusMessage) {
+        return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::onInterfaceDBusMessage(dbusMessage);
+    }
+
+    virtual bool onInterfaceDBusFreedesktopPropertiesMessage(const CommonAPI::DBus::DBusMessage& dbusMessage) {
+        return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::onInterfaceDBusFreedesktopPropertiesMessage(dbusMessage);
+    }
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+        CommonAPI::Version
+        > getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher;
+
+
+#ifdef WIN32
+#endif
+
+
+#ifdef WIN32
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<int32_t>,
+    std::tuple<int32_t, int32_t>,
+    std::tuple<CommonAPI::EmptyDeployment>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment>
+    
+    > testMethodStubDispatcher;
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<>,
+    std::tuple<std::string, int32_t>,
+    std::tuple<>,
+    std::tuple<CommonAPI::DBus::StringDeployment, CommonAPI::EmptyDeployment>
+    
+    > otherTestMethodStubDispatcher;
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub,
+    std::tuple<>,
+    std::tuple<>,
+    std::tuple<>,
+    std::tuple<>
+    
+    > finishStubDispatcher;
+#endif
+
+
+#ifdef WIN32
+#endif
+
+ protected:
+    virtual const char* getMethodsDBusIntrospectionXmlData() const;
+
+ private:
+    LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+    CommonAPI::DBus::StubAttributeTable stubAttributeTable_;
+};
+
+class LegacyInterfaceNoObjectManagerDBusStubAdapter
+    : public LegacyInterfaceNoObjectManagerDBusStubAdapterInternal,
+      public std::enable_shared_from_this<LegacyInterfaceNoObjectManagerDBusStubAdapter> {
+public:
+    LegacyInterfaceNoObjectManagerDBusStubAdapter(
+    	const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+        const std::shared_ptr<CommonAPI::StubBase> &_stub)
+    	: CommonAPI::DBus::DBusStubAdapter(
+    		_address, 
+    		_connection,
+            false),
+          LegacyInterfaceNoObjectManagerDBusStubAdapterInternal(
+          	_address, 
+          	_connection, 
+          	_stub) { 
+    }
+};
+
+} // namespace service
+} // namespace legacy
+} // namespace fake
+} // namespace v1
+
+#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_