* some naming adoptions & review for GENIVI

Signed-off-by: Christian Linke <christian.linke@bmw.de>

22 files changed, 585 insertions, 1313 deletions

diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
new file mode 100644
index 0000000..026f431
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2013, BMW AG
+ *
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+class Consumer {
+ public:
+    virtual ~Consumer() { }
+
+    static inline const char* getInterfaceId();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* Consumer::getInterfaceId() {
+    return "org.genivi.NodeStateManager.Consumer";
+}
+
+CommonAPI::Version Consumer::getInterfaceVersion() {
+    return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+    //hashes for types
+    
+    //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
deleted file mode 100644
index 345bd3b..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-class Consumer {
- public:
-    virtual ~Consumer() { }
-
-    static inline const char* getInterfaceId();
-    static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* Consumer::getInterfaceId() {
-    return "org.genivi.NodeStateManager.Consumer.Consumer";
-}
-
-CommonAPI::Version Consumer::getInterfaceVersion() {
-    return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
-    //hashes for types
-    
-    //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
deleted file mode 100644
index a72ba16..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#include "ConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/Consumer/Consumer.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter(
-                   const std::string& commonApiAddress,
-                   const std::string& interfaceName,
-                   const std::string& busName,
-                   const std::string& objectPath,
-                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
-                   const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
-    return std::make_shared<ConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
-}
-
-__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) {
-    CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(),
-                                                               &createConsumerDBusStubAdapter);
-}
-
-ConsumerDBusStubAdapter::ConsumerDBusStubAdapter(
-        const std::string& commonApiAddress,
-        const std::string& dbusInterfaceName,
-        const std::string& dbusBusName,
-        const std::string& dbusObjectPath,
-        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
-        const std::shared_ptr<CommonAPI::StubBase>& stub):
-        ConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<ConsumerStub>(stub)) {
-}
-
-const char* ConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
-    return
-        "<method name=\"getRestartReasonAttribute\">\n"
-        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setRestartReasonAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onRestartReasonAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"i\" />\n"
-        "</signal>\n"
-        "<method name=\"getShutdownReasonAttribute\">\n"
-        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setShutdownReasonAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onShutdownReasonAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"i\" />\n"
-        "</signal>\n"
-        "<method name=\"getWakeUpReasonAttribute\">\n"
-        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setWakeUpReasonAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onWakeUpReasonAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"i\" />\n"
-        "</signal>\n"
-        "<method name=\"getBootModeAttribute\">\n"
-        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setBootModeAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onBootModeAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"i\" />\n"
-        "</signal>\n"
-        "<signal name=\"NodeState\">\n"
-            "<arg name=\"NodeState\" type=\"i\" />\n"
-        "</signal>\n"
-        "<signal name=\"NodeApplicationMode\">\n"
-            "<arg name=\"ApplicationModeId\" type=\"i\" />\n"
-        "</signal>\n"
-        "<signal name=\"SessionStateChanged\">\n"
-            "<arg name=\"SessionStateName\" type=\"s\" />\n"
-            "<arg name=\"SeatID\" type=\"i\" />\n"
-            "<arg name=\"SessionState\" type=\"i\" />\n"
-        "</signal>\n"
-        "<method name=\"GetNodeState\">\n"
-            "<arg name=\"NodeStateId\" type=\"i\" direction=\"out\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"SetSessionState\">\n"
-            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"GetSessionState\">\n"
-            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"SessionState\" type=\"i\" direction=\"out\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"GetApplicationMode\">\n"
-            "<arg name=\"ApplicationModeId\" type=\"i\" direction=\"out\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"RegisterShutdownClient\">\n"
-            "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"TimeoutMs\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"UnRegisterShutdownClient\">\n"
-            "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"RegisterSession\">\n"
-            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"UnRegisterSession\">\n"
-            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
-            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"GetAppHealthCount\">\n"
-            "<arg name=\"Count\" type=\"u\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"GetInterfaceVersion\">\n"
-            "<arg name=\"Version\" type=\"u\" direction=\"out\" />\n"
-        "</method>\n"
-        "<method name=\"LifecycleRequestComplete\">\n"
-            "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"Status\" type=\"i\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-    ;
-}
-
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > setRestartReasonAttributeStubDispatcher(
-                &ConsumerStub::getRestartReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteSetRestartReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteRestartReasonAttributeChanged,
-                &ConsumerStubAdapter::fireRestartReasonAttributeChanged,
-                "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > setShutdownReasonAttributeStubDispatcher(
-                &ConsumerStub::getShutdownReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteSetShutdownReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteShutdownReasonAttributeChanged,
-                &ConsumerStubAdapter::fireShutdownReasonAttributeChanged,
-                "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > setWakeUpReasonAttributeStubDispatcher(
-                &ConsumerStub::getWakeUpReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteSetWakeUpReasonAttribute,
-                &ConsumerStubRemoteEvent::onRemoteWakeUpReasonAttributeChanged,
-                &ConsumerStubAdapter::fireWakeUpReasonAttributeChanged,
-                "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ConsumerStub,
-        int32_t
-        > setBootModeAttributeStubDispatcher(
-                &ConsumerStub::getBootModeAttribute,
-                &ConsumerStubRemoteEvent::onRemoteSetBootModeAttribute,
-                &ConsumerStubRemoteEvent::onRemoteBootModeAttributeChanged,
-                &ConsumerStubAdapter::fireBootModeAttributeChanged,
-                "i");
-
-
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<>,
-    std::tuple<int32_t, int32_t>
-    > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, std::string, int32_t, int32_t>,
-    std::tuple<int32_t>
-    > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, int32_t>,
-    std::tuple<int32_t, int32_t>
-    > getSessionStateStubDispatcher(&ConsumerStub::GetSessionState, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<>,
-    std::tuple<int32_t, int32_t>
-    > getApplicationModeStubDispatcher(&ConsumerStub::GetApplicationMode, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, std::string, uint32_t, uint32_t>,
-    std::tuple<int32_t>
-    > registerShutdownClientStubDispatcher(&ConsumerStub::RegisterShutdownClient, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, std::string, uint32_t>,
-    std::tuple<int32_t>
-    > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, std::string, int32_t, int32_t>,
-    std::tuple<int32_t>
-    > registerSessionStubDispatcher(&ConsumerStub::RegisterSession, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<std::string, std::string, int32_t>,
-    std::tuple<int32_t>
-    > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<>,
-    std::tuple<uint32_t>
-    > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<>,
-    std::tuple<uint32_t>
-    > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ConsumerStub,
-    std::tuple<uint32_t, int32_t>,
-    std::tuple<int32_t>
-    > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i");
-
-void ConsumerDBusStubAdapter::fireRestartReasonAttributeChanged(const int32_t& value) {
-	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-        ::sendSignal(
-            *this,
-            "onRestartReasonAttributeChanged",
-            "i",
-            value
-    );
-}
-void ConsumerDBusStubAdapter::fireShutdownReasonAttributeChanged(const int32_t& value) {
-	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-        ::sendSignal(
-            *this,
-            "onShutdownReasonAttributeChanged",
-            "i",
-            value
-    );
-}
-void ConsumerDBusStubAdapter::fireWakeUpReasonAttributeChanged(const int32_t& value) {
-	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-        ::sendSignal(
-            *this,
-            "onWakeUpReasonAttributeChanged",
-            "i",
-            value
-    );
-}
-void ConsumerDBusStubAdapter::fireBootModeAttributeChanged(const int32_t& value) {
-	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-        ::sendSignal(
-            *this,
-            "onBootModeAttributeChanged",
-            "i",
-            value
-    );
-}
-
-void ConsumerDBusStubAdapter::fireNodeStateEvent(const int32_t& NodeState) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-            ::sendSignal(
-                *this,
-                "NodeState",
-                "i",
-                NodeState
-        );
-}
-void ConsumerDBusStubAdapter::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
-            ::sendSignal(
-                *this,
-                "NodeApplicationMode",
-                "i",
-                ApplicationModeId
-        );
-}
-void ConsumerDBusStubAdapter::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t, int32_t>>
-            ::sendSignal(
-                *this,
-                "SessionStateChanged",
-                "sii",
-                SessionStateName, SeatID, SessionState
-        );
-}
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-template<>
-const org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
-    { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getRestartReasonAttributeStubDispatcher }
-    , { { "setRestartReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setRestartReasonAttributeStubDispatcher },
-    { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getShutdownReasonAttributeStubDispatcher }
-    , { { "setShutdownReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setShutdownReasonAttributeStubDispatcher },
-    { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getWakeUpReasonAttributeStubDispatcher }
-    , { { "setWakeUpReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setWakeUpReasonAttributeStubDispatcher },
-    { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getBootModeAttributeStubDispatcher }
-    , { { "setBootModeAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setBootModeAttributeStubDispatcher }
-    ,
-    { { "GetNodeState", "" }, &org::genivi::NodeStateManager::Consumer::getNodeStateStubDispatcher },
-    { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::Consumer::setSessionStateStubDispatcher },
-    { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::Consumer::getSessionStateStubDispatcher },
-    { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::Consumer::getApplicationModeStubDispatcher },
-    { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::Consumer::registerShutdownClientStubDispatcher },
-    { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::Consumer::unRegisterShutdownClientStubDispatcher },
-    { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::Consumer::registerSessionStubDispatcher },
-    { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::Consumer::unRegisterSessionStubDispatcher },
-    { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::Consumer::getAppHealthCountStubDispatcher },
-    { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::Consumer::getInterfaceVersionStubDispatcher },
-    { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::Consumer::lifecycleRequestCompleteStubDispatcher }
-};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
deleted file mode 100644
index 8b43c21..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
-
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
-#include <CommonAPI/DBus/DBusFactory.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper;
-
-class ConsumerDBusStubAdapter: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper {
- public:
-    ConsumerDBusStubAdapter(
-            const std::string& commonApiAddress,
-            const std::string& dbusInterfaceName,
-            const std::string& dbusBusName,
-            const std::string& dbusObjectPath,
-            const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
-            const std::shared_ptr<CommonAPI::StubBase>& stub);
-    
-    void fireRestartReasonAttributeChanged(const int32_t& value);
-    void fireShutdownReasonAttributeChanged(const int32_t& value);
-    void fireWakeUpReasonAttributeChanged(const int32_t& value);
-    void fireBootModeAttributeChanged(const int32_t& value);
-
-    void fireNodeStateEvent(const int32_t& NodeState);
-    void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
-    void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
-
- protected:
-    virtual const char* getMethodsDBusIntrospectionXmlData() const;
-};
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
index e920d51..202680d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
@@ -1,29 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
 #include "ConsumerDBusProxy.h"
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy(
                     const std::string& commonApiAddress,
@@ -46,16 +32,19 @@ ConsumerDBusProxy::ConsumerDBusProxy(
                     const std::string& objectPath,
                     const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
         CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
-,        restartReason_(*this, interfaceName.c_str(), "RestartReason"),
+,        bootMode_(*this, interfaceName.c_str(), "BootMode"),
+        restartReason_(*this, interfaceName.c_str(), "RestartReason"),
         shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"),
-        wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason"),
-        bootMode_(*this, interfaceName.c_str(), "BootMode")
-,        nodeState_(*this, "NodeState", "i"),
-                        nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
-                        sessionStateChanged_(*this, "SessionStateChanged", "sii")
+        wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason")
+,        nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
+                        sessionStateChanged_(*this, "SessionStateChanged", "sii"),
+                        nodeState_(*this, "NodeState", "i")
                  {
 }
 
+ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
+    return bootMode_;
+}
 ConsumerDBusProxy::RestartReasonAttribute& ConsumerDBusProxy::getRestartReasonAttribute() {
     return restartReason_;
 }
@@ -65,83 +54,78 @@ ConsumerDBusProxy::ShutdownReasonAttribute& ConsumerDBusProxy::getShutdownReason
 ConsumerDBusProxy::WakeUpReasonAttribute& ConsumerDBusProxy::getWakeUpReasonAttribute() {
     return wakeUpReason_;
 }
-ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
-    return bootMode_;
-}
 
-ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
-    return nodeState_;
-}
 ConsumerDBusProxy::NodeApplicationModeEvent& ConsumerDBusProxy::getNodeApplicationModeEvent() {
     return nodeApplicationMode_;
 }
 ConsumerDBusProxy::SessionStateChangedEvent& ConsumerDBusProxy::getSessionStateChangedEvent() {
     return sessionStateChanged_;
 }
+ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
+    return nodeState_;
+}
 
-void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
+void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
     CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
         *this,
-        "GetNodeState",
+        "GetAppHealthCount",
         "",
         callStatus
-        , NodeStateId, ErrorCode);
+        , Count);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
     return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
         *this,
-        "GetNodeState",
+        "GetAppHealthCount",
         "",
         std::move(callback));
 }
-void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
         *this,
-        "SetSessionState",
-        "ssii",
-        SessionName, SessionOwner, SeatID, SessionState, 
+        "LifecycleRequestComplete",
+        "ui",
+        RequestId, Status, 
         callStatus
         , ErrorCode);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
         *this,
-        "SetSessionState",
-        "ssii",
-        SessionName, SessionOwner, SeatID, SessionState, 
+        "LifecycleRequestComplete",
+        "ui",
+        RequestId, Status, 
         std::move(callback));
 }
