* fix [GAM-28] problems in routingsender.cpp

* [GAM-27] major refactoring: bringing everything to standardized names
* Enhancement of CAmSerializer.h
* improvement of documentation
* adoption & regeneration of inerfaces

4 files changed, 505 insertions, 495 deletions

diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
new file mode 100644
index 0000000..cb5b838
--- /dev/null
+++ b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
@@ -0,0 +1,331 @@
+/**
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger DbusPlugin
+ *
+ * \file CAmCommandSender.cpp
+ *
+ * \date 20-Oct-2011 3:42:04 PM
+ * \author Christian Mueller (christian.ei.mueller@bmw.de)
+ *
+ * \section License
+ * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
+ * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
+ * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
+ * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
+ * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
+ * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+ *
+ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+ */
+
+#include "CAmCommandSenderDbus.h"
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <cassert>
+#include <set>
+#include "CAmDbusMessageHandler.h"
+#include "shared/CAmDltWrapper.h"
+#include "shared/CAmDbusWrapper.h"
+
+
+DLT_DECLARE_CONTEXT(commandDbus)
+
+using namespace am;
+
+/**
+ * factory for plugin loading
+ */
+extern "C" IAmCommandSend* PluginCommandInterfaceDbusFactory()
+{
+    return (new CAmCommandSenderDbus());
+}
+
+/**
+ * destroy instance of commandSendInterface
+ */
+extern "C" void destroyRoutingPluginInterfaceDbus(IAmCommandSend* commandSendInterface)
+{
+    delete commandSendInterface;
+}
+
+CAmCommandSenderDbus::CAmCommandSenderDbus() :
+        mCAmDbusMessageHandler(), //
+        mIAmCommandReceiverShadow(), //
+        mpCAmDbusWrapper(NULL), //
+        mpIAmCommandReceive(NULL), //
+        mReady(false)
+{
+    CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
+    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender constructor called");
+}
+
+CAmCommandSenderDbus::~CAmCommandSenderDbus()
+{
+    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender destructed");
+    CAmDltWrapper::instance()->unregisterContext(commandDbus);
+}
+
+am_Error_e CAmCommandSenderDbus::startupInterface(IAmCommandReceive* commandreceiveinterface)
+{
+    log(&commandDbus, DLT_LOG_INFO, "startupInterface called");
+
+    mpIAmCommandReceive = commandreceiveinterface;
+    mIAmCommandReceiverShadow.setCommandReceiver(mpIAmCommandReceive);
+    mpIAmCommandReceive->getDBusConnectionWrapper(mpCAmDbusWrapper);
+    assert(mpCAmDbusWrapper!=NULL);
+    DBusConnection * connection;
+    mpCAmDbusWrapper->getDBusConnection(connection);
+    assert(connection!=NULL);
+    mCAmDbusMessageHandler.setDBusConnection(connection);
+    return (E_OK);
+}
+
+void CAmCommandSenderDbus::setCommandReady(const uint16_t handle)
+{
+    //todo:implement handle handling
+    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationReady called");
+    mReady = true;
+    mpIAmCommandReceive->confirmCommandReady(handle);
+}
+
+void CAmCommandSenderDbus::setCommandRundown(const uint16_t handle)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationRundown called");
+    mReady = false;
+    mpIAmCommandReceive->confirmCommandRundown(handle);
+    /**
+     * todo: implement DbusCommandSender::cbCommunicationRundown()
+     */
+}
+
+void CAmCommandSenderDbus::cbNewMainConnection(const am_MainConnectionType_s mainConnection)
+{
+    (void)mainConnection;
+    //todo: change xml and interface to differetiate between new connection and removed one
+    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbRemovedMainConnection(const am_mainConnectionID_t mainConnection)
+{
+    (void)mainConnection;
+//todo: change xml and interface to differetiate between new connection and removed one
+    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbNewSink(const am_SinkType_s& sink)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbNewSink called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SinkAdded");
+        mCAmDbusMessageHandler.append(sink);
+
+        log(&commandDbus, DLT_LOG_INFO, "send signal SinkAdded");
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbRemovedSink(const am_sinkID_t sinkID)
+{
+    //todo: check if this really works!
+    log(&commandDbus, DLT_LOG_INFO, "cbRemovedSink called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SinkRemoved");
+        mCAmDbusMessageHandler.append(sinkID);
+
+        log(&commandDbus, DLT_LOG_INFO, "send signal SinkAdded");
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbNewSource(const am_SourceType_s& source)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSourcesChanged called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SourceAdded");
+        mCAmDbusMessageHandler.append(source);
+
+        log(&commandDbus, DLT_LOG_INFO, "send signal SourceAdded");
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void am::CAmCommandSenderDbus::cbRemovedSource(const am_sourceID_t source)
+{
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SourceRemoved");
+        mCAmDbusMessageHandler.append(source);
+
+        log(&commandDbus, DLT_LOG_INFO, "send signal SourceRemoved");
+
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbNumberOfSinkClassesChanged()
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSinkClassesChanged called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSinkClassesChanged"));
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbNumberOfSourceClassesChanged()
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSourceClassesChanged called");
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSourceClassesChanged"));
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbMainConnectionStateChanged called, connectionID=", connectionID, "connectionState=", connectionState);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainConnectionStateChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) connectionID);
+        mCAmDbusMessageHandler.append((dbus_int16_t) connectionState);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s & soundProperty)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbMainSinkSoundPropertyChanged called, sinkID", sinkID, "SoundProperty.type", soundProperty.type, "SoundProperty.value", soundProperty.value);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSinkSoundPropertyChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
+        mCAmDbusMessageHandler.append(soundProperty);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbMainSourceSoundPropertyChanged called, sourceID", sourceID, "SoundProperty.type", SoundProperty.type, "SoundProperty.value", SoundProperty.value);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSourceSoundPropertyChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sourceID);
+        mCAmDbusMessageHandler.append(SoundProperty);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbSinkAvailabilityChanged called, sinkID", sinkID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkAvailabilityChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
+        mCAmDbusMessageHandler.append(availability);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbSourceAvailabilityChanged called, sourceID", sourceID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SourceAvailabilityChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sourceID);
+        mCAmDbusMessageHandler.append(availability);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbVolumeChanged called, sinkID", sinkID, "volume", volume);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("VolumeChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
+        mCAmDbusMessageHandler.append((dbus_int16_t) volume);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbSinkMuteStateChanged called, sinkID", sinkID, "muteState", muteState);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkMuteStateChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
+        mCAmDbusMessageHandler.append((dbus_int16_t) muteState);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::cbSystemPropertyChanged(const am_SystemProperty_s & SystemProperty)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbSystemPropertyChanged called, SystemProperty.type", SystemProperty.type, "SystemProperty.value", SystemProperty.value);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SystemPropertyChanged"));
+        mCAmDbusMessageHandler.append(SystemProperty);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void am::CAmCommandSenderDbus::cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time)
+{
+    log(&commandDbus, DLT_LOG_INFO, "cbTimingInformationChanged called, mainConnectionID=", mainConnectionID, "time=", time);
+
+    if (mReady)
+    {
+        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("TimingInformationChanged"));
+        mCAmDbusMessageHandler.append((dbus_uint16_t) mainConnectionID);
+        mCAmDbusMessageHandler.append((dbus_int16_t) time);
+        mCAmDbusMessageHandler.sendMessage();
+    }
+}
+
+void CAmCommandSenderDbus::getInterfaceVersion(std::string & version) const
+{
+    version = CommandSendVersion;
+}
+
diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
index 3dd9172..6b2dc3f 100644
--- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp
+++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
@@ -22,40 +22,42 @@
  *
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
  */
