* [GAM-12] Change project types as discussed in the F2F: changed in all tests, updated audiomanagertypes.h and projecttypes.h

* change towards the versioning scheme of the audiomanager in CMakelists.txt

7 files changed, 177 insertions, 177 deletions

diff --git a/AudioManagerDaemon/src/ControlReceiver.cpp b/AudioManagerDaemon/src/ControlReceiver.cpp
index b352d0d..7909851 100644
--- a/AudioManagerDaemon/src/ControlReceiver.cpp
+++ b/AudioManagerDaemon/src/ControlReceiver.cpp
@@ -207,7 +207,7 @@ am_Error_e ControlReceiver::setDomainState(const am_domainID_t domainID, const a
 {
     logInfo("ControlReceiver::setDomainState got called, domainID=", domainID, "domainState=", domainState);
 
-    am_DomainState_e tempState = DS_MIN;
+    am_DomainState_e tempState = DS_UNKNOWN;
     if (mDatabaseHandler->getDomainState(domainID, tempState) != E_OK)
         return E_UNKNOWN;
     if (tempState == domainState)
diff --git a/AudioManagerDaemon/src/DatabaseHandler.cpp b/AudioManagerDaemon/src/DatabaseHandler.cpp
index 5f7ee1d..2337142 100644
--- a/AudioManagerDaemon/src/DatabaseHandler.cpp
+++ b/AudioManagerDaemon/src/DatabaseHandler.cpp
@@ -113,7 +113,7 @@ am_Error_e DatabaseHandler::enterDomainDB(const am_Domain_s & domainData, am_dom
     assert(domainData.domainID==0);
     assert(!domainData.name.empty());
     assert(!domainData.busname.empty());
-    assert(domainData.state>=DS_MIN && domainData.state<=DS_MAX);
+    assert(domainData.state>=DS_UNKNOWN && domainData.state<=DS_MAX);
 
     //first check for a reserved domain
     sqlite3_stmt* query = NULL, *queryFinal;
@@ -177,7 +177,7 @@ am_Error_e DatabaseHandler::enterDomainDB(const am_Domain_s & domainData, am_dom
 am_Error_e DatabaseHandler::enterMainConnectionDB(const am_MainConnection_s & mainConnectionData, am_mainConnectionID_t & connectionID)
 {
     assert(mainConnectionData.mainConnectionID==0);
-    assert(mainConnectionData.connectionState>=CS_MIN && mainConnectionData.connectionState<=CS_MAX);
+    assert(mainConnectionData.connectionState>=CS_UNKNOWN && mainConnectionData.connectionState<=CS_MAX);
     assert(mainConnectionData.sinkID!=0);
     assert(mainConnectionData.sourceID!=0);
 
@@ -280,7 +280,7 @@ am_Error_e DatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t
     assert(sinkData.sinkClassID!=0);
     // \todo: need to check if class exists?
     assert(!sinkData.listConnectionFormats.empty());
-    assert(sinkData.muteState>=MS_MIN && sinkData.muteState<=MS_MAX);
+    assert(sinkData.muteState>=MS_UNKNOWN && sinkData.muteState<=MS_MAX);
 
     sqlite3_stmt *query = NULL, *queryFinal = NULL;
     int eCode = 0;
@@ -452,7 +452,7 @@ am_Error_e DatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t
 am_Error_e DatabaseHandler::enterCrossfaderDB(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID)
 {
     assert(crossfaderData.crossfaderID<DYNAMIC_ID_BOUNDARY);
-    assert(crossfaderData.hotSink>=HS_MIN && crossfaderData.hotSink<=HS_MAX);
+    assert(crossfaderData.hotSink>=HS_UNKNOWN && crossfaderData.hotSink<=HS_MAX);
     assert(!crossfaderData.name.empty());
     assert(existSink(crossfaderData.sinkID_A));
     assert(existSink(crossfaderData.sinkID_B));
@@ -656,7 +656,7 @@ am_Error_e DatabaseHandler::enterSourceDB(const am_Source_s & sourceData, am_sou
     assert(sourceData.sourceClassID!=0);
     // \todo: need to check if class exists?
     assert(!sourceData.listConnectionFormats.empty());
-    assert(sourceData.sourceState>=SS_MIN && sourceData.sourceState<=SS_MAX);
+    assert(sourceData.sourceState>=SS_UNKNNOWN && sourceData.sourceState<=SS_MAX);
 
     sqlite3_stmt* query = NULL, *queryFinal = NULL;
     ;
@@ -902,7 +902,7 @@ am_Error_e DatabaseHandler::changeMainConnectionRouteDB(const am_mainConnectionI
 am_Error_e DatabaseHandler::changeMainConnectionStateDB(const am_mainConnectionID_t mainconnectionID, const am_ConnectionState_e connectionState)
 {
     assert(mainconnectionID!=0);
-    assert(connectionState>=CS_MIN && connectionState<=CS_MAX);
+    assert(connectionState>=CS_UNKNOWN && connectionState<=CS_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -969,8 +969,8 @@ am_Error_e DatabaseHandler::changeSinkMainVolumeDB(const am_mainVolume_t mainVol
 am_Error_e DatabaseHandler::changeSinkAvailabilityDB(const am_Availability_s & availability, const am_sinkID_t sinkID)
 {
     assert(sinkID!=0);
-    assert(availability.availability>=A_MIN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_MIN && availability.availabilityReason<=AR_MAX);
+    assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
+    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1006,7 +1006,7 @@ am_Error_e DatabaseHandler::changeSinkAvailabilityDB(const am_Availability_s & a
 am_Error_e DatabaseHandler::changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
 {
     assert(domainID!=0);
-    assert(domainState>=DS_MIN && domainState<=DS_MAX);
+    assert(domainState>=DS_UNKNOWN && domainState<=DS_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1039,7 +1039,7 @@ am_Error_e DatabaseHandler::changDomainStateDB(const am_DomainState_e domainStat
 am_Error_e DatabaseHandler::changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID)
 {
     assert(sinkID!=0);
-    assert(muteState>=MS_MIN && muteState<=MS_MAX);
+    assert(muteState>=MS_UNKNOWN && muteState<=MS_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1074,7 +1074,7 @@ am_Error_e DatabaseHandler::changeSinkMuteStateDB(const am_MuteState_e muteState
 
 am_Error_e DatabaseHandler::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=MSP_MIN && soundProperty.type<=MSP_MAX);
+    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sinkID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -1108,7 +1108,7 @@ am_Error_e DatabaseHandler::changeMainSinkSoundPropertyDB(const am_MainSoundProp
 
 am_Error_e DatabaseHandler::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=MSP_MIN && soundProperty.type<=MSP_MAX);
+    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sourceID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -1144,8 +1144,8 @@ am_Error_e DatabaseHandler::changeMainSourceSoundPropertyDB(const am_MainSoundPr
 am_Error_e DatabaseHandler::changeSourceAvailabilityDB(const am_Availability_s & availability, const am_sourceID_t sourceID)
 {
     assert(sourceID!=0);
-    assert(availability.availability>=A_MIN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_MIN && availability.availabilityReason<=AR_MAX);
+    assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
+    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1180,7 +1180,7 @@ am_Error_e DatabaseHandler::changeSourceAvailabilityDB(const am_Availability_s &
 
 am_Error_e DatabaseHandler::changeSystemPropertyDB(const am_SystemProperty_s & property)
 {
-    assert(property.type>=SYP_MIN && property.type<=SYP_MAX);
+    assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX);
     sqlite3_stmt* query = NULL;
     int eCode = 0;
     std::string command = "UPDATE " + std::string(SYSTEM_TABLE) + " set value=? WHERE type=?";
@@ -3795,7 +3795,7 @@ am_Error_e DatabaseHandler::getSoureState(const am_sourceID_t sourceID, am_Sourc
 {
     assert(sourceID!=0);
     sqlite3_stmt* query = NULL;
-    sourceState = SS_MIN;
+    sourceState = SS_UNKNNOWN;
     std::string command = "SELECT sourceState FROM " + std::string(SOURCE_TABLE) + " WHERE sourceID=" + i2s(sourceID);
     int eCode = 0;
     sqlite3_prepare_v2(mDatabase, command.c_str(), -1, &query, NULL);
@@ -3814,7 +3814,7 @@ am_Error_e DatabaseHandler::getSoureState(const am_sourceID_t sourceID, am_Sourc
 am_Error_e DatabaseHandler::changeSourceState(const am_sourceID_t sourceID, const am_SourceState_e sourceState)
 {
     assert(sourceID!=0);
-    assert(sourceState>=SS_MIN && sourceState<=SS_MAX);
+    assert(sourceState>=SS_UNKNNOWN && sourceState<=SS_MAX);
     sqlite3_stmt* query = NULL;
     std::string command = "UPDATE " + std::string(SOURCE_TABLE) + " SET sourceState=? WHERE sourceID=" + i2s(sourceID);
     int eCode = 0;
@@ -3946,7 +3946,7 @@ am_Error_e DatabaseHandler::getDomainState(const am_domainID_t domainID, am_Doma
 {
     assert(domainID!=0);
     sqlite3_stmt* query = NULL;
-    state = DS_MIN;
+    state = DS_UNKNOWN;
     std::string command = "SELECT domainState FROM " + std::string(DOMAIN_TABLE) + " WHERE domainID=" + i2s(domainID);
     int eCode = 0;
     sqlite3_prepare_v2(mDatabase, command.c_str(), -1, &query, NULL);
@@ -4164,7 +4164,7 @@ am_Error_e DatabaseHandler::changeSourceVolume(const am_sourceID_t sourceID, con
 
 am_Error_e DatabaseHandler::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=SP_MIN && soundProperty.type<=SP_MAX);
+    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sourceID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -4199,7 +4199,7 @@ am_Error_e DatabaseHandler::changeSourceSoundPropertyDB(const am_SoundProperty_s
 
 am_Error_e DatabaseHandler::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=SP_MIN && soundProperty.type<=SP_MAX);
+    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sinkID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -4233,7 +4233,7 @@ am_Error_e DatabaseHandler::changeSinkSoundPropertyDB(const am_SoundProperty_s &
 am_Error_e DatabaseHandler::changeCrossFaderHotSink(const am_crossfaderID_t crossfaderID, const am_HotSink_e hotsink)
 {
     assert(crossfaderID!=0);
-    assert(hotsink>=HS_MIN && hotsink>=HS_MAX);
+    assert(hotsink>=HS_UNKNOWN && hotsink>=HS_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
diff --git a/AudioManagerDaemon/test/CommonFunctions.cpp b/AudioManagerDaemon/test/CommonFunctions.cpp
index 10245d7..101548c 100644
--- a/AudioManagerDaemon/test/CommonFunctions.cpp
+++ b/AudioManagerDaemon/test/CommonFunctions.cpp
@@ -199,8 +199,8 @@ bool CommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
 std::vector<am_ConnectionFormat_e> CommonFunctions::getStandardConnectionFormatList()
 {
     std::vector<am_ConnectionFormat_e> list;
-    list.push_back(CF_ANALOG);
-    list.push_back(CF_STEREO);
+    list.push_back(CF_GENIVI_ANALOG);
+    list.push_back(CF_GENIVI_STEREO);
     return list;
 }
 
@@ -208,10 +208,10 @@ std::vector<am_SoundProperty_s> CommonFunctions::getStandardSoundPropertyList()
 {
     std::vector<am_SoundProperty_s> soundPropertyList;
     am_SoundProperty_s soundProperty;
-    soundProperty.type = SP_BASS;
+    soundProperty.type = SP_EXAMPLE_BASS;
     soundProperty.value = 23;
     soundPropertyList.push_back(soundProperty);
-    soundProperty.type = SP_MID;
+    soundProperty.type = SP_EXAMPLE_MID;
     soundProperty.value = 2;
     soundPropertyList.push_back(soundProperty);
     return soundPropertyList;
@@ -221,10 +221,10 @@ std::vector<am_MainSoundProperty_s> CommonFunctions::getStandardMainSoundPropert
 {
     std::vector<am_MainSoundProperty_s> mainSoundPropertyList;
     am_MainSoundProperty_s mainSoundProperty;
-    mainSoundProperty.type = MSP_NAVIGATION_OFFSET;
+    mainSoundProperty.type = MSP_UNKNOWN;
     mainSoundProperty.value = 23;
     mainSoundPropertyList.push_back(mainSoundProperty);
-    mainSoundProperty.type = MSP_TEST;
+    mainSoundProperty.type = MSP_UNKNOWN;
     mainSoundProperty.value = 3;
     mainSoundPropertyList.push_back(mainSoundProperty);
     return mainSoundPropertyList;
@@ -235,7 +235,7 @@ void CommonFunctions::createSink(am_Sink_s& sink) const
     sink.name = "AnySink";
     sink.domainID = 4;
     sink.available.availability = A_AVAILABLE;
-    sink.available.availabilityReason = AR_NEWMEDIA;
+    sink.available.availabilityReason = AR_GENIVI_NEWMEDIA;
     sink.sinkClassID = 1;
     sink.listConnectionFormats = getStandardConnectionFormatList();
     sink.listSoundProperties = getStandardSoundPropertyList();
@@ -252,7 +252,7 @@ void CommonFunctions::createSource(am_Source_s& source) const
     source.name = "AnySource";
     source.domainID = 4;
     source.available.availability = A_AVAILABLE;
-    source.available.availabilityReason = AR_NEWMEDIA;
+    source.available.availabilityReason = AR_GENIVI_NEWMEDIA;
     source.sourceClassID = 1;
     source.listConnectionFormats = getStandardConnectionFormatList();
     source.listSoundProperties = getStandardSoundPropertyList();
@@ -297,7 +297,7 @@ void CommonFunctions::createConnection(am_Connection_s & connection) const
     connection.sinkID = 1;
     connection.sourceID = 2;
     connection.delay = -1;
-    connection.connectionFormat = CF_ANALOG;
+    connection.connectionFormat = CF_GENIVI_ANALOG;
 }
 
 std::vector<bool> CommonFunctions::getStandardConvertionMatrix()
diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
index 599d15f..c479004 100644
--- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
@@ -176,8 +176,8 @@ TEST_F(controlInterfaceTest,ackConnect)
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
     //when asyncConnect is called, we expect a call on the routingInterface
-    EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_STEREO)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2));
+    EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2));
 
     //The handle should have the correct type
     ASSERT_EQ(handle.handleType, H_CONNECT);
@@ -206,7 +206,7 @@ TEST_F(controlInterfaceTest,ackConnect)
     ASSERT_TRUE(!connectionList.empty());
 
     //no we try the same, but do expect a no_change answer directly and no call because connection already exists
-    ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2));
+    ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2));
 }
 
 TEST_F(controlInterfaceTest,ackDisconnect)
@@ -231,8 +231,8 @@ TEST_F(controlInterfaceTest,ackDisconnect)
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
     //now we first need to connect, we expect a call on the routing interface
-    EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_STEREO)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2));
+    EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2));
 
     //answer with an ack to insert the connection in the database
     EXPECT_CALL(pMockControlInterface,cbAckConnect(_,E_OK)).Times(1);
@@ -334,8 +334,8 @@ TEST_F(controlInterfaceTest,SetSinkVolumeChange)
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
     //set the volume and expect a call on the routing interface
-    EXPECT_CALL(pMockRoutingInterface,asyncSetSinkVolume(_,2,11,RAMP_DIRECT,23)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_DIRECT,23));
+    EXPECT_CALL(pMockRoutingInterface,asyncSetSinkVolume(_,2,11,RAMP_GENIVI_DIRECT,23)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23));
 
     //check the list of handles. The handle must be in there and have the right type
     ASSERT_EQ(E_OK, pControlReceiver.getListHandles(handlesList));
@@ -359,7 +359,7 @@ TEST_F(controlInterfaceTest,SetSinkVolumeChange)
     ASSERT_TRUE(handlesList.empty());
 
     //Now we try again, but the value is unchanged
-    ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_DIRECT,23));
+    ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23));
 }
 
 TEST_F(controlInterfaceTest,ackSetSourceVolumeChange)
@@ -384,8 +384,8 @@ TEST_F(controlInterfaceTest,ackSetSourceVolumeChange)
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
 
     //change the sinkVolume, expect a call on the routingInterface
-    EXPECT_CALL(pMockRoutingInterface,asyncSetSourceVolume(_,2,11,RAMP_DIRECT,23)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_DIRECT,23));
+    EXPECT_CALL(pMockRoutingInterface,asyncSetSourceVolume(_,2,11,RAMP_GENIVI_DIRECT,23)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23));
 
     //check the list of handles. The handle must be in there and have the right type
     ASSERT_EQ(E_OK, pControlReceiver.getListHandles(handlesList));
@@ -409,7 +409,7 @@ TEST_F(controlInterfaceTest,ackSetSourceVolumeChange)
     ASSERT_TRUE(handlesList.empty());
 
     //Now we try again, but the value is unchanged
-    ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_DIRECT,23));
+    ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23));
 }
 
 TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
@@ -428,7 +428,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
     domain.busname = "mock";
     sink.sinkID = 2;
     sink.domainID = 1;
-    soundProperty.type = SP_BASS;
+    soundProperty.type = SP_EXAMPLE_BASS;
     soundProperty.value = 244;
 
     //setup environment, we need a domain and a sink
@@ -445,7 +445,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
     ASSERT_EQ(handlesList[0].handleType, H_SETSINKSOUNDPROPERTY);
 
     //read out this property. There is no change, because the ack did not arrive yet.
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
     ASSERT_EQ(sink.listSoundProperties[0].value, oldvalue);
 
     //lets send the answer and expect a call on the controlInterface
@@ -453,7 +453,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
     pRoutingReceiver.ackSetSinkSoundProperty(handle, E_OK);
 
     //finally, the new value must be in the database
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_EXAMPLE_BASS,oldvalue));
     ASSERT_EQ(soundProperty.value, oldvalue);
 
     //and the handle must be destroyed