-void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
         *this,
-        "GetSessionState",
-        "si",
-        SessionName, SeatID, 
+        "GetInterfaceVersion",
+        "",
         callStatus
-        , SessionState, ErrorCode);
+        , Version);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
         *this,
-        "GetSessionState",
-        "si",
-        SessionName, SeatID, 
+        "GetInterfaceVersion",
+        "",
         std::move(callback));
 }
-void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
+void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
     CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
         *this,
         "GetApplicationMode",
         "",
         callStatus
-        , ApplicationModeId, ErrorCode);
+        , ErrorCode, ApplicationModeId);
 }
 std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
     return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
@@ -151,42 +135,23 @@ std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(Ge
         "",
         std::move(callback));
 }
-void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
-        *this,
-        "RegisterShutdownClient",
-        "ssuu",
-        BusName, ObjName, ShutdownMode, TimeoutMs, 
-        callStatus
-        , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
-        *this,
-        "RegisterShutdownClient",
-        "ssuu",
-        BusName, ObjName, ShutdownMode, TimeoutMs, 
-        std::move(callback));
-}
-void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
         *this,
-        "UnRegisterShutdownClient",
-        "ssu",
-        BusName, ObjName, ShutdownMode, 
+        "UnRegisterSession",
+        "ssi",
+        SessionName, SessionOwner, SeatID, 
         callStatus
         , ErrorCode);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
         *this,