-#include <config.h>
-#include "DBusMessageHandler.h"
-#include "DBusCommandSender.h"
-#include "DLTWrapper.h"
-#include <stdlib.h>
+
+#include "CAmDbusMessageHandler.h"
+#include "config.h"
+#include <cstdlib>
 #include <cassert>
 #include <vector>
+#include "CAmCommandSenderDbus.h"
+#include "shared/CAmDltWrapper.h"
 
 DLT_IMPORT_CONTEXT(commandDbus)
 
-using namespace am;
+namespace am
+{
 
-DBusMessageHandler::DBusMessageHandler() :
+CAmDbusMessageHandler::CAmDbusMessageHandler() :
         mDBusMessageIter(), //
         mDBusError(), //
         mSerial(0), //
         mErrorName(""), //
         mErrorMsg(""), //
-        mDbusMessage(NULL), //
-        mReveiveMessage(NULL), //
-        mDBusConnection(NULL)
+        mpDBusMessage(NULL), //
+        mpReveiveMessage(NULL), //
+        mpDBusConnection(NULL)
 {
     log(&commandDbus, DLT_LOG_INFO, "DBusMessageHandler constructed");
 }
 
-DBusMessageHandler::~DBusMessageHandler()
+CAmDbusMessageHandler::~CAmDbusMessageHandler()
 {
     log(&commandDbus, DLT_LOG_INFO, "DBUSMessageHandler destructed");
 }
 
-void DBusMessageHandler::initReceive(DBusMessage* msg)
+void CAmDbusMessageHandler::initReceive(DBusMessage* msg)
 {
     assert(msg!=NULL);
-    mReveiveMessage = msg;
+    mpReveiveMessage = msg;
     if (!dbus_message_iter_init(msg, &mDBusMessageIter))
     {
         log(&commandDbus, DLT_LOG_INFO, "DBusMessageHandler::initReceive DBus Message has no arguments!");
@@ -64,39 +66,39 @@ void DBusMessageHandler::initReceive(DBusMessage* msg)
     }
 }
 
-void DBusMessageHandler::initReply(DBusMessage* msg)
+void CAmDbusMessageHandler::initReply(DBusMessage* msg)
 {
     assert(msg!=NULL);
-    mDbusMessage = dbus_message_new_method_return(msg);
-    if (mDbusMessage == NULL)
+    mpDBusMessage = dbus_message_new_method_return(msg);
+    if (mpDBusMessage == NULL)
     {
         log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::initReply Cannot allocate DBus message!");
         mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
         mErrorMsg = "Cannot create reply!";
     }
-    dbus_message_iter_init_append(mDbusMessage, &mDBusMessageIter);
+    dbus_message_iter_init_append(mpDBusMessage, &mDBusMessageIter);
 }
 
-void DBusMessageHandler::initSignal(std::string path, std::string signalName)
+void CAmDbusMessageHandler::initSignal(std::string path, std::string signalName)
 {
     assert(!path.empty());
     assert(!signalName.empty());
     std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path;
-    mDbusMessage = dbus_message_new_signal(completePath.c_str(), DBUS_SERVICE_PREFIX, signalName.c_str());
+    mpDBusMessage = dbus_message_new_signal(completePath.c_str(), DBUS_SERVICE_PREFIX, signalName.c_str());
 
-    if (mDbusMessage == NULL)
+    if (mpDBusMessage == NULL)
     {
         log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::initSignal Cannot allocate DBus message!");
     }
-    dbus_message_iter_init_append(mDbusMessage, &mDBusMessageIter);
+    dbus_message_iter_init_append(mpDBusMessage, &mDBusMessageIter);
 }
 
-void DBusMessageHandler::sendMessage()
+void CAmDbusMessageHandler::sendMessage()
 {
-    assert(mDBusConnection!=NULL);
-    if (mReveiveMessage != 0)
+    assert(mpDBusConnection!=NULL);
+    if (mpReveiveMessage != 0)
     {
-        mSerial = dbus_message_get_serial(mReveiveMessage);
+        mSerial = dbus_message_get_serial(mpReveiveMessage);
     }
     else
     {
@@ -104,18 +106,18 @@ void DBusMessageHandler::sendMessage()
     }
     if (!mErrorName.empty())
     {
-        mDbusMessage = dbus_message_new_error(mReveiveMessage, mErrorName.c_str(), mErrorMsg.c_str());
+        mpDBusMessage = dbus_message_new_error(mpReveiveMessage, mErrorName.c_str(), mErrorMsg.c_str());
     }
-    if (!dbus_connection_send(mDBusConnection, mDbusMessage, &mSerial))
+    if (!dbus_connection_send(mpDBusConnection, mpDBusMessage, &mSerial))
     {
         log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::sendMessage cannot send message!");
     }
-    dbus_connection_flush(mDBusConnection);
-    dbus_message_unref(mDbusMessage);
-    mDbusMessage = NULL;
+    dbus_connection_flush(mpDBusConnection);
+    dbus_message_unref(mpDBusMessage);
+    mpDBusMessage = NULL;
 }
 
-char* DBusMessageHandler::getString()
+char* CAmDbusMessageHandler::getString()
 {
     char* param = NULL;
 
@@ -133,7 +135,7 @@ char* DBusMessageHandler::getString()
     return (param);
 }
 
-dbus_bool_t DBusMessageHandler::getBool()
+dbus_bool_t CAmDbusMessageHandler::getBool()
 {
     dbus_bool_t boolparam = false;
 
@@ -151,7 +153,7 @@ dbus_bool_t DBusMessageHandler::getBool()
     return (boolparam);
 }
 
-char DBusMessageHandler::getByte()
+char CAmDbusMessageHandler::getByte()
 {
     char param;
 
@@ -169,7 +171,7 @@ char DBusMessageHandler::getByte()
     return (param);
 }
 
-dbus_uint16_t DBusMessageHandler::getUInt()
+dbus_uint16_t CAmDbusMessageHandler::getUInt()
 {
     dbus_uint16_t param;
 
@@ -191,7 +193,7 @@ dbus_uint16_t DBusMessageHandler::getUInt()
     return (param);
 }
 
-dbus_int16_t DBusMessageHandler::getInt()
+dbus_int16_t CAmDbusMessageHandler::getInt()
 {
     dbus_int16_t param;
 
@@ -213,7 +215,7 @@ dbus_int16_t DBusMessageHandler::getInt()
     return (param);
 }
 
-double DBusMessageHandler::getDouble()
+double CAmDbusMessageHandler::getDouble()
 {
     double param;
     if (DBUS_TYPE_DOUBLE != dbus_message_iter_get_arg_type(&mDBusMessageIter))
@@ -230,7 +232,7 @@ double DBusMessageHandler::getDouble()
     return (param);
 }
 
-void DBusMessageHandler::getProperty(dbus_int16_t & type, dbus_int16_t & value)
+void CAmDbusMessageHandler::getProperty(dbus_int16_t & type, dbus_int16_t & value)
 {
     DBusMessageIter arrayIter;
     if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter))