@@ -480,7 +480,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty)
     domain.busname = "mock";
     source.sourceID = 2;
     source.domainID = 1;
-    soundProperty.type = SP_BASS;
+    soundProperty.type = SP_EXAMPLE_BASS;
     soundProperty.value = 244;
 
     //prepare the scene
@@ -497,7 +497,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty)
     ASSERT_EQ(handlesList[0].handleType, H_SETSOURCESOUNDPROPERTY);
 
     //read out this property. There is no change, because the ack did not arrive yet.
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
     ASSERT_EQ(source.listSoundProperties[0].value, oldvalue);
 
     //lets send the answer and expect a call on the controlInterface
@@ -505,7 +505,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty)
     pRoutingReceiver.ackSetSourceSoundProperty(handle, E_OK);
 
     //finally, the new value must be in the database
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_EXAMPLE_BASS,oldvalue));
     ASSERT_EQ(soundProperty.value, oldvalue);
 
     //and the handle must be destroyed
diff --git a/AudioManagerDaemon/test/database/databaseTest.cpp b/AudioManagerDaemon/test/database/databaseTest.cpp
index caaac76..b31fd48 100644
--- a/AudioManagerDaemon/test/database/databaseTest.cpp
+++ b/AudioManagerDaemon/test/database/databaseTest.cpp
@@ -96,7 +96,7 @@ void databasetest::createMainConnectionSetup()
         connection.sinkID = i;
         connection.sourceID = i;
         connection.delay = -1;