-        "UnRegisterShutdownClient",
-        "ssu",
-        BusName, ObjName, ShutdownMode, 
+        "UnRegisterSession",
+        "ssi",
+        SessionName, SessionOwner, SeatID, 
         std::move(callback));
 }
 void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
@@ -208,85 +173,105 @@ std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterSessionAsync(const
         SessionName, SessionOwner, SeatID, SessionState, 
         std::move(callback));
 }
-void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
         *this,
-        "UnRegisterSession",
-        "ssi",
-        SessionName, SessionOwner, SeatID, 
+        "UnRegisterShutdownClient",
+        "ssu",
+        BusName, ObjName, ShutdownMode, 
         callStatus
         , ErrorCode);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
         *this,
-        "UnRegisterSession",
-        "ssi",
-        SessionName, SessionOwner, SeatID, 
+        "UnRegisterShutdownClient",
+        "ssu",
+        BusName, ObjName, ShutdownMode, 
         std::move(callback));
 }
-void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
         *this,
-        "GetAppHealthCount",
-        "",
+        "RegisterShutdownClient",
+        "ssuu",
+        BusName, ObjName, ShutdownMode, TimeoutMs, 
         callStatus
-        , Count);
+        , ErrorCode);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
         *this,
-        "GetAppHealthCount",
-        "",
+        "RegisterShutdownClient",
+        "ssuu",
+        BusName, ObjName, ShutdownMode, TimeoutMs, 
         std::move(callback));
 }
-void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
     CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
         *this,
-        "GetInterfaceVersion",
+        "GetNodeState",
         "",
         callStatus
-        , Version);
+        , ErrorCode, NodeStateId);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
     return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
-                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
         *this,
-        "GetInterfaceVersion",
+        "GetNodeState",
         "",
         std::move(callback));
 }
-void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+        *this,
+        "GetSessionState",
+        "si",
+        SessionName, SeatID, 
+        callStatus
+        , SessionState, ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+        *this,
+        "GetSessionState",
+        "si",
+        SessionName, SeatID, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
         *this,
-        "LifecycleRequestComplete",
-        "ui",
-        RequestId, Status, 
+        "SetSessionState",
+        "ssii",
+        SessionName, SessionOwner, SessionState, SeatID, 
         callStatus
         , ErrorCode);
 }
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
                                      CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
         *this,
-        "LifecycleRequestComplete",
-        "ui",
-        RequestId, Status, 
+        "SetSessionState",
+        "ssii",
+        SessionName, SessionOwner, SessionState, SeatID, 
         std::move(callback));
 }
 
 void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-    ownVersionMajor = 0;
-    ownVersionMinor = 1;
+    ownVersionMajor = 1;
+    ownVersionMinor = 0;
 }
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
index c3db1df..fe17687 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
@@ -1,27 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
 
-#include <org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h>
+#include <org/genivi/NodeStateManager/ConsumerProxyBase.h>
 
 #define COMMONAPI_INTERNAL_COMPILATION
 
@@ -37,7 +24,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
  public:
@@ -50,65 +36,64 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common
 
     virtual ~ConsumerDBusProxy() { }
 
+    virtual BootModeAttribute& getBootModeAttribute();
     virtual RestartReasonAttribute& getRestartReasonAttribute();
     virtual ShutdownReasonAttribute& getShutdownReasonAttribute();
     virtual WakeUpReasonAttribute& getWakeUpReasonAttribute();
-    virtual BootModeAttribute& getBootModeAttribute();
 