@@ -249,7 +251,7 @@ void DBusMessageHandler::getProperty(dbus_int16_t & type, dbus_int16_t & value)
     }
 }
 
-void DBusMessageHandler::append(bool toAppend)
+void CAmDbusMessageHandler::append(bool toAppend)
 {
     dbus_bool_t mybool = toAppend;
     if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_BOOLEAN, &mybool))
@@ -260,7 +262,7 @@ void DBusMessageHandler::append(bool toAppend)
     }
 }
 
-void DBusMessageHandler::append(double toAppend)
+void CAmDbusMessageHandler::append(double toAppend)
 {
     if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_DOUBLE, &toAppend))
     {
@@ -270,7 +272,7 @@ void DBusMessageHandler::append(double toAppend)
     }
 }
 
-void DBusMessageHandler::append(char toAppend)
+void CAmDbusMessageHandler::append(char toAppend)
 {
     if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_BYTE, &toAppend))
     {
@@ -280,7 +282,7 @@ void DBusMessageHandler::append(char toAppend)
     }
 }
 
-void DBusMessageHandler::append(dbus_int16_t toAppend)
+void CAmDbusMessageHandler::append(dbus_int16_t toAppend)
 {
     if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_INT16, &toAppend))
     {
@@ -290,7 +292,7 @@ void DBusMessageHandler::append(dbus_int16_t toAppend)
     }
 }
 
-void DBusMessageHandler::append(dbus_uint16_t toAppend)
+void CAmDbusMessageHandler::append(dbus_uint16_t toAppend)
 {
     if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_UINT16, &toAppend))
     {
@@ -300,13 +302,13 @@ void DBusMessageHandler::append(dbus_uint16_t toAppend)
     }
 }
 