-        connection.connectionFormat = CF_ANALOG;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
         connection.connectionID = 0;
 
         ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink));
@@ -176,7 +176,7 @@ TEST_F(databasetest,getMainConnectionInfo)
         connection.sinkID = i;
         connection.sourceID = i;
         connection.delay = -1;
-        connection.connectionFormat = CF_ANALOG;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
         connection.connectionID = 0;
 
         ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink));
@@ -356,7 +356,7 @@ TEST_F(databasetest, peekSourceID)
     am_sourceClass_t sourceClassID, peekID;
     am_SourceClass_s sourceClass;
     am_ClassProperty_s classProperty;
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 13;
     sourceClass.name = sourceName;
     sourceClass.sourceClassID = 0;
@@ -380,7 +380,7 @@ TEST_F(databasetest, peekSinkID)
     am_sinkClass_t sinkClassID, peekID;
     am_SinkClass_s sinkClass;
     am_ClassProperty_s classProperty;
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 13;
     sinkClass.name = sinkName;
     sinkClass.sinkClassID = 0;
@@ -423,7 +423,7 @@ TEST_F(databasetest,crossfaders)
     crossfader.sinkID_B = sinkBID;
     crossfader.sourceID = sourceID;
     crossfader.name = "Crossfader";
-    crossfader.hotSink = HS_MIN;
+    crossfader.hotSink = HS_UNKNOWN;
 
     std::vector<am_Crossfader_s> listCrossfaders;
 