-    virtual NodeStateEvent& getNodeStateEvent();
     virtual NodeApplicationModeEvent& getNodeApplicationModeEvent();
     virtual SessionStateChangedEvent& getSessionStateChangedEvent();
+    virtual NodeStateEvent& getNodeStateEvent();
 
 
-    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+    virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
 
-    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
 
-    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+    virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
 
-    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
     virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
 
-    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
-
-    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
 
     virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
 
-    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
 
-    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
-    virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
 
-    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
-    virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
+    virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
 
-    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+
+    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
     
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
  private:
-    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<RestartReasonAttribute>> restartReason_;
-    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<ShutdownReasonAttribute>> shutdownReason_;
-    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<WakeUpReasonAttribute>> wakeUpReason_;
-    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<BootModeAttribute>> bootMode_;
+    CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_;
+    CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_;
+    CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
+    CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
 
-    CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
     CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
     CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
+    CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
 };
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
index 273fa8b..e0aab4d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
@@ -1,25 +1,12 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
 
 #include "ConsumerProxyBase.h"
 
@@ -33,7 +20,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 template <typename ... _AttributeExtensions>
 class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
@@ -41,6 +27,11 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
     ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~ConsumerProxy();
 
+    /// Returns the wrapper class that provides access to the attribute BootMode.
+    virtual BootModeAttribute& getBootModeAttribute() {
+        return delegate_->getBootModeAttribute();
+    }
+
     /// Returns the wrapper class that provides access to the attribute RestartReason.
     virtual RestartReasonAttribute& getRestartReasonAttribute() {
         return delegate_->getRestartReasonAttribute();
@@ -56,16 +47,6 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
         return delegate_->getWakeUpReasonAttribute();
     }
 
-    /// Returns the wrapper class that provides access to the attribute BootMode.
-    virtual BootModeAttribute& getBootModeAttribute() {
-        return delegate_->getBootModeAttribute();
-    }
-
-
-    /// Returns the wrapper class that provides access to the broadcast NodeState.
-    virtual NodeStateEvent& getNodeStateEvent() {
-        return delegate_->getNodeStateEvent();
-    }
 
     /// Returns the wrapper class that provides access to the broadcast NodeApplicationMode.
     virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() {
@@ -77,10 +58,15 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
         return delegate_->getSessionStateChangedEvent();
     }
 
+    /// Returns the wrapper class that provides access to the broadcast NodeState.
+    virtual NodeStateEvent& getNodeStateEvent() {
+        return delegate_->getNodeStateEvent();
+    }
+
 
 
     /**
-     * Calls GetNodeState with synchronous semantics.
+     * Calls GetAppHealthCount with synchronous semantics.
      * 
      * All non-const parameters will be filled with the returned values.
      * The CallStatus will be filled when the method returns and indicate either
@@ -88,9 +74,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
+    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
     /**
-     * Calls GetNodeState with asynchronous semantics.
+     * Calls GetAppHealthCount with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -99,10 +85,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
 
     /**
-     * Calls SetSessionState with synchronous semantics.
+     * Calls LifecycleRequestComplete with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -111,9 +97,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls SetSessionState with asynchronous semantics.
+     * Calls LifecycleRequestComplete with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -122,21 +108,20 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
 
     /**
-     * Calls GetSessionState with synchronous semantics.
+     * Calls GetInterfaceVersion with synchronous semantics.
      * 
-     * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
      * The CallStatus will be filled when the method returns and indicate either
      * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
     /**
-     * Calls GetSessionState with asynchronous semantics.
+     * Calls GetInterfaceVersion with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -145,7 +130,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
 
     /**
      * Calls GetApplicationMode with synchronous semantics.
@@ -156,7 +141,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
     /**
      * Calls GetApplicationMode with asynchronous semantics.
      * 
@@ -170,7 +155,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
     virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
 
     /**
-     * Calls RegisterShutdownClient with synchronous semantics.
+     * Calls UnRegisterSession with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -179,9 +164,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls RegisterShutdownClient with asynchronous semantics.
+     * Calls UnRegisterSession with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -190,10 +175,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
 
     /**
-     * Calls UnRegisterShutdownClient with synchronous semantics.
+     * Calls RegisterSession with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -202,9 +187,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls UnRegisterShutdownClient with asynchronous semantics.
+     * Calls RegisterSession with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -213,10 +198,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
 
     /**
-     * Calls RegisterSession with synchronous semantics.
+     * Calls UnRegisterShutdownClient with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -225,9 +210,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls RegisterSession with asynchronous semantics.
+     * Calls UnRegisterShutdownClient with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -236,10 +221,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
 
     /**
-     * Calls UnRegisterSession with synchronous semantics.
+     * Calls RegisterShutdownClient with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -248,9 +233,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls UnRegisterSession with asynchronous semantics.
+     * Calls RegisterShutdownClient with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -259,10 +244,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
 
     /**
-     * Calls GetAppHealthCount with synchronous semantics.
+     * Calls GetNodeState with synchronous semantics.
      * 
      * All non-const parameters will be filled with the returned values.
      * The CallStatus will be filled when the method returns and indicate either
@@ -270,9 +255,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
     /**
-     * Calls GetAppHealthCount with asynchronous semantics.
+     * Calls GetNodeState with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -281,20 +266,21 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
 
     /**
-     * Calls GetInterfaceVersion with synchronous semantics.
+     * Calls GetSessionState with synchronous semantics.
      * 
+     * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
      * The CallStatus will be filled when the method returns and indicate either
      * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
     /**
-     * Calls GetInterfaceVersion with asynchronous semantics.
+     * Calls GetSessionState with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -303,10 +289,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
 
     /**
-     * Calls LifecycleRequestComplete with synchronous semantics.
+     * Calls SetSessionState with synchronous semantics.
      * 
      * All const parameters are input parameters to this method.
      * All non-const parameters will be filled with the returned values.
@@ -315,9 +301,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * will be set.
      * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
      */