-void DBusMessageHandler::setDBusConnection(DBusConnection *& connection)
+void CAmDbusMessageHandler::setDBusConnection(DBusConnection *& connection)
 {
     assert(connection!=NULL);
-    mDBusConnection = connection;
+    mpDBusConnection = connection;
 }
 
-void DBusMessageHandler::append(const am::am_SinkType_s& sinkType)
+void CAmDbusMessageHandler::append(const am::am_SinkType_s& sinkType)
 {
     DBusMessageIter structIter;
     DBusMessageIter structAvailIter;
@@ -333,7 +335,7 @@ void DBusMessageHandler::append(const am::am_SinkType_s& sinkType)
     }
 }
 
-void DBusMessageHandler::append(const am::am_SourceType_s & sourceType)
+void CAmDbusMessageHandler::append(const am::am_SourceType_s & sourceType)
 {
     DBusMessageIter structIter;
     DBusMessageIter structAvailIter;
@@ -358,7 +360,7 @@ void DBusMessageHandler::append(const am::am_SourceType_s & sourceType)
     }
 }
 
-void DBusMessageHandler::append(const am::am_MainSoundProperty_s mainSoundProperty)
+void CAmDbusMessageHandler::append(const am::am_MainSoundProperty_s mainSoundProperty)
 {
     DBusMessageIter structIter;
     dbus_bool_t success = true;
@@ -375,7 +377,7 @@ void DBusMessageHandler::append(const am::am_MainSoundProperty_s mainSoundProper
     }
 }
 
-void DBusMessageHandler::append(const am::am_Availability_s & availability)
+void CAmDbusMessageHandler::append(const am::am_Availability_s & availability)
 {
     DBusMessageIter structAvailIter;
     dbus_bool_t success = true;
@@ -392,7 +394,7 @@ void DBusMessageHandler::append(const am::am_Availability_s & availability)
     }
 }
 
-void DBusMessageHandler::append(const am::am_SystemProperty_s & SystemProperty)
+void CAmDbusMessageHandler::append(const am::am_SystemProperty_s & SystemProperty)
 {
     DBusMessageIter structIter;
     dbus_bool_t success = true;
@@ -409,7 +411,7 @@ void DBusMessageHandler::append(const am::am_SystemProperty_s & SystemProperty)
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_MainConnectionType_s>& listMainConnections)
+void CAmDbusMessageHandler::append(const std::vector<am::am_MainConnectionType_s>& listMainConnections)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -437,7 +439,7 @@ void DBusMessageHandler::append(const std::vector<am::am_MainConnectionType_s>&
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_SinkType_s> & listMainSinks)
+void CAmDbusMessageHandler::append(const std::vector<am::am_SinkType_s> & listMainSinks)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -470,7 +472,7 @@ void DBusMessageHandler::append(const std::vector<am::am_SinkType_s> & listMainS
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_SourceType_s> & listMainSources)
+void CAmDbusMessageHandler::append(const std::vector<am::am_SourceType_s> & listMainSources)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -501,7 +503,7 @@ void DBusMessageHandler::append(const std::vector<am::am_SourceType_s> & listMai
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_MainSoundProperty_s> & listMainSoundProperties)
+void CAmDbusMessageHandler::append(const std::vector<am::am_MainSoundProperty_s> & listMainSoundProperties)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -526,7 +528,7 @@ void DBusMessageHandler::append(const std::vector<am::am_MainSoundProperty_s> &
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_SourceClass_s> & listSourceClasses)
+void CAmDbusMessageHandler::append(const std::vector<am::am_SourceClass_s> & listSourceClasses)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -564,7 +566,7 @@ void DBusMessageHandler::append(const std::vector<am::am_SourceClass_s> & listSo
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_SinkClass_s> & listSinkClasses)
+void CAmDbusMessageHandler::append(const std::vector<am::am_SinkClass_s> & listSinkClasses)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -602,7 +604,7 @@ void DBusMessageHandler::append(const std::vector<am::am_SinkClass_s> & listSink
     }
 }
 
-void DBusMessageHandler::append(const std::vector<am::am_SystemProperty_s> & listSystemProperties)
+void CAmDbusMessageHandler::append(const std::vector<am::am_SystemProperty_s> & listSystemProperties)
 {
     DBusMessageIter arrayIter;
     DBusMessageIter structIter;
@@ -626,4 +628,4 @@ void DBusMessageHandler::append(const std::vector<am::am_SystemProperty_s> & lis
         mErrorMsg = "Cannot create reply!";
     }
 }