@@ -470,7 +470,7 @@ TEST_F(databasetest,crossfadersGetFromDomain)
     crossfader.sinkID_B = sinkBID;
     crossfader.sourceID = sourceID;
     crossfader.name = "Crossfader";
-    crossfader.hotSink = HS_MIN;
+    crossfader.hotSink = HS_UNKNOWN;
 
     std::vector<am_crossfaderID_t> listCrossfaders;
 
@@ -712,10 +712,10 @@ TEST_F(databasetest,getSinkClassOfSink)
     am_sinkClass_t sinkClassID;
     am_Sink_s sink;
     am_sinkID_t sinkID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sinkClass.name = "test";
@@ -750,10 +750,10 @@ TEST_F(databasetest,getSourceClassOfSource)
     am_sourceClass_t sourceClassID;
     am_Source_s source;
     am_sourceID_t sourceID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sourceClass.name = "test";
@@ -782,10 +782,10 @@ TEST_F(databasetest,removeSourceClass)
     am_SourceClass_s sourceClass;
     am_ClassProperty_s classProperty;
     am_sourceClass_t sourceClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sourceClass.name = "test";
@@ -810,10 +810,10 @@ TEST_F(databasetest,updateSourceClass)
     am_SourceClass_s sourceClass, changedClass;
     am_ClassProperty_s classProperty;
     am_sourceClass_t sourceClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sourceClass.name = "test";