-    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     /**
-     * Calls LifecycleRequestComplete with asynchronous semantics.
+     * Calls SetSessionState with asynchronous semantics.
      * 
      * The provided callback will be called when the reply to this call arrives or
      * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -326,7 +312,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
 
     /// Returns the CommonAPI address of the remote partner this proxy communicates with.
     virtual std::string getAddress() const;
@@ -361,6 +347,25 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
 
 namespace ConsumerExtensions {
     template <template <typename > class _ExtensionType>
+    class BootModeAttributeExtension {
+     public:
+        typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
+    
+        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
+                      "Not CommonAPI Attribute Extension!");
+    
+        BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
+        }
+    
+        inline extension_type& getBootModeAttributeExtension() {
+            return attributeExtension_;
+        }
+    
+     private:
+        extension_type attributeExtension_;
+    };
+
+    template <template <typename > class _ExtensionType>
     class RestartReasonAttributeExtension {
      public:
         typedef _ExtensionType<ConsumerProxyBase::RestartReasonAttribute> extension_type;
@@ -417,25 +422,6 @@ namespace ConsumerExtensions {
         extension_type attributeExtension_;
     };
 
-    template <template <typename > class _ExtensionType>
-    class BootModeAttributeExtension {
-     public:
-        typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
-    
-        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
-                      "Not CommonAPI Attribute Extension!");
-    
-        BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
-        }
-    
-        inline extension_type& getBootModeAttributeExtension() {
-            return attributeExtension_;
-        }
-    
-     private:
-        extension_type attributeExtension_;
-    };
-
 } // namespace ConsumerExtensions
 
 //
@@ -452,38 +438,38 @@ ConsumerProxy<_AttributeExtensions...>::~ConsumerProxy() {
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
-    delegate_->GetNodeState(callStatus, NodeStateId, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
+    delegate_->GetAppHealthCount(callStatus, Count);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
-    return delegate_->GetNodeStateAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
+    return delegate_->GetAppHealthCountAsync(callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->SetSessionState(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
-    return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+    return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
-    delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+    delegate_->GetInterfaceVersion(callStatus, Version);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
-    return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+    return delegate_->GetInterfaceVersionAsync(callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
-    delegate_->GetApplicationMode(callStatus, ApplicationModeId, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
+    delegate_->GetApplicationMode(callStatus, ErrorCode, ApplicationModeId);
 }
 
 template <typename ... _AttributeExtensions>
@@ -492,73 +478,73 @@ std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAp
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
-    return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+    return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
-    return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
+    return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
-    return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+    return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
-    return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+    return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
-    delegate_->GetAppHealthCount(callStatus, Count);
+void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
+    delegate_->GetNodeState(callStatus, ErrorCode, NodeStateId);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
-    return delegate_->GetAppHealthCountAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+    return delegate_->GetNodeStateAsync(callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
-    delegate_->GetInterfaceVersion(callStatus, Version);
+void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+    delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
-    return delegate_->GetInterfaceVersionAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+    return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
 }
 
 template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->SetSessionState(SessionName, SessionOwner, SessionState, SeatID, callStatus, ErrorCode);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
-    return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
+    return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SessionState, SeatID, callback);
 }
 
 
@@ -597,23 +583,22 @@ CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::ge
     return delegate_->getInterfaceVersionAttribute();
 }
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
 namespace CommonAPI {
 template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::Consumer::ConsumerProxy,
+struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::ConsumerProxy,
     _AttributeExtension> {
-    typedef typename org::genivi::NodeStateManager::Consumer::ConsumerProxy<
-            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>, 
-            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>, 
-            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>, 
-            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>
+    typedef typename org::genivi::NodeStateManager::ConsumerProxy<
+            org::genivi::NodeStateManager::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>
     > class_t;
 };
 }
 
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
index 076f5cc..a226480 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
@@ -1,25 +1,12 @@
  /*
  * This file was generated by the CommonAPI Generators.
  *
-  * Copyright (C) 2012, BMW AG
+  * Copyright (C) 2013, BMW AG
   *
-  * This file is part of GENIVI Project AudioManager.
-  *
-  * Contributions are licensed to the GENIVI Alliance under one or more
-  * Contribution License Agreements.
-  *
-  * \copyright
-  * 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/.
-  *
-  *
-  * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-  *
-  * For further information see http://www.genivi.org/.
+  * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
  */
- #ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
  
  #include "Consumer.h"
  
@@ -39,76 +26,74 @@
  namespace org {
  namespace genivi {
  namespace NodeStateManager {
- namespace Consumer {
 
  class ConsumerProxyBase: virtual public CommonAPI::Proxy {
   public:
-     typedef CommonAPI::ObservableAttribute<int32_t> RestartReasonAttribute;
-     typedef CommonAPI::ObservableAttribute<int32_t> ShutdownReasonAttribute;
-     typedef CommonAPI::ObservableAttribute<int32_t> WakeUpReasonAttribute;
-     typedef CommonAPI::ObservableAttribute<int32_t> BootModeAttribute;
-     typedef CommonAPI::Event<int32_t> NodeStateEvent;
+     typedef CommonAPI::ReadonlyAttribute<int32_t> BootModeAttribute;
+     typedef CommonAPI::ReadonlyAttribute<int32_t> RestartReasonAttribute;
+     typedef CommonAPI::ReadonlyAttribute<int32_t> ShutdownReasonAttribute;
+     typedef CommonAPI::ReadonlyAttribute<int32_t> WakeUpReasonAttribute;
      typedef CommonAPI::Event<int32_t> NodeApplicationModeEvent;
      typedef CommonAPI::Event<std::string, int32_t, int32_t> SessionStateChangedEvent;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
+     typedef CommonAPI::Event<int32_t> NodeStateEvent;
      typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetAppHealthCountAsyncCallback;
-     typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
      typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestCompleteAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
 
+     virtual BootModeAttribute& getBootModeAttribute() = 0;
      virtual RestartReasonAttribute& getRestartReasonAttribute() = 0;
      virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0;
      virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0;
-     virtual BootModeAttribute& getBootModeAttribute() = 0;
 
-     virtual NodeStateEvent& getNodeStateEvent() = 0;
      virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0;
      virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0;
+     virtual NodeStateEvent& getNodeStateEvent() = 0;
 
 
-     virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
+     virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
 
-     virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) = 0;
+     virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
 
-     virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
+     virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
 
-     virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
+     virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
      virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0;
 
-     virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
-
-     virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
+     virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
 
      virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
      virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0;
 
-     virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
+     virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
 
-     virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
-     virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
+     virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
 
-     virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
-     virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
+     virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
 
-     virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
+     virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
+
+     virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) = 0;
  };
 
- } // namespace Consumer
  } // namespace NodeStateManager
  } // namespace genivi
  } // namespace org
 