-
+}
diff --git a/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp
deleted file mode 100644
index de577c9..0000000
--- a/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/**
- * Copyright (C) 2011, BMW AG
- *
- * GeniviAudioMananger DbusPlugin
- *
- * \file CommandSender.cpp
- *
- * \date 20-Oct-2011 3:42:04 PM
- * \author Christian Mueller (christian.ei.mueller@bmw.de)
- *
- * \section License
- * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
- * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
- * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
- * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
- * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
- * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
- *
- * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
- */
-
-#include <command/CommandReceiveInterface.h>
-#include <dbus/DBusWrapper.h>
-#include "DBusCommandSender.h"
-#include "DBusMessageHandler.h"
-#include "DLTWrapper.h"
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <cassert>
-#include <set>
-
-DLT_DECLARE_CONTEXT(commandDbus)
-
-using namespace am;
-
-/**
- * factory for plugin loading
- */
-extern "C" CommandSendInterface* PluginCommandInterfaceDbusFactory()
-{
-    return (new DbusCommandSender());
-}
-
-/**
- * destroy instance of commandSendInterface
- */
-extern "C" void destroyRoutingPluginInterfaceDbus(CommandSendInterface* commandSendInterface)
-{
-    delete commandSendInterface;
-}
-
-DbusCommandSender::DbusCommandSender() :
-        mDBUSMessageHandler(), //
-        mCommandReceiverShadow(), //
-        mDBusWrapper(NULL), //
-        mCommandReceiveInterface(NULL), //
-        mReady(false)
-{
-    DLTWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
-    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender constructor called");
-}
-
-DbusCommandSender::~DbusCommandSender()
-{
-    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender destructed");
-    DLTWrapper::instance()->unregisterContext(commandDbus);
-}
-
-am_Error_e DbusCommandSender::startupInterface(CommandReceiveInterface* commandreceiveinterface)
-{
-    log(&commandDbus, DLT_LOG_INFO, "startupInterface called");
-
-    mCommandReceiveInterface = commandreceiveinterface;
-    mCommandReceiverShadow.setCommandReceiver(mCommandReceiveInterface);
-    mCommandReceiveInterface->getDBusConnectionWrapper(mDBusWrapper);
-    assert(mDBusWrapper!=NULL);
-    DBusConnection * connection;
-    mDBusWrapper->getDBusConnection(connection);
-    assert(connection!=NULL);
-    mDBUSMessageHandler.setDBusConnection(connection);
-    return (E_OK);
-}
-
-void DbusCommandSender::setCommandReady(const uint16_t handle)
-{
-    //todo:implement handle handling
-    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationReady called");
-    mReady = true;
-}
-
-void DbusCommandSender::setCommandRundown(const uint16_t handle)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationRundown called");
-    mReady = false;
-    /**
-     * todo: implement DbusCommandSender::cbCommunicationRundown()
-     */
-}
-
-void DbusCommandSender::cbNewMainConnection(const am_MainConnectionType_s mainConnection)
-{
-    (void)mainConnection;
-    //todo: change xml and interface to differetiate between new connection and removed one
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbRemovedMainConnection(const am_mainConnectionID_t mainConnection)
-{
-//todo: change xml and interface to differetiate between new connection and removed one
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbNewSink(const am_SinkType_s& sink)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNewSink called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), "SinkAdded");
-        mDBUSMessageHandler.append(sink);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SinkAdded");
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbRemovedSink(const am_sinkID_t sinkID)
-{
-    //todo: check if this really works!
-    log(&commandDbus, DLT_LOG_INFO, "cbRemovedSink called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), "SinkRemoved");
-        mDBUSMessageHandler.append(sinkID);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SinkAdded");
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbNewSource(const am_SourceType_s& source)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSourcesChanged called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), "SourceAdded");
-        mDBUSMessageHandler.append(source);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SourceAdded");
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void am::DbusCommandSender::cbRemovedSource(const am_sourceID_t source)
-{
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), "SourceRemoved");
-        mDBUSMessageHandler.append(source);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SourceRemoved");
-
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbNumberOfSinkClassesChanged()
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSinkClassesChanged called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSinkClassesChanged"));
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbNumberOfSourceClassesChanged()
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSourceClassesChanged called");
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSourceClassesChanged"));
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainConnectionStateChanged called, connectionID=", connectionID, "connectionState=", connectionState);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("MainConnectionStateChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) connectionID);
-        mDBUSMessageHandler.append((dbus_int16_t) connectionState);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s & soundProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainSinkSoundPropertyChanged called, sinkID", sinkID, "SoundProperty.type", soundProperty.type, "SoundProperty.value", soundProperty.value);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSinkSoundPropertyChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sinkID);
-        mDBUSMessageHandler.append(soundProperty);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainSourceSoundPropertyChanged called, sourceID", sourceID, "SoundProperty.type", SoundProperty.type, "SoundProperty.value", SoundProperty.value);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSourceSoundPropertyChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sourceID);
-        mDBUSMessageHandler.append(SoundProperty);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkAvailabilityChanged called, sinkID", sinkID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkAvailabilityChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sinkID);
-        mDBUSMessageHandler.append(availability);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSourceAvailabilityChanged called, sourceID", sourceID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("SourceAvailabilityChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sourceID);
-        mDBUSMessageHandler.append(availability);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbVolumeChanged called, sinkID", sinkID, "volume", volume);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("VolumeChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sinkID);
-        mDBUSMessageHandler.append((dbus_int16_t) volume);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkMuteStateChanged called, sinkID", sinkID, "muteState", muteState);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkMuteStateChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) sinkID);
-        mDBUSMessageHandler.append((dbus_int16_t) muteState);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::cbSystemPropertyChanged(const am_SystemProperty_s & SystemProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSystemPropertyChanged called, SystemProperty.type", SystemProperty.type, "SystemProperty.value", SystemProperty.value);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("SystemPropertyChanged"));
-        mDBUSMessageHandler.append(SystemProperty);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void am::DbusCommandSender::cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbTimingInformationChanged called, mainConnectionID=", mainConnectionID, "time=", time);
-
-    if (mReady)
-    {
-        mDBUSMessageHandler.initSignal(std::string(MY_NODE), std::string("TimingInformationChanged"));
-        mDBUSMessageHandler.append((dbus_uint16_t) mainConnectionID);
-        mDBUSMessageHandler.append((dbus_int16_t) time);
-        mDBUSMessageHandler.sendMessage();
-    }
-}
-
-void DbusCommandSender::getInterfaceVersion(std::string & version) const
-{
-    version = CommandSendVersion;
-}
-
diff --git a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
index 313818f..f43c9e6 100644
--- a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp
+++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
@@ -23,13 +23,14 @@
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
  */
 