@@ -843,10 +843,10 @@ TEST_F(databasetest,enterSourceClass)
     am_SourceClass_s sourceClass;
     am_ClassProperty_s classProperty;
     am_sourceClass_t sourceClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sourceClass.name = "test";
@@ -868,10 +868,10 @@ TEST_F(databasetest,enterSourceClassStatic)
     am_SourceClass_s sourceClass;
     am_ClassProperty_s classProperty;
     am_sourceClass_t sourceClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sourceClass.name = "test";
@@ -893,10 +893,10 @@ TEST_F(databasetest,removeSinkClass)
     am_SinkClass_s sinkClass;
     am_ClassProperty_s classProperty;
     am_sinkClass_t sinkClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sinkClass.name = "test";
@@ -921,10 +921,10 @@ TEST_F(databasetest,updateSinkClass)
     am_SinkClass_s sinkClass, changedClass;
     am_ClassProperty_s classProperty;
     am_sinkClass_t sinkClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sinkClass.name = "test";
@@ -954,10 +954,10 @@ TEST_F(databasetest,enterSinkClass)
     am_SinkClass_s sinkClass;
     am_ClassProperty_s classProperty;
     am_sinkClass_t sinkClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sinkClass.name = "test";
@@ -979,10 +979,10 @@ TEST_F(databasetest,enterSinkClassStatic)
     am_SinkClass_s sinkClass;
     am_ClassProperty_s classProperty;
     am_sinkClass_t sinkClassID;