- #endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ #endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
index 02fc7ae..4d4aebb 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
@@ -1,25 +1,12 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
 
 
 
@@ -36,7 +23,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 /**
  * Receives messages from remote and handles all dispatching of deserialized calls
@@ -46,21 +32,8 @@ namespace Consumer {
  */
 class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consumer {
  public:
-    ///Notifies all remote listeners about a change of value of the attribute RestartReason.
-    virtual void fireRestartReasonAttributeChanged(const int32_t& RestartReason) = 0;
-    ///Notifies all remote listeners about a change of value of the attribute ShutdownReason.
-    virtual void fireShutdownReasonAttributeChanged(const int32_t& ShutdownReason) = 0;
-    ///Notifies all remote listeners about a change of value of the attribute WakeUpReason.
-    virtual void fireWakeUpReasonAttributeChanged(const int32_t& WakeUpReason) = 0;
-    ///Notifies all remote listeners about a change of value of the attribute BootMode.
-    virtual void fireBootModeAttributeChanged(const int32_t& BootMode) = 0;
 
     /**
-     * Sends a broadcast event for NodeState. Should not be called directly.
-     * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
-     */
-    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-    /**
      * Sends a broadcast event for NodeApplicationMode. Should not be called directly.
      * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
      */
@@ -70,6 +43,11 @@ class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consume
      * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
      */
     virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+    /**
+     * Sends a broadcast event for NodeState. Should not be called directly.
+     * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
+     */
+    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
 };
 
 
@@ -89,6 +67,11 @@ class ConsumerStubRemoteEvent {
  public:
     virtual ~ConsumerStubRemoteEvent() { }
 
+    /// Verification callback for remote set requests on the attribute BootMode.
+    virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
+    /// Action callback for remote set requests on the attribute BootMode.
+    virtual void onRemoteBootModeAttributeChanged() = 0;
+
     /// Verification callback for remote set requests on the attribute RestartReason.
     virtual bool onRemoteSetRestartReasonAttribute(int32_t RestartReason) = 0;
     /// Action callback for remote set requests on the attribute RestartReason.
@@ -104,11 +87,6 @@ class ConsumerStubRemoteEvent {
     /// Action callback for remote set requests on the attribute WakeUpReason.
     virtual void onRemoteWakeUpReasonAttributeChanged() = 0;
 
-    /// Verification callback for remote set requests on the attribute BootMode.
-    virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
-    /// Action callback for remote set requests on the attribute BootMode.
-    virtual void onRemoteBootModeAttributeChanged() = 0;
-
 };
 
 
@@ -122,49 +100,48 @@ class ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRe
  public:
     virtual ~ConsumerStub() { }
 
+    /// Provides getter access to the attribute BootMode.
+    virtual const int32_t& getBootModeAttribute() = 0;
     /// Provides getter access to the attribute RestartReason.
     virtual const int32_t& getRestartReasonAttribute() = 0;
     /// Provides getter access to the attribute ShutdownReason.
     virtual const int32_t& getShutdownReasonAttribute() = 0;
     /// Provides getter access to the attribute WakeUpReason.
     virtual const int32_t& getWakeUpReasonAttribute() = 0;
-    /// Provides getter access to the attribute BootMode.
-    virtual const int32_t& getBootModeAttribute() = 0;
 
-    /// This is the method that will be called on remote calls on the method GetNodeState.
-    virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method SetSessionState.
-    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method GetSessionState.
-    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method GetApplicationMode.
-    virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
-    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
-    virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method RegisterSession.
-    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
-    /// This is the method that will be called on remote calls on the method UnRegisterSession.
-    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
     /// This is the method that will be called on remote calls on the method GetAppHealthCount.
     virtual void GetAppHealthCount(uint32_t& Count) = 0;
-    /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
-    virtual void GetInterfaceVersion(uint32_t& Version) = 0;
     /// This is the method that will be called on remote calls on the method LifecycleRequestComplete.
     virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
+    virtual void GetInterfaceVersion(uint32_t& Version) = 0;
+    /// This is the method that will be called on remote calls on the method GetApplicationMode.
+    virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
+    /// This is the method that will be called on remote calls on the method UnRegisterSession.
+    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method RegisterSession.
+    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
+    virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
+    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method GetNodeState.
+    virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) = 0;
+    /// This is the method that will be called on remote calls on the method GetSessionState.
+    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method SetSessionState.
+    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) = 0;
     
-    /// Sends a broadcast event for NodeState.
-    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
     /// Sends a broadcast event for NodeApplicationMode.
     virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
     /// Sends a broadcast event for SessionStateChanged.
     virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+    /// Sends a broadcast event for NodeState.
+    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
 };
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
index f923d1d..2cacb2f 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
@@ -1,29 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h>
+#include <org/genivi/NodeStateManager/ConsumerStubDefault.h>
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 ConsumerStubDefault::ConsumerStubDefault():
         remoteEventHandler_(this) {
@@ -34,14 +20,45 @@ ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_
     return &remoteEventHandler_;
 }
 