-#include <audiomanagertypes.h>
+#include "IAmCommandReceiverShadow.h"
 #include <string>
 #include <fstream>
+#include <stdexcept>
 #include <cassert>
-#include "CommandReceiverShadow.h"
-#include "DBusCommandSender.h"
-#include "DLTWrapper.h"
+#include "audiomanagertypes.h"
+#include "CAmCommandSenderDbus.h"
+#include "shared/CAmDltWrapper.h"
 
 using namespace am;
 
@@ -40,107 +41,107 @@ DLT_IMPORT_CONTEXT(commandDbus)
  */
 static DBusObjectPathVTable gObjectPathVTable;
 
-CommandReceiverShadow::CommandReceiverShadow() :
-        mCommandReceiveInterface(NULL), //
-        mDBusWrapper(NULL), //
+IAmCommandReceiverShadow::IAmCommandReceiverShadow() :
         mFunctionMap(createMap()), //
-        mDBUSMessageHandler()
+        mDBUSMessageHandler(), //
+        mpIAmCommandReceive(NULL), //
+        mpCAmDbusWrapper(NULL)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow constructed");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow constructed");
 }
 
-CommandReceiverShadow::~CommandReceiverShadow()
+IAmCommandReceiverShadow::~IAmCommandReceiverShadow()
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow destructed");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow destructed");
 }
 