-    classProperty.classProperty = CP_SINK_TYPE;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
     classProperty.value = 1;
     classPropertyList.push_back(classProperty);
-    classProperty.classProperty = CP_SOURCE_TYPE;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
     classProperty.value = 4;
     classPropertyList.push_back(classProperty);
     sinkClass.name = "test";
@@ -1002,7 +1002,7 @@ TEST_F(databasetest, changeSystemProperty)
     std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
     am_SystemProperty_s systemProperty;
 
-    systemProperty.type = SYP_TEST;
+    systemProperty.type = SYP_UNKNOWN;
     systemProperty.value = 33;
     listSystemProperties.push_back(systemProperty);
     EXPECT_CALL(pMockInterface,cbSystemPropertyChanged(_)).Times(1); //todo: check the exact value here
@@ -1019,7 +1019,7 @@ TEST_F(databasetest, systemProperties)
     std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
     am_SystemProperty_s systemProperty;
 
-    systemProperty.type = SYP_TEST;
+    systemProperty.type = SYP_UNKNOWN;
     systemProperty.value = 33;
     listSystemProperties.push_back(systemProperty);
 
@@ -1096,7 +1096,7 @@ TEST_F(databasetest, changeSourceMainSoundProperty)
     am_sourceID_t sourceID;
     pCF.createSource(source);
     am_MainSoundProperty_s property;
-    property.type = MSP_NAVIGATION_OFFSET;
+    property.type = MSP_UNKNOWN;
     property.value = 33;
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1);
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
@@ -1137,7 +1137,7 @@ TEST_F(databasetest, changeSinkMainSoundProperty)
     am_sinkID_t sinkID;
     pCF.createSink(sink);
     am_MainSoundProperty_s property;
-    property.type = MSP_NAVIGATION_OFFSET;
+    property.type = MSP_UNKNOWN;
     property.value = 33;
 
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1);
@@ -1220,7 +1220,7 @@ TEST_F(databasetest, changeSinkAvailability)
     pCF.createSink(sink);
     am_Availability_s availability;
     availability.availability = A_UNKNOWN;
-    availability.availabilityReason = AR_TEMPERATURE;
+    availability.availabilityReason = AR_GENIVI_TEMPERATURE;
 
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1);
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
@@ -1238,7 +1238,7 @@ TEST_F(databasetest, changeSourceAvailability)
     pCF.createSource(source);
     am_Availability_s availability;
     availability.availability = A_UNKNOWN;
-    availability.availabilityReason = AR_TEMPERATURE;
+    availability.availabilityReason = AR_GENIVI_TEMPERATURE;
     source.visible = true;
 
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1);
@@ -1271,7 +1271,7 @@ TEST_F(databasetest,changeMainConnectionRoute)
         connection.sinkID = i + 20;
         connection.sourceID = i + 20;
         connection.delay = -1;
-        connection.connectionFormat = CF_ANALOG;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
         connection.connectionID = 0;
 
         pCF.createSink(sink);