+const int32_t& ConsumerStubDefault::getBootModeAttribute() {
+    return bootModeAttributeValue_;
+}
+
+void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
+    trySetBootModeAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
+    // No operation in default
+}
+
+bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
+    if (!validateBootModeAttributeRequestedValue(value))
+        return false;
+
+    const bool valueChanged = (bootModeAttributeValue_ != value);
+    bootModeAttributeValue_ = std::move(value);
+    return valueChanged;
+}
+
+bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
+    return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
+    return defaultStub_->trySetBootModeAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
+    defaultStub_->onRemoteBootModeAttributeChanged();
+}
+
 const int32_t& ConsumerStubDefault::getRestartReasonAttribute() {
     return restartReasonAttributeValue_;
 }
 
 void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) {
-    const bool valueChanged = trySetRestartReasonAttribute(std::move(value));
-    if (valueChanged)
-        stubAdapter_->fireRestartReasonAttributeChanged(restartReasonAttributeValue_);
+    trySetRestartReasonAttribute(std::move(value));
 }
 
 void ConsumerStubDefault::onRemoteRestartReasonAttributeChanged() {
@@ -74,9 +91,7 @@ const int32_t& ConsumerStubDefault::getShutdownReasonAttribute() {
 }
 
 void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) {
-    const bool valueChanged = trySetShutdownReasonAttribute(std::move(value));
-    if (valueChanged)
-        stubAdapter_->fireShutdownReasonAttributeChanged(shutdownReasonAttributeValue_);
+    trySetShutdownReasonAttribute(std::move(value));
 }
 
 void ConsumerStubDefault::onRemoteShutdownReasonAttributeChanged() {
@@ -109,9 +124,7 @@ const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute() {
 }
 
 void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) {
-    const bool valueChanged = trySetWakeUpReasonAttribute(std::move(value));
-    if (valueChanged)
-        stubAdapter_->fireWakeUpReasonAttributeChanged(wakeUpReasonAttributeValue_);
+    trySetWakeUpReasonAttribute(std::move(value));
 }
 
 void ConsumerStubDefault::onRemoteWakeUpReasonAttributeChanged() {
@@ -139,59 +152,28 @@ void ConsumerStubDefault::RemoteEventHandler::onRemoteWakeUpReasonAttributeChang
     defaultStub_->onRemoteWakeUpReasonAttributeChanged();
 }
 
-const int32_t& ConsumerStubDefault::getBootModeAttribute() {
-    return bootModeAttributeValue_;
-}
 
-void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
-    const bool valueChanged = trySetBootModeAttribute(std::move(value));
-    if (valueChanged)
-        stubAdapter_->fireBootModeAttributeChanged(bootModeAttributeValue_);
-}
-
-void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
+void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
     // No operation in default
 }
 
-bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
-    if (!validateBootModeAttributeRequestedValue(value))
-        return false;
-
-    const bool valueChanged = (bootModeAttributeValue_ != value);
-    bootModeAttributeValue_ = std::move(value);
-    return valueChanged;
-}
-
-bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
-    return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
-    return defaultStub_->trySetBootModeAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
-    defaultStub_->onRemoteBootModeAttributeChanged();
-}
-
-
-void ConsumerStubDefault::GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) {
+void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
     // No operation in default
 }
 
-void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
+void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
     // No operation in default
 }
 
-void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
+void ConsumerStubDefault::GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) {
     // No operation in default
 }
 
-void ConsumerStubDefault::GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) {
+void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
     // No operation in default
 }
 
-void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
+void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
     // No operation in default
 }
 
@@ -199,42 +181,37 @@ void ConsumerStubDefault::UnRegisterShutdownClient(std::string BusName, std::str
     // No operation in default
 }
 
-void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
-    // No operation in default
-}
-
-void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
+void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
     // No operation in default
 }
 
-void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
+void ConsumerStubDefault::GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) {
     // No operation in default
 }
 
-void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
+void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
     // No operation in default
 }
 
-void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
+void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) {
     // No operation in default
 }
 
 
-void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
-    stubAdapter_->fireNodeStateEvent(NodeState);
-}
 void ConsumerStubDefault::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
     stubAdapter_->fireNodeApplicationModeEvent(ApplicationModeId);
 }
 void ConsumerStubDefault::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
     stubAdapter_->fireSessionStateChangedEvent(SessionStateName, SeatID, SessionState);
 }