-void CommandReceiverShadow::connect(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::connect(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::connect called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::connect called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sourceID_t sourceID = (am_sourceID_t) mDBUSMessageHandler.getUInt();
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
     am_mainConnectionID_t mainConnectionID = 0;
-    am_Error_e returnCode = mCommandReceiveInterface->connect(sourceID, sinkID, mainConnectionID);
+    am_Error_e returnCode = mpIAmCommandReceive->connect(sourceID, sinkID, mainConnectionID);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append((dbus_uint16_t) mainConnectionID);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::disconnect(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::disconnect(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::disconnect called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::disconnect called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_mainConnectionID_t mainConnnectionID = (am_mainConnectionID_t) mDBUSMessageHandler.getUInt();
-    am_Error_e returnCode = mCommandReceiveInterface->disconnect(mainConnnectionID);
+    am_Error_e returnCode = mpIAmCommandReceive->disconnect(mainConnnectionID);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::setVolume(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::setVolume(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::setVolume called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setVolume called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
     am_volume_t volume = (am_volume_t) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mCommandReceiveInterface->setVolume(sinkID, volume);
+    am_Error_e returnCode = mpIAmCommandReceive->setVolume(sinkID, volume);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::volumeStep(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::volumeStep(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::volumeStep called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::volumeStep called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
     int16_t volumeStep = (int16_t) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mCommandReceiveInterface->volumeStep(sinkID, volumeStep);
+    am_Error_e returnCode = mpIAmCommandReceive->volumeStep(sinkID, volumeStep);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::setSinkMuteState(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::setSinkMuteState(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::setSinkMuteState called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSinkMuteState called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
     am_MuteState_e muteState = (am_MuteState_e) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mCommandReceiveInterface->setSinkMuteState(sinkID, muteState);
+    am_Error_e returnCode = mpIAmCommandReceive->setSinkMuteState(sinkID, muteState);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::setMainSinkSoundProperty called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setMainSinkSoundProperty called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
@@ -150,18 +151,18 @@ void CommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DBusM
     am_MainSoundProperty_s mainSoundProperty;
     mainSoundProperty.type = (am_MainSoundPropertyType_e) type;
     mainSoundProperty.value = (int32_t) value;
-    am_Error_e returnCode = mCommandReceiveInterface->setMainSinkSoundProperty(mainSoundProperty, sinkID);
+    am_Error_e returnCode = mpIAmCommandReceive->setMainSinkSoundProperty(mainSoundProperty, sinkID);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::setMainSourceSoundProperty called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setMainSourceSoundProperty called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sourceID_t sourceID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
@@ -171,18 +172,18 @@ void CommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn, DBu
     am_MainSoundProperty_s mainSoundProperty;
     mainSoundProperty.type = (am_MainSoundPropertyType_e) type;
     mainSoundProperty.value = (int32_t) value;
-    am_Error_e returnCode = mCommandReceiveInterface->setMainSourceSoundProperty(mainSoundProperty, sourceID);
+    am_Error_e returnCode = mpIAmCommandReceive->setMainSourceSoundProperty(mainSoundProperty, sourceID);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::setSystemProperty called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSystemProperty called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     dbus_int16_t type = 0;
@@ -191,157 +192,157 @@ void CommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessage
     am_SystemProperty_s systemProperty;
     systemProperty.type = (am_SystemPropertyType_e) type;
     systemProperty.value = (int32_t) value;
-    am_Error_e returnCode = mCommandReceiveInterface->setSystemProperty(systemProperty);
+    am_Error_e returnCode = mpIAmCommandReceive->setSystemProperty(systemProperty);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListMainConnections(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListMainConnections(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListMainConnections called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainConnections called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_MainConnectionType_s> listMainConnections;
-    am_Error_e returnCode = mCommandReceiveInterface->getListMainConnections(listMainConnections);
+    am_Error_e returnCode = mpIAmCommandReceive->getListMainConnections(listMainConnections);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listMainConnections);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListMainSinks(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListMainSinks(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListMainSinks called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSinks called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_SinkType_s> listSinks;
-    am_Error_e returnCode = mCommandReceiveInterface->getListMainSinks(listSinks);
+    am_Error_e returnCode = mpIAmCommandReceive->getListMainSinks(listSinks);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSinks);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListMainSources(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListMainSources(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListMainSources called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSources called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_SourceType_s> listSources;
-    am_Error_e returnCode = mCommandReceiveInterface->getListMainSources(listSources);
+    am_Error_e returnCode = mpIAmCommandReceive->getListMainSources(listSources);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSources);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListMainSinkSoundProperties(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListMainSinkSoundProperties(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListMainSinkSoundProperties called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSinkSoundProperties called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
     std::vector<am_MainSoundProperty_s> listSinkSoundProperties;
-    am_Error_e returnCode = mCommandReceiveInterface->getListMainSinkSoundProperties(sinkID, listSinkSoundProperties);
+    am_Error_e returnCode = mpIAmCommandReceive->getListMainSinkSoundProperties(sinkID, listSinkSoundProperties);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSinkSoundProperties);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListMainSourceSoundProperties(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListMainSourceSoundProperties(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListMainSourceSoundProperties called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSourceSoundProperties called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_sourceID_t sourceID = (am_sourceID_t) mDBUSMessageHandler.getUInt();
     std::vector<am_MainSoundProperty_s> listSinkSoundProperties;
-    am_Error_e returnCode = mCommandReceiveInterface->getListMainSourceSoundProperties(sourceID, listSinkSoundProperties);
+    am_Error_e returnCode = mpIAmCommandReceive->getListMainSourceSoundProperties(sourceID, listSinkSoundProperties);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSinkSoundProperties);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListSourceClasses(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListSourceClasses(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListSourceClasses called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSourceClasses called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_SourceClass_s> listSourceClasses;
-    am_Error_e returnCode = mCommandReceiveInterface->getListSourceClasses(listSourceClasses);
+    am_Error_e returnCode = mpIAmCommandReceive->getListSourceClasses(listSourceClasses);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSourceClasses);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListSinkClasses(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListSinkClasses(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListSinkClasses called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSinkClasses called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_SinkClass_s> listSinkClasses;
-    am_Error_e returnCode = mCommandReceiveInterface->getListSinkClasses(listSinkClasses);
+    am_Error_e returnCode = mpIAmCommandReceive->getListSinkClasses(listSinkClasses);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSinkClasses);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getListSystemProperties(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getListSystemProperties(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getListSystemProperties called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSystemProperties called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
     std::vector<am_SystemProperty_s> listSystemProperties;
-    am_Error_e returnCode = mCommandReceiveInterface->getListSystemProperties(listSystemProperties);
+    am_Error_e returnCode = mpIAmCommandReceive->getListSystemProperties(listSystemProperties);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append(listSystemProperties);
     mDBUSMessageHandler.sendMessage();
 }
 
-void CommandReceiverShadow::getTimingInformation(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::getTimingInformation(DBusConnection *conn, DBusMessage *msg)
 {
-    log(&commandDbus,DLT_LOG_INFO,"CommandReceiverShadow::getTimingInformation called");
+    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getTimingInformation called");
 
     (void) conn;
-    assert(mCommandReceiveInterface!=NULL);
+    assert(mpIAmCommandReceive!=NULL);
 
     mDBUSMessageHandler.initReceive(msg);
     am_mainConnectionID_t mainConnectionID = (am_mainConnectionID_t) mDBUSMessageHandler.getUInt();
     am_timeSync_t delay = 0;
-    am_Error_e returnCode = mCommandReceiveInterface->getTimingInformation(mainConnectionID, delay);
+    am_Error_e returnCode = mpIAmCommandReceive->getTimingInformation(mainConnectionID, delay);
     mDBUSMessageHandler.initReply(msg);
     mDBUSMessageHandler.append((dbus_int16_t) returnCode);
     mDBUSMessageHandler.append((dbus_int16_t) delay);
     mDBUSMessageHandler.sendMessage();
 }
 
-DBusHandlerResult CommandReceiverShadow::receiveCallback(DBusConnection *conn, DBusMessage *msg, void *user_data)
+DBusHandlerResult IAmCommandReceiverShadow::receiveCallback(DBusConnection *conn, DBusMessage *msg, void *user_data)
 {
     assert(conn!=NULL);
     assert(msg!=NULL);
     assert(user_data!=NULL);
-    CommandReceiverShadow* reference = (CommandReceiverShadow*) user_data;
+    IAmCommandReceiverShadow* reference = (IAmCommandReceiverShadow*) user_data;
     return (reference->receiveCallbackDelegate(conn, msg));
 }
 
-void CommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage *msg)
+void IAmCommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage *msg)
 {
     assert(conn!=NULL);
     assert(msg!=NULL);
@@ -351,8 +352,12 @@ void CommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage
 
     // create a reply from the message
     reply = dbus_message_new_method_return(msg);
-    std::ifstream in(INTROSPECTION_COMMAND_XML_FILE);
-    assert(in!=NULL);
+    std::ifstream in("CommandInterface.xml", std::ifstream::in);
+    if (!in)
+    {
+        logError("IAmCommandReceiverShadow::sendIntrospection could not load xml file");
+        throw std::runtime_error("IAmCommandReceiverShadow::sendIntrospection Could not load introspecton XML");
+    }
     std::string introspect((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
     const char* string = introspect.c_str();
 
@@ -374,7 +379,7 @@ void CommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage
     dbus_message_unref(reply);
 }
 
-DBusHandlerResult CommandReceiverShadow::receiveCallbackDelegate(DBusConnection *conn, DBusMessage *msg)
+DBusHandlerResult IAmCommandReceiverShadow::receiveCallbackDelegate(DBusConnection *conn, DBusMessage *msg)
 {
     //DLT_LOG(dMain, DLT_LOG_INFO, DLT_STRING("message received"));
 
@@ -398,45 +403,45 @@ DBusHandlerResult CommandReceiverShadow::receiveCallbackDelegate(DBusConnection
     return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 }
 
-void CommandReceiverShadow::setCommandReceiver(CommandReceiveInterface*& receiver)
+void IAmCommandReceiverShadow::setCommandReceiver(IAmCommandReceive*& receiver)
 {
     assert(receiver!=NULL);
-    mCommandReceiveInterface = receiver;
+    mpIAmCommandReceive = receiver;
 
-    gObjectPathVTable.message_function = CommandReceiverShadow::receiveCallback;
+    gObjectPathVTable.message_function = IAmCommandReceiverShadow::receiveCallback;
 
     DBusConnection* connection;
-    mCommandReceiveInterface->getDBusConnectionWrapper(mDBusWrapper);
-    assert(mDBusWrapper!=NULL);
+    mpIAmCommandReceive->getDBusConnectionWrapper(mpCAmDbusWrapper);
+    assert(mpCAmDbusWrapper!=NULL);
 
-    mDBusWrapper->getDBusConnection(connection);
+    mpCAmDbusWrapper->getDBusConnection(connection);
     assert(connection!=NULL);
     mDBUSMessageHandler.setDBusConnection(connection);
 
     std::string path(MY_NODE);
-    mDBusWrapper->registerCallback(&gObjectPathVTable, path, this);
+    mpCAmDbusWrapper->registerCallback(&gObjectPathVTable, path, this);
 }
 
-CommandReceiverShadow::functionMap_t CommandReceiverShadow::createMap()
+IAmCommandReceiverShadow::functionMap_t IAmCommandReceiverShadow::createMap()
 {
     functionMap_t m;
-    m["Connect"] = &CommandReceiverShadow::connect;
-    m["Disconnect"] = &CommandReceiverShadow::disconnect;
-    m["SetVolume"] = &CommandReceiverShadow::setVolume;
-    m["VolumeStep"] = &CommandReceiverShadow::volumeStep;
-    m["SetSinkMuteState"] = &CommandReceiverShadow::setSinkMuteState;
-    m["SetMainSinkSoundProperty"] = &CommandReceiverShadow::setMainSinkSoundProperty;
-    m["SetMainSourceSoundProperty"] = &CommandReceiverShadow::setMainSourceSoundProperty;
-    m["GetListMainConnections"] = &CommandReceiverShadow::getListMainConnections;
-    m["GetListMainSinks"] = &CommandReceiverShadow::getListMainSinks;
-    m["GetListMainSources"] = &CommandReceiverShadow::getListMainSources;
-    m["GetListMainSinkSoundProperties"] = &CommandReceiverShadow::getListMainSinkSoundProperties;
-    m["GetListMainSourceSoundProperties"] = &CommandReceiverShadow::getListMainSourceSoundProperties;
-    m["GetListSourceClasses"] = &CommandReceiverShadow::getListSourceClasses;
-    m["GetListSinkClasses"] = &CommandReceiverShadow::getListSinkClasses;
-    m["GetListSystemProperties"] = &CommandReceiverShadow::getListSystemProperties;
-    m["GetTimingInformation"] = &CommandReceiverShadow::getTimingInformation;
-    m["SetSystemProperty"] = &CommandReceiverShadow::setSystemProperty;
+    m["Connect"] = &IAmCommandReceiverShadow::connect;
+    m["Disconnect"] = &IAmCommandReceiverShadow::disconnect;
+    m["SetVolume"] = &IAmCommandReceiverShadow::setVolume;
+    m["VolumeStep"] = &IAmCommandReceiverShadow::volumeStep;
+    m["SetSinkMuteState"] = &IAmCommandReceiverShadow::setSinkMuteState;
+    m["SetMainSinkSoundProperty"] = &IAmCommandReceiverShadow::setMainSinkSoundProperty;
+    m["SetMainSourceSoundProperty"] = &IAmCommandReceiverShadow::setMainSourceSoundProperty;
+    m["GetListMainConnections"] = &IAmCommandReceiverShadow::getListMainConnections;
+    m["GetListMainSinks"] = &IAmCommandReceiverShadow::getListMainSinks;
+    m["GetListMainSources"] = &IAmCommandReceiverShadow::getListMainSources;
+    m["GetListMainSinkSoundProperties"] = &IAmCommandReceiverShadow::getListMainSinkSoundProperties;
+    m["GetListMainSourceSoundProperties"] = &IAmCommandReceiverShadow::getListMainSourceSoundProperties;
+    m["GetListSourceClasses"] = &IAmCommandReceiverShadow::getListSourceClasses;
+    m["GetListSinkClasses"] = &IAmCommandReceiverShadow::getListSinkClasses;
+    m["GetListSystemProperties"] = &IAmCommandReceiverShadow::getListSystemProperties;
+    m["GetTimingInformation"] = &IAmCommandReceiverShadow::getTimingInformation;
+    m["SetSystemProperty"] = &IAmCommandReceiverShadow::setSystemProperty;
     return (m);
 }