diff --git a/AudioManagerDaemon/test/routing/routingTest.cpp b/AudioManagerDaemon/test/routing/routingTest.cpp
index 9158064..02733a1 100644
--- a/AudioManagerDaemon/test/routing/routingTest.cpp
+++ b/AudioManagerDaemon/test/routing/routingTest.cpp
@@ -103,7 +103,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
 
@@ -115,7 +115,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_ANALOG);
+    sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
@@ -166,7 +166,7 @@ TEST_F(routingTest,simpleRoute2withDomain)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_ANALOG);
+    source.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
 
@@ -178,7 +178,7 @@ TEST_F(routingTest,simpleRoute2withDomain)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_ANALOG);
+    sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
@@ -235,14 +235,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_ANALOG);
+    source.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -255,14 +255,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -343,14 +343,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_ANALOG);
+    source.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -363,14 +363,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -418,11 +418,11 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
     am_connectionID_t id1,id2;
     connection.sourceID=sourceID;
     connection.sinkID=gwSinkID;
-    connection.connectionFormat=CF_ANALOG;
+    connection.connectionFormat=CF_GENIVI_ANALOG;
     connection.connectionID=0;
     connection1.sourceID=gwSourceID;
     connection1.sinkID=sinkID;
-    connection1.connectionFormat=CF_ANALOG;
+    connection1.connectionFormat=CF_GENIVI_ANALOG;
     connection1.connectionID=0;
 
     ASSERT_EQ(E_OK,pDatabaseHandler.enterConnectionDB(connection,id1));
@@ -472,25 +472,25 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_STEREO);
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_MONO);
-    gwSource.listConnectionFormats.push_back(CF_STEREO);
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_STEREO);
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -504,23 +504,23 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_STEREO);
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
-    gwSink1.listConnectionFormats.push_back(CF_STEREO);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -633,24 +633,24 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_STEREO);
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_STEREO);
-    gwSource.listConnectionFormats.push_back(CF_MONO);
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -664,22 +664,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_STEREO);
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -790,22 +790,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_STEREO);
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -819,22 +819,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_STEREO);
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -946,35 +946,35 @@ TEST_F(routingTest,simpleRoute4Domains2Routes)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource2.domainID = domainID4;
     gwSource2.name = "gwsource3";
     gwSource2.sourceState = SS_OFF;
     gwSource2.sourceID = 0;
     gwSource2.sourceClassID = 5;
-    gwSource2.listConnectionFormats.push_back(CF_STEREO);
+    gwSource2.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     gwSource3.domainID = domainID3;
     gwSource3.name = "gwsource4";
     gwSource3.sourceState = SS_OFF;
     gwSource3.sourceID = 0;
     gwSource3.sourceClassID = 5;
-    gwSource3.listConnectionFormats.push_back(CF_MONO);
+    gwSource3.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -990,35 +990,35 @@ TEST_F(routingTest,simpleRoute4Domains2Routes)
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSink2.domainID = domainID3;
     gwSink2.name = "gwSink2";
     gwSink2.sinkID = 0;
     gwSink2.sinkClassID = 5;
     gwSink2.muteState = MS_MUTED;
-    gwSink2.listConnectionFormats.push_back(CF_MONO);
+    gwSink2.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink3.domainID = domainID2;
     gwSink3.name = "gwSink3";
     gwSink3.sinkID = 0;
     gwSink3.sinkClassID = 5;
     gwSink3.muteState = MS_MUTED;
-    gwSink3.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink3.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     sink.domainID = domainID4;
     sink.name = "sink1";
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_STEREO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -1177,21 +1177,21 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -1205,21 +1205,21 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_STEREO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -1317,14 +1317,14 @@ TEST_F(routingTest,simpleRoute2Domains)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_ANALOG);
+    source.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -1337,14 +1337,14 @@ TEST_F(routingTest,simpleRoute2Domains)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -1425,14 +1425,14 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_STEREO);
+    source.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_MONO);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -1445,14 +1445,14 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -1536,21 +1536,21 @@ TEST_F(routingTest,simpleRoute3Domains)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -1564,21 +1564,21 @@ TEST_F(routingTest,simpleRoute3Domains)
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_MONO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink.domainID = domainID1;
     gwSink.name = "gwSink";
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
@@ -1688,28 +1688,28 @@ TEST_F(routingTest,simpleRoute4Domains)
     source.sourceState = SS_ON;
     source.sourceID = 0;
     source.sourceClassID = 5;
-    source.listConnectionFormats.push_back(CF_MONO);
+    source.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource.domainID = domainID2;
     gwSource.name = "gwsource1";
     gwSource.sourceState = SS_ON;
     gwSource.sourceID = 0;
     gwSource.sourceClassID = 5;