+void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
+    stubAdapter_->fireNodeStateEvent(NodeState);
+}
 
 ConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(ConsumerStubDefault* defaultStub):
         defaultStub_(defaultStub) {
 }
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
index 76b7f8c..7cc92f9 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
@@ -1,32 +1,18 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
 
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
+#include <org/genivi/NodeStateManager/ConsumerStub.h>
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace Consumer {
 
 /**
  * Provides a default implementation for ConsumerStubRemoteEvent and
@@ -44,6 +30,9 @@ class ConsumerStubDefault : public ConsumerStub {
 
     ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
 
+    virtual const int32_t& getBootModeAttribute();
+    virtual void setBootModeAttribute(int32_t value);
+
     virtual const int32_t& getRestartReasonAttribute();
     virtual void setRestartReasonAttribute(int32_t value);
 
@@ -53,38 +42,39 @@ class ConsumerStubDefault : public ConsumerStub {
     virtual const int32_t& getWakeUpReasonAttribute();
     virtual void setWakeUpReasonAttribute(int32_t value);
 
-    virtual const int32_t& getBootModeAttribute();
-    virtual void setBootModeAttribute(int32_t value);
 
+    virtual void GetAppHealthCount(uint32_t& Count);
 
-    virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode);
+    virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
 
-    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
+    virtual void GetInterfaceVersion(uint32_t& Version);
 
-    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
+    virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId);
 
-    virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode);
+    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
 
-    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
+    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
 
     virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode);
 
-    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
-
-    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
+    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
 
-    virtual void GetAppHealthCount(uint32_t& Count);
+    virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId);
 
-    virtual void GetInterfaceVersion(uint32_t& Version);
+    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
 
-    virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
+    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode);
 
     
-    virtual void fireNodeStateEvent(const int32_t& NodeState);
     virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
     virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+    virtual void fireNodeStateEvent(const int32_t& NodeState);
 
  protected:
+    virtual void onRemoteBootModeAttributeChanged();
+    virtual bool trySetBootModeAttribute(int32_t value);
+    virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
+
     virtual void onRemoteRestartReasonAttributeChanged();
     virtual bool trySetRestartReasonAttribute(int32_t value);
     virtual bool validateRestartReasonAttributeRequestedValue(const int32_t& value);
@@ -97,16 +87,15 @@ class ConsumerStubDefault : public ConsumerStub {
     virtual bool trySetWakeUpReasonAttribute(int32_t value);
     virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
 
-    virtual void onRemoteBootModeAttributeChanged();
-    virtual bool trySetBootModeAttribute(int32_t value);
-    virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
-
     
  private:
     class RemoteEventHandler: public ConsumerStubRemoteEvent {
      public:
         RemoteEventHandler(ConsumerStubDefault* defaultStub);
 
+        virtual bool onRemoteSetBootModeAttribute(int32_t value);
+        virtual void onRemoteBootModeAttributeChanged();
+
         virtual bool onRemoteSetRestartReasonAttribute(int32_t value);
         virtual void onRemoteRestartReasonAttributeChanged();
 
@@ -116,9 +105,6 @@ class ConsumerStubDefault : public ConsumerStub {
         virtual bool onRemoteSetWakeUpReasonAttribute(int32_t value);
         virtual void onRemoteWakeUpReasonAttributeChanged();
 
-        virtual bool onRemoteSetBootModeAttribute(int32_t value);
-        virtual void onRemoteBootModeAttributeChanged();
-
 
      private:
         ConsumerStubDefault* defaultStub_;
@@ -127,15 +113,14 @@ class ConsumerStubDefault : public ConsumerStub {
     RemoteEventHandler remoteEventHandler_;
     std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
 
+    int32_t bootModeAttributeValue_;
     int32_t restartReasonAttributeValue_;
     int32_t shutdownReasonAttributeValue_;
     int32_t wakeUpReasonAttributeValue_;
-    int32_t bootModeAttributeValue_;
 };
 
-} // namespace Consumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
new file mode 100644
index 0000000..674e11b
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2013, BMW AG
+ *
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+class LifeCycleConsumer {
+ public:
+    virtual ~LifeCycleConsumer() { }
+
+    static inline const char* getInterfaceId();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* LifeCycleConsumer::getInterfaceId() {
+    return "org.genivi.NodeStateManager.LifeCycleConsumer";
+}
+
+CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
+    return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+    //hashes for types
+    
+    //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
deleted file mode 100644
index d4e071d..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-class LifeCycleConsumer {
- public:
-    virtual ~LifeCycleConsumer() { }
-
-    static inline const char* getInterfaceId();
-    static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* LifeCycleConsumer::getInterfaceId() {
-    return "org.genivi.NodeStateManager.LifeCycleConsumer.LifeCycleConsumer";
-}
-
-CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
-    return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
-    //hashes for types
-    
-    //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
index 5df88da..40f18e6 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
@@ -1,29 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
 #include "LifeCycleConsumerDBusProxy.h"
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy(
                     const std::string& commonApiAddress,
@@ -72,11 +58,10 @@ std::future<CommonAPI::CallStatus> LifeCycleConsumerDBusProxy::LifecycleRequestA
 }
 
 void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-    ownVersionMajor = 0;
-    ownVersionMinor = 1;
+    ownVersionMajor = 1;
+    ownVersionMinor = 0;
 }
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
index 7c4522d..351558d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
@@ -1,27 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
 
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h>
 
 #define COMMONAPI_INTERNAL_COMPILATION
 
@@ -35,7 +22,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
  public:
@@ -60,9 +46,8 @@ class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, vir
 
 };
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
index e408a47..f59fb96 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
@@ -1,30 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
 #include "LifeCycleConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumer.h>
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStubAdapter(
                    const std::string& commonApiAddress,
@@ -71,12 +57,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
 template<>
-const org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
-    { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::LifeCycleConsumer::lifecycleRequestStubDispatcher }
+const org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
+    { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
 };
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
index 74e41a4..e6073ea 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
@@ -1,27 +1,14 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
 
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
 
 #define COMMONAPI_INTERNAL_COMPILATION
 
@@ -33,7 +20,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
 
@@ -53,9 +39,8 @@ class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, pub
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
 };
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
index f8e21ed..9289e83 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
@@ -1,25 +1,12 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
 
 #include "LifeCycleConsumerProxyBase.h"
 
@@ -31,7 +18,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 template <typename ... _AttributeExtensions>
 class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
@@ -156,11 +142,10 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension
     return delegate_->getInterfaceVersionAttribute();
 }
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
 
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
index 3e780d0..7ee8471 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
@@ -1,25 +1,12 @@
  /*
  * This file was generated by the CommonAPI Generators.
  *
-  * Copyright (C) 2012, BMW AG
+  * Copyright (C) 2013, BMW AG
   *
-  * This file is part of GENIVI Project AudioManager.
-  *
-  * Contributions are licensed to the GENIVI Alliance under one or more
-  * Contribution License Agreements.
-  *
-  * \copyright
-  * 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/.
-  *
-  *
-  * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-  *
-  * For further information see http://www.genivi.org/.
+  * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
  */
- #ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
  
  #include "LifeCycleConsumer.h"
  
@@ -37,7 +24,6 @@
  namespace org {
  namespace genivi {
  namespace NodeStateManager {
- namespace LifeCycleConsumer {
 
  class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy {
   public:
@@ -50,9 +36,8 @@
      virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0;
  };
 
- } // namespace LifeCycleConsumer
  } // namespace NodeStateManager
  } // namespace genivi
  } // namespace org
 
- #endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
index f4d9d80..b7d83fd 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
@@ -1,25 +1,12 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
 
 
 
@@ -36,7 +23,6 @@
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 /**
  * Receives messages from remote and handles all dispatching of deserialized calls
@@ -85,9 +71,8 @@ class LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapte
     
 };
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
index 92df0f0..cc7dbfd 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
@@ -1,29 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
         remoteEventHandler_(this) {
@@ -45,7 +31,6 @@ LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleCo
         defaultStub_(defaultStub) {
 }
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
index 6c5f402..22e86ab 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
@@ -1,32 +1,18 @@
 /*
 * This file was generated by the CommonAPI Generators.
 *
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
  *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
 */
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
 
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
 
 namespace org {
 namespace genivi {
 namespace NodeStateManager {
-namespace LifeCycleConsumer {
 
 /**
  * Provides a default implementation for LifeCycleConsumerStubRemoteEvent and
@@ -66,9 +52,8 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
 
 };
 
-} // namespace LifeCycleConsumer
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
 
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_