-    gwSource.listConnectionFormats.push_back(CF_ANALOG);
+    gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSource1.domainID = domainID3;
     gwSource1.name = "gwsource2";
     gwSource1.sourceState = SS_ON;
     gwSource1.sourceID = 0;
     gwSource1.sourceClassID = 5;
-    gwSource1.listConnectionFormats.push_back(CF_MONO);
+    gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSource2.domainID = domainID4;
     gwSource2.name = "gwsource3";
     gwSource2.sourceState = SS_OFF;
     gwSource2.sourceID = 0;
     gwSource2.sourceClassID = 5;
-    gwSource2.listConnectionFormats.push_back(CF_STEREO);
+    gwSource2.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID));
@@ -1724,28 +1724,28 @@ TEST_F(routingTest,simpleRoute4Domains)
     gwSink.sinkID = 0;
     gwSink.sinkClassID = 5;
     gwSink.muteState = MS_MUTED;
-    gwSink.listConnectionFormats.push_back(CF_MONO);
+    gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     gwSink1.domainID = domainID2;
     gwSink1.name = "gwSink1";
     gwSink1.sinkID = 0;
     gwSink1.sinkClassID = 5;
     gwSink1.muteState = MS_MUTED;
-    gwSink1.listConnectionFormats.push_back(CF_ANALOG);
+    gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
 
     gwSink2.domainID = domainID3;
     gwSink2.name = "gwSink2";
     gwSink2.sinkID = 0;
     gwSink2.sinkClassID = 5;
     gwSink2.muteState = MS_MUTED;
-    gwSink2.listConnectionFormats.push_back(CF_MONO);
+    gwSink2.listConnectionFormats.push_back(CF_GENIVI_MONO);
 
     sink.domainID = domainID4;
     sink.name = "sink1";
     sink.sinkID = 0;
     sink.sinkClassID = 5;
     sink.muteState = MS_MUTED;
-    sink.listConnectionFormats.push_back(CF_STEREO);
+    sink.listConnectionFormats.push_back(CF_GENIVI_STEREO);
 
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID));
diff --git a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp b/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp
index 61ca296..33aa7f6 100644
--- a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp
@@ -84,8 +84,8 @@ TEST_F(routingInterfaceTest,abort)
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
 
     //start a connect, expect a call on the routingInterface
-    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2));
+    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2));
 
     //check the correctness of the handle
     ASSERT_NE(handle.handle, 0);
@@ -128,12 +128,12 @@ TEST_F(routingInterfaceTest,alreadyConnected)
     sink.domainID = 1;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
-    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK));
+    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
     am_Handle_s handle;
     am_connectionID_t connectionID;
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2));
     ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
-    ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2));
+    ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2));
     ASSERT_NE(handle.handle, 0);
     ASSERT_EQ(handle.handleType, H_CONNECT);
 }
@@ -146,7 +146,7 @@ TEST_F(routingInterfaceTest,setSinkSoundPropertyNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_SoundProperty_s soundProperty;
-    soundProperty.type = SP_TREBLE;
+    soundProperty.type = SP_EXAMPLE_TREBLE;
     soundProperty.value = 23;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
@@ -244,7 +244,7 @@ TEST_F(routingInterfaceTest,setSourceVolumeNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_DIRECT;
+    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSource(source);
@@ -270,7 +270,7 @@ TEST_F(routingInterfaceTest,setSourceVolume)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_DIRECT;
+    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSource(source);
@@ -298,7 +298,7 @@ TEST_F(routingInterfaceTest,setSinkVolumeNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_DIRECT;
+    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
@@ -324,7 +324,7 @@ TEST_F(routingInterfaceTest,setSinkVolume)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_DIRECT;
+    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
@@ -361,8 +361,8 @@ TEST_F(routingInterfaceTest,connect)
     sink.domainID = 1;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
-    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2));
+    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2));
     ASSERT_NE(handle.handle, 0);
     ASSERT_EQ(handle.handleType, H_CONNECT);
     ASSERT_EQ(E_OK, pControlReceiver.getListHandles(listHandles));
@@ -387,8 +387,8 @@ TEST_F(routingInterfaceTest,disconnect)
     sink.domainID = 1;
     ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
     ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
-    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK));
-    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2));
+    EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK));
+    ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2));
     ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
     EXPECT_CALL(pMockInterface,asyncDisconnect(_,connectionID)).WillOnce(Return(E_OK));
     ASSERT_EQ(E_OK, pControlReceiver.disconnect(handle,connectionID));