align the DBus signature of xml files with the one defined into Franca

33 files changed, 178 insertions, 308 deletions

diff --git a/api/map-viewer/genivi-mapviewer-configuration.xml b/api/map-viewer/genivi-mapviewer-configuration.xml
index 4816f6c..1fb13d0 100644
--- a/api/map-viewer/genivi-mapviewer-configuration.xml
+++ b/api/map-viewer/genivi-mapviewer-configuration.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/mapviewer" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.mapviewer.Configuration">
+  <interface name="org.genivi.navigation.mapviewer.Configuration">
     <version>3.0.0 (21-01-2014)</version>
     <doc>
       <line>Configuration = This interface offers functions to set and retrieve configuration parameters</line>
diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
index 1db6da9..261693a 100644
--- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
+++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/mapviewer" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.mapviewer.MapViewerControl">
+  <interface name="org.genivi.navigation.mapviewer.MapViewerControl">
     <version>3.1.0 (03-03-2014)</version>
     <doc>
       <line>MapViewerControl = This interface offers functions to control the MapViewer</line>
@@ -58,7 +58,7 @@
           <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.mapviewer.MapViewerControl.Error.NoMoreMapViewInstanceHandles">
+      <error name="org.genivi.navigation.mapviewer.MapViewerControl.Error.NoMoreMapViewInstanceHandles">
         <doc>
           <line>This error is generated if no more map view instance handles are available</line>
         </doc>
@@ -80,7 +80,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.mapviewer.MapViewerControl.Error.MapViewInstanceNotAvailable">
+      <error name="org.genivi.navigation.mapviewer.MapViewerControl.Error.MapViewInstanceNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a map view instance handle that is not available</line>
         </doc>
diff --git a/api/map-viewer/genivi-mapviewer-session.xml b/api/map-viewer/genivi-mapviewer-session.xml
index 28aaae2..6531725 100644
--- a/api/map-viewer/genivi-mapviewer-session.xml
+++ b/api/map-viewer/genivi-mapviewer-session.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/mapviewer" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.mapviewer.Session">
+  <interface name="org.genivi.navigation.mapviewer.Session">
     <version>3.0.0 (21-01-2014)</version>
     <doc>
       <line>Session = This interface offers functions to create and delete sessions</line>
@@ -44,7 +44,7 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.mapviewer.Session.Error.NoMoreSessionHandles">
+      <error name="org.genivi.navigation.mapviewer.Session.Error.NoMoreSessionHandles">
         <doc>
           <line>This error is generated if no more session handles are available</line>
         </doc>
@@ -61,7 +61,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.mapviewer.Session.Error.SessionNotAvailable">
+      <error name="org.genivi.navigation.mapviewer.Session.Error.SessionNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a session handle that is not available</line>
         </doc>
diff --git a/api/navigation-core/genivi-navigationcore-configuration.xml b/api/navigation-core/genivi-navigationcore-configuration.xml
index 33ab614..b121f60 100644
--- a/api/navigation-core/genivi-navigationcore-configuration.xml
+++ b/api/navigation-core/genivi-navigationcore-configuration.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.Configuration">
+  <interface name="org.genivi.navigation.navigationcore.Configuration">
     <version>3.0.0 (21-01-2014)</version>
     <doc>
       <line>Configuration = This interface offers functions to set and retrieve configuration parameters</line>
diff --git a/api/navigation-core/genivi-navigationcore-guidance.xml b/api/navigation-core/genivi-navigationcore-guidance.xml
index d29a052..49b35af 100644
--- a/api/navigation-core/genivi-navigationcore-guidance.xml
+++ b/api/navigation-core/genivi-navigationcore-guidance.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.Guidance">
+  <interface name="org.genivi.navigation.navigationcore.Guidance">
     <version>3.1.0 (03-03-2014)</version>
     <doc>
       <line>Guidance = This interface offers functions that implement the route-guidance functionality of a navigation system</line>
@@ -69,7 +69,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Guidance.Error.VoiceNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Guidance.Error.VoiceNotAllowed">
         <doc>
           <line>This error is generated if the voice generation is inactive </line>
         </doc>
@@ -106,7 +106,7 @@
       </doc>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Guidance.Error.VoiceNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Guidance.Error.VoiceNotAllowed">
         <doc>
           <line>This error is generated if the voice generation is inactive </line>
         </doc>
@@ -290,7 +290,7 @@
           <line>key = ALTITUDE, value = value of type 'i', that expresses the altitude of the starting point in meters</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.Guidance.Error.NoManeuver">
+      <error name="org.genivi.navigation.navigationcore.Guidance.Error.NoManeuver">
         <doc>
           <line>This error is generated in case there's no maneuver until the destination</line>
         </doc>
@@ -327,7 +327,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Guidance.Error.NoManeuver">
+      <error name="org.genivi.navigation.navigationcore.Guidance.Error.NoManeuver">
         <doc>
           <line>This error is generated in case there's no maneuver until the destination</line>
         </doc>
diff --git a/api/navigation-core/genivi-navigationcore-locationinput.xml b/api/navigation-core/genivi-navigationcore-locationinput.xml
index 5a17ed3..84de0da 100644
--- a/api/navigation-core/genivi-navigationcore-locationinput.xml
+++ b/api/navigation-core/genivi-navigationcore-locationinput.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.LocationInput">
+  <interface name="org.genivi.navigation.navigationcore.LocationInput">
     <version>3.0.0 (21-01-2014)</version>
     <doc>
       <line>LocationInput = This interface offers functions that implement the location-input functionality of a navigation system</line>
@@ -42,7 +42,7 @@
           <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.LocationInput.Error.NoMoreLocationInputHandles">
+      <error name="org.genivi.navigation.navigationcore.LocationInput.Error.NoMoreLocationInputHandles">
         <doc>
           <line>This error is generated if no more location input handles are available</line>
         </doc>
@@ -64,7 +64,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.LocationInput.Error.LocationInputNotAvailable">
+      <error name="org.genivi.navigation.navigationcore.LocationInput.Error.LocationInputNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a location input handle that is not available</line>
         </doc>
diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
index dc2a642..05f26c1 100644
--- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
+++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.MapMatchedPosition">
+  <interface name="org.genivi.navigation.navigationcore.MapMatchedPosition">
     <version>3.0.0 (21-01-2014)</version>
     <doc>
       <line>MapMatchedPosition = This interface offers functions to retrieve the map matched position and to simulate positioning</line>
@@ -184,7 +184,7 @@
           <line>key = SIMULATION_MODE, value = value of type 'b', where TRUE means that the current position is simulated</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.MapMatchedPosition.Error.NoPosition">
+      <error name="org.genivi.navigation.navigationcore.MapMatchedPosition.Error.NoPosition">
         <doc>
           <line>This error is generated if no position is available</line>
         </doc>
@@ -265,12 +265,12 @@
           <line>key = ROADSHIELDS, value = value of type ´a(sa(is)s)´, that identifies a roadshield</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.MapMatchedPosition.Error.NoMap">
+      <error name="org.genivi.navigation.navigationcore.MapMatchedPosition.Error.NoMap">
         <doc>
           <line>This error is generated if no map is available</line>
         </doc>
       </error>
-      <error name="org.genivi.navigationcore.MapMatchedPosition.Error.OutOfKnownMap">
+      <error name="org.genivi.navigation.navigationcore.MapMatchedPosition.Error.OutOfKnownMap">
         <doc>
           <line>This error is generated if the vehicle is located in a position outside of the known map</line>
         </doc>
diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml
index 3b7f56d..747967f 100644
--- a/api/navigation-core/genivi-navigationcore-routing.xml
+++ b/api/navigation-core/genivi-navigationcore-routing.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.Routing">
+  <interface name="org.genivi.navigation.navigationcore.Routing">
     <version>3.0.0 (22-01-2014)</version>
     <doc>
       <line>Routing = This interface offers functions that implement the routing functionality of a navigation system</line>
@@ -42,7 +42,7 @@
           <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.NoMoreRouteHandles">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.NoMoreRouteHandles">
         <doc>
           <line>This error is generated if no more routing handles are available</line>
         </doc>
@@ -64,12 +64,12 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.RouteNotAvailable">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.RouteNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a route handle that is not available</line>
         </doc>
       </error>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to delete a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -114,7 +114,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set a cost model for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -204,12 +204,12 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set route preferences for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
       </error>
-      <error name="org.genivi.navigationcore.Routing.Error.RoutePreferenceNotSupported">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.RoutePreferenceNotSupported">
         <doc>
           <line>This error is generated if an application tries to set a route preference which is not supported (e.g. (USE,CRIME_AREA)). The preferences which are not supported are product dependent.</line>
         </doc>
@@ -353,7 +353,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set transportation means for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -412,7 +412,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set excluded areas for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -473,17 +473,17 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.WaypointCannotBeChanged">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.WaypointCannotBeChanged">
         <doc>
           <line>This error is sent when a client application tries to change the waypoints while the route guidance is active</line>
         </doc>
       </error>
-      <error name="org.genivi.navigationcore.Routing.Error.TooManyWaypoints">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.TooManyWaypoints">
         <doc>
           <line>This error is sent when a client application tries to set a number of waypoints that exceeds the system capabilities</line>
         </doc>
       </error>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set waypoints for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -532,7 +532,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to calculate a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
@@ -660,7 +660,7 @@
           <line>alternativeRoute = Handle identifying an alternative route. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
+      <error name="org.genivi.navigation.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to calculate an alternative to a route which is not created manually (e.g. an alternative route calculated in the background)</line>
         </doc>
diff --git a/api/navigation-core/genivi-navigationcore-session.xml b/api/navigation-core/genivi-navigationcore-session.xml
index 6012ad4..9b9e46b 100644
--- a/api/navigation-core/genivi-navigationcore-session.xml
+++ b/api/navigation-core/genivi-navigationcore-session.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigationcore.Session">
+  <interface name="org.genivi.navigation.navigationcore.Session">
     <version>3.0.0 (22-01-2014)</version>
     <doc>
       <line>Session = This interface offers functions to create and delete sessions</line>
@@ -44,7 +44,7 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
-      <error name="org.genivi.navigationcore.Session.Error.NoMoreSessionHandles">
+      <error name="org.genivi.navigation.navigationcore.Session.Error.NoMoreSessionHandles">
         <doc>
           <line>This error is generated if no more session handles are available</line>
         </doc>
@@ -61,7 +61,7 @@
       </arg>
       <arg name="error" type="i" direction="out">
       </arg>
-      <error name="org.genivi.navigationcore.Session.Error.SessionNotAvailable">
+      <error name="org.genivi.navigation.navigationcore.Session.Error.SessionNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a session handle that is not available</line>
         </doc>
diff --git a/api/poi-service/genivi-poiservice-configuration.xml b/api/poi-service/genivi-poiservice-configuration.xml
index 5b018fb..62c671d 100644
--- a/api/poi-service/genivi-poiservice-configuration.xml
+++ b/api/poi-service/genivi-poiservice-configuration.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.poiservice.Configuration">
+  <interface name="org.genivi.navigation.poiservice.Configuration">
     <version>1.0.0 (10-03-2015)</version>
     <doc>
       <line>Configuration = This interface offers functions to set and retrieve configuration parameters</line>
diff --git a/api/poi-service/genivi-poiservice-contentaccessmodule.xml b/api/poi-service/genivi-poiservice-contentaccessmodule.xml
index b000da4..1d4a321 100644
--- a/api/poi-service/genivi-poiservice-contentaccessmodule.xml
+++ b/api/poi-service/genivi-poiservice-contentaccessmodule.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/poiservice" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.poiservice.POIContentAccessModule">
+  <interface name="org.genivi.navigation.poiservice.POIContentAccessModule">
     <version>1.0.0 (19-12-2012)</version>
     <doc>
       <line>This interface offers a set of common methods to the POI components to deal with all the content access modules (CAM). The CAM provide and update POI and categories information from remote sources to the POIService modules</line>
@@ -120,7 +120,7 @@
           <line>top_level = true if the category is a pre-defined one (top level with only ALL_CATEGORIES as parent), false for customized categories created by plug-in.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>The category is not available.</line>
         </doc>
@@ -142,7 +142,7 @@
           <line>top_level = true if the category is a pre-defined one (top level with only ALL_CATEGORIES as parent), false for customized categories created by plug-in.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>The category is not available.</line>
         </doc>
@@ -323,17 +323,17 @@
           <line>value = value. The value depends on the attribute specifications and type.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidCategory">
         <doc>
           <line>The category associated to a POI is not valid or was not added by the CAM to the component.</line>
         </doc>
@@ -369,12 +369,12 @@
           <line>Note: This list only contains the available attributes. If there is no value for an optional attributes, it is not returned.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidPoiSourceId">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidPoiSourceId">
         <doc>
           <line>The poi unique source id is not valid for the content access module.</line>
         </doc>
diff --git a/api/poi-service/genivi-poiservice-poicontentaccess.xml b/api/poi-service/genivi-poiservice-poicontentaccess.xml
index f8d3abb..0ba0163 100644
--- a/api/poi-service/genivi-poiservice-poicontentaccess.xml
+++ b/api/poi-service/genivi-poiservice-poicontentaccess.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/poiservice" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.poiservice.POIContentAccess">
+  <interface name="org.genivi.navigation.poiservice.POIContentAccess">
     <version>1.0.0 (19-12-2012)</version>
     <doc>
       <line>This interface offers a set of common methods for Content Access Modules (CAM). The CAM provide and update POI and categories information from remote sources to the POIService modules</line>
@@ -28,7 +28,7 @@
           <line>camId = Content access module unique id as known by the POI service component.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.RegistrationFailed">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.RegistrationFailed">
         <doc>
           <line>The registration failed (for instance the name is not unique).</line>
         </doc>
@@ -43,7 +43,7 @@
           <line>camId = Content access module unique id as known by the POI service component.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
@@ -66,12 +66,12 @@
           <line>unique_id = Unique category id</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidCategory">
         <doc>
           <line>The category was already registered.</line>
         </doc>
@@ -115,12 +115,12 @@
           <line>Note: A POI category is a unique ID.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidCategory">
         <doc>
           <line>The category was already added or is already a predifined one.</line>
           <line>Note: As there is no id yet, a category is defined as unique if there was no category registered before with the same name and parent category.</line>
@@ -155,18 +155,18 @@
           <line>name = name to be displayed by application</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.ReadOnly">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.ReadOnly">
         <doc>
           <line>At least one of the attribute of a given category was not updated due to read-only policy.</line>
           <line>Note: The other attributes were updated.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidCategory">
         <doc>
           <line>One of the category is not available.</line>
         </doc>
@@ -189,18 +189,18 @@
           <line>unique_id = unique category id</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.CamNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.CamNotAvailable">
         <doc>
           <line>This error is generated if an application tries to send data to the POI service component but the CAM id is not registered.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.ReadOnly">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.ReadOnly">
         <doc>
           <line>At least one of the category was not deleted due to read-only policy.</line>
           <line>Note: The other categories were removed.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiContentAccess.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiContentAccess.Error.InvalidCategory">
         <doc>
           <line>One of the category is not available.</line>
         </doc>
diff --git a/api/poi-service/genivi-poiservice-poisearch.xml b/api/poi-service/genivi-poiservice-poisearch.xml
index 7020beb..3fc44be 100644
--- a/api/poi-service/genivi-poiservice-poisearch.xml
+++ b/api/poi-service/genivi-poiservice-poisearch.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/poiservice" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.poiservice.POISearch">
+  <interface name="org.genivi.navigation.poiservice.POISearch">
     <version>1.0.0 (19-12-2012)</version>
     <doc>
       <line>This interface offers methods that implement the POI search functionality of a navigation system</line>
@@ -87,7 +87,7 @@
           <line>top_level = true if the category is a pre-defined one (top level with only ALL_CATEGORIES as parent), false for customized categories created by plug-in.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>The category is not available.</line>
         </doc>
@@ -109,7 +109,7 @@
           <line>top_level = true if the category is a pre-defined one (top level with only ALL_CATEGORIES as parent), false for customized categories created by plug-in.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>The category is not available.</line>
         </doc>
@@ -166,7 +166,7 @@
           <line>name = name to be displayed by application</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>The category is not available.</line>
           <line>If there are more than one category and one of them is not available, no detailed will be returned for this category but there will be no error.</line>
@@ -195,7 +195,7 @@
           <line>poiSearchHandle = poi search unique handle</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.NoMoreHandles">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.NoMoreHandles">
         <doc>
           <line>This error is generated if no more poi search unique handles are available</line>
         </doc>
@@ -210,7 +210,7 @@
           <line>poiSearchHandle = poi search unique handle</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a poi search unique handle that is not available</line>
         </doc>
@@ -234,17 +234,17 @@
           <line>alt = altitude above the sea level of the current position in meters</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidPosition">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidPosition">
         <doc>
           <line>This error is generated if an application tries to set invalid coordinates.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.SearchIsActive">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.SearchIsActive">
         <doc>
           <line>This error is generated if an application tries to change the search criteria but the search is on-going and could not be updated.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -281,17 +281,17 @@
           <line>endSearchOffset (optional) = Lenght of the route (in meters) from where to start the search along. 0 or invalid lenght means end is the destination.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidRouteHandle">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidRouteHandle">
         <doc>
           <line>This error is generated if an application tries to set invalid route handle.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.SearchIsActive">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.SearchIsActive">
         <doc>
           <line>This error is generated if an application tries to change the search criteria but the search is on-going and could not be updated.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -314,17 +314,17 @@
           <line>Note: A POI category is a unique ID. It could be a predifined category or a custom one defined by a POI plug-in.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>This error is generated if an application tries to set one or more invalid poi categories.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.SearchIsActive">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.SearchIsActive">
         <doc>
           <line>This error is generated if an application tries to change the search criteria but the search is on-going and could not be updated.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -351,17 +351,17 @@
           <line>mandatory = true if the attribute is mandatory for the search and false for optional.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidPoiAttribute">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidPoiAttribute">
         <doc>
           <line>This error is generated if an application tries to set one or more invalid poi attributes.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.SearchIsActive">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.SearchIsActive">
         <doc>
           <line>This error is generated if an application tries to change the search criteria but the search is on-going and could not be updated.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -389,17 +389,17 @@
           <line>If more than one category was defined for this search, the sort criteria should be compliant with all categories.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>This error is generated if an application tries to start a search without, at least, one poi category defined.</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.BadLocation">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.BadLocation">
         <doc>
           <line>This error is generated if an application tries to start a search without a valid location (coordinates or route handle) defined.</line>
         </doc>
@@ -414,7 +414,7 @@
           <line>poiSearchHandle = poi search unique handle</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -442,12 +442,12 @@
           <line>If more than one category was defined for this search, the sort criteria should be compliant with all categories.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidCategory">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidCategory">
         <doc>
           <line>This error is generated if an application tries to start a search without, at least, one poi category defined.</line>
         </doc>
@@ -462,7 +462,7 @@
           <line>poiSearchHandle = poi alert unique handle</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
@@ -545,12 +545,12 @@
           <line>value = value. The value depends on the attribute specifications and type.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.HandleNotAvailable">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.HandleNotAvailable">
         <doc>
           <line>This error is generated if an application tries to use a poi search unique handle that is not available or not valid</line>
         </doc>
       </error>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidPoiAttribute">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidPoiAttribute">
         <doc>
           <line>This error is generated if an application tries to get one or more invalid poi attributes.</line>
         </doc>
@@ -586,7 +586,7 @@
           <line>value = value. The value depends on the attribute specifications and type.</line>
         </doc>
       </arg>
-      <error name="org.genivi.poiservice.poiSearch.Error.InvalidPoiId">
+      <error name="org.genivi.navigation.poiservice.poiSearch.Error.InvalidPoiId">
         <doc>
           <line>The poi unique id is not valid.</line>
         </doc>
diff --git a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
index fc09163..1b18bd6 100644
--- a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
@@ -36,4 +36,4 @@ set(genivi_mapviewer_configuration_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_mapviewer_configuration_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_configuration genivi_mapviewer_configuration.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-configuration_adaptor.h)
-
+add_dependencies(genivi_mapviewer_configuration ${API_DIR}/map-viewer)
diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
index b3c74a8..9a426db 100644
--- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
@@ -122,7 +122,7 @@ country_2_to_3(const char *in)
 std::map< int32_t, int32_t > m_unitsOfMeasurement;
 
 class  Configuration
-: public org::genivi::mapviewer::Configuration_adaptor,
+: public org::genivi::navigation::mapviewer::Configuration_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -272,7 +272,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.mapviewer.Configuration");
+    conn->request_name("org.genivi.navigation.mapviewer.Configuration");
     m_unitsOfMeasurement[GENIVI_MAPVIEWER_LENGTH]=GENIVI_MAPVIEWER_KM;
 	server=new Configuration(*conn);
 }
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
index b7dbaca..2b83ce0 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
@@ -50,4 +50,5 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core)
 set(genivi_mapviewer_mapviewercontrol_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_mapviewercontrol genivi_mapviewer_mapviewercontrol.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-mapviewercontrol_adaptor.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-routing_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-session_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-mapmatchedposition_proxy.h)
+add_dependencies(genivi_mapviewer_mapviewercontrol ${API_DIR}/map-viewer)
 
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index b1c2f76..a591cfb 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -175,13 +175,13 @@ static std::map<uint32_t, MapViewerControlObj *> handles;
 
 
 class Routing
-: public org::genivi::navigationcore::Routing_proxy,
+: public org::genivi::navigation::navigationcore::Routing_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	MapViewerControlObj *m_mapviewerobj;
 	Routing(DBus::Connection &connection, MapViewerControlObj *obj)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.Routing")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing")
 	{
 		m_mapviewerobj=obj;
 	}
@@ -231,12 +231,12 @@ class Routing
 };
 
 class  NavigationCoreSession
-: public org::genivi::navigationcore::Session_proxy,
+: public org::genivi::navigation::navigationcore::Session_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	NavigationCoreSession(DBus::Connection &connection)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.Session")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Session")
 	{
 	}
     void SessionDeleted(const uint32_t& sessionHandle)
@@ -247,14 +247,14 @@ class  NavigationCoreSession
 static void position_update(MapMatchedPosition *pos, struct vehicle *v);
 
 class  MapMatchedPosition
-: public org::genivi::navigationcore::MapMatchedPosition_proxy,
+: public org::genivi::navigation::navigationcore::MapMatchedPosition_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	struct callback *cb;
 	MapViewerControlObj *m_mapviewerobj;
 	MapMatchedPosition(DBus::Connection &connection, struct vehicle *v)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition")
 	{	
 		cb=callback_new_2(callback_cast(position_update), this, v);
 	}
@@ -331,7 +331,7 @@ position_update(MapMatchedPosition *pos, struct vehicle *v)
 }
 
 class  MapViewerControl
-: public org::genivi::mapviewer::MapViewerControl_adaptor,
+: public org::genivi::navigation::mapviewer::MapViewerControl_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -1779,7 +1779,7 @@ plugin_init(void)
 		conns[i] = new DBus::Connection(DBus::Connection::SessionBus());
 		conns[i]->setup(&dispatchers[i]);
 	}
-    conns[MAPVIEWER_CONTROL_CONNECTION]->request_name("org.genivi.mapviewer.MapViewerControl");
+    conns[MAPVIEWER_CONTROL_CONNECTION]->request_name("org.genivi.navigation.mapviewer.MapViewerControl");
     server=new MapViewerControl(*conns[MAPVIEWER_CONTROL_CONNECTION]);
 
 #if LM
diff --git a/src/navigation/map-viewer/session-plugin/CMakeLists.txt b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
index dd1a7de..d191822 100644
--- a/src/navigation/map-viewer/session-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
@@ -36,4 +36,5 @@ set(genivi_mapviewer_session_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_mapviewer_session_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_session genivi_mapviewer_session.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-session_adaptor.h)
+add_dependencies(genivi_mapviewer_session ${API_DIR}/map-viewer)
 
diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
index 2c3bd97..832bc72 100644
--- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
@@ -47,7 +47,7 @@ static DBus::Connection *conn;
 static std::map<uint32_t, std::string *> handles;
 
 class  Session
-: public org::genivi::mapviewer::Session_adaptor,
+: public org::genivi::navigation::mapviewer::Session_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -75,7 +75,7 @@ class  Session
         while (handles[sessionHandle]) {
             sessionHandle++;
             if (sessionHandle == 256)
-				throw DBus::Error("org.genivi.mapviewer.Session.Error.NoMoreSessionHandles","Out of session handles");
+				throw DBus::Error("org.genivi.navigation.mapviewer.Session.Error.NoMoreSessionHandles","Out of session handles");
 		}
         handles[sessionHandle]=new std::string(client);
         error=0; //not implemented yet
@@ -93,7 +93,7 @@ class  Session
 	{
 		dbg(lvl_debug,"enter\n");
 		if (!handles[SessionHandle])
-			throw DBus::Error("org.genivi.mapviewer.Session.Error.NotAvailableSessionHandle","Session handle invalid");
+			throw DBus::Error("org.genivi.navigation.mapviewer.Session.Error.NotAvailableSessionHandle","Session handle invalid");
 		delete(handles[SessionHandle]);
 		handles[SessionHandle]=NULL;
 		SessionDeleted(SessionHandle);
@@ -128,6 +128,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.mapviewer.Session");
+	conn->request_name("org.genivi.navigation.mapviewer.Session");
 	server=new Session(*conn);
 }
diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
index b2a665b..1c5418f 100644
--- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
@@ -124,7 +124,7 @@ country_2_to_3(const char *in)
 std::map< int32_t, int32_t > m_unitsOfMeasurement;
 
 class  Configuration
-: public org::genivi::navigationcore::Configuration_adaptor,
+: public org::genivi::navigation::navigationcore::Configuration_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -287,7 +287,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Configuration");
+    conn->request_name("org.genivi.navigation.navigationcore.Configuration");
     m_unitsOfMeasurement[GENIVI_NAVIGATIONCORE_LENGTH]=GENIVI_NAVIGATIONCORE_KM;
 	server=new Configuration(*conn);
 }
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 4e2183f..30c7f0f 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -69,7 +69,7 @@ class SpeechOutput
     SpeechOutput(DBus::Connection &connection)
         : DBus::ObjectProxy(connection,
                                     "/org/genivi/hmi/speechservice/SpeechOutput",
-                                    "org.genivi.hmi.speechservice.SpeechOutput")
+                                    "org.genivi.navigation.hmi.speechservice.SpeechOutput")
     {
     }
 
@@ -202,7 +202,7 @@ variant_enumeration(DBusCommonAPIEnumeration i)
 }
 
 class  Guidance
-: public org::genivi::navigationcore::Guidance_adaptor,
+: public org::genivi::navigation::navigationcore::Guidance_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -855,6 +855,6 @@ plugin_init(void)
 	// FIXME: What dbus address to use? 
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Guidance");
+	conn->request_name("org.genivi.navigation.navigationcore.Guidance");
 	server=new Guidance(*conn);
 }
diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
index 82b5aab..4aead3d 100644
--- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
@@ -90,7 +90,7 @@ static std::map<uint32_t, LocationInputObj *> handles;
 
 
 class  LocationInput
-: public org::genivi::navigationcore::LocationInput_adaptor,
+: public org::genivi::navigation::navigationcore::LocationInput_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -541,6 +541,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.LocationInput");
+	conn->request_name("org.genivi.navigation.navigationcore.LocationInput");
 	server=new LocationInput(*conn);
 }
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 72737b2..76c97c7 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -122,7 +122,7 @@ variant_string(std::string s)
 
 
 class  MapMatchedPosition
-: public org::genivi::navigationcore::MapMatchedPosition_adaptor,
+: public org::genivi::navigation::navigationcore::MapMatchedPosition_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -369,7 +369,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.MapMatchedPosition");
+	conn->request_name("org.genivi.navigation.navigationcore.MapMatchedPosition");
 	server=new MapMatchedPosition(*conn);
 	config_cb.type=attr_callback;
 	config_cb.u.callback=callback_new_attr_0(callback_cast(config_attr_navit), attr_navit);
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index c54ac99..b2ea8b4 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -129,7 +129,7 @@ static struct command_table commands[] = {
 
 
 class  Routing
-: public org::genivi::navigationcore::Routing_adaptor,
+: public org::genivi::navigation::navigationcore::Routing_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -939,6 +939,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Routing");
+	conn->request_name("org.genivi.navigation.navigationcore.Routing");
 	server=new Routing(*conn);
 }
diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
index 60e761e..661ff88 100644
--- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
@@ -47,7 +47,7 @@ static DBus::Connection *conn;
 static std::map<uint32_t, std::string *> handles;
 
 class  Session
-: public org::genivi::navigationcore::Session_adaptor,
+: public org::genivi::navigation::navigationcore::Session_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -75,7 +75,7 @@ class  Session
         while (handles[sessionHandle]) {
             sessionHandle++;
             if (sessionHandle == 256)
-				throw DBus::Error("org.genivi.navigationcore.Session.Error.NoMoreSessionHandles","Out of session handles");
+				throw DBus::Error("org.genivi.navigation.navigationcore.Session.Error.NoMoreSessionHandles","Out of session handles");
 		}
         handles[sessionHandle]=new std::string(client);
         error=0; //not implemented yet
@@ -93,7 +93,7 @@ class  Session
 	{
 		dbg(lvl_debug,"enter\n");
 		if (!handles[SessionHandle])
-			throw DBus::Error("org.genivi.navigationcore.Session.Error.NotAvailableSessionHandle","Session handle invalid");
+			throw DBus::Error("org.genivi.navigation.navigationcore.Session.Error.NotAvailableSessionHandle","Session handle invalid");
 		delete(handles[SessionHandle]);
 		handles[SessionHandle]=NULL;
 		SessionDeleted(SessionHandle);
@@ -130,6 +130,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Session");
+	conn->request_name("org.genivi.navigation.navigationcore.Session");
 	server=new Session(*conn);
 }
diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index b6e3364..77e071e 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -61,7 +61,7 @@ enum {
 
 static DBus::Glib::BusDispatcher dispatchers[CONNECTION_AMOUNT];
 static DBus::Connection *conns[CONNECTION_AMOUNT];
-static const char *cam_name="org.genivi.poiservice.POIContentAccessModuleNavit";
+static const char *cam_name="org.genivi.navigation.poiservice.POIContentAccessModuleNavit";
 
 static DBus::Variant
 variant_string(std::string s)
@@ -80,20 +80,20 @@ do_sort_distance(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct
 
 
 class PoiContentAccess
-: public org::genivi::poiservice::POIContentAccess_proxy,
+: public org::genivi::navigation::poiservice::POIContentAccess_proxy,
   public DBus::ObjectProxy
 {
 	public:
 
         PoiContentAccess(DBus::Connection &connection)
-        : DBus::ObjectProxy(connection, "/org/genivi/poiservice/POIContentAccess","org.genivi.poiservice.POIContentAccess")
+        : DBus::ObjectProxy(connection, "/org/genivi/poiservice/POIContentAccess","org.genivi.navigation.poiservice.POIContentAccess")
         {
         }
 
 };
 
 class ContentAccessModule
-: public org::genivi::poiservice::POIContentAccessModule_adaptor,
+: public org::genivi::navigation::poiservice::POIContentAccessModule_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
diff --git a/test/navigation/intensive-testing.py b/test/navigation/intensive-testing.py
deleted file mode 100644
index d702672..0000000
--- a/test/navigation/intensive-testing.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/python
-
-"""
-**************************************************************************
-* @licence app begin@
-* SPDX-License-Identifier: MPL-2.0
-*
-* \copyright Copyright (C) 2014, PCA Peugeot Citroen
-*
-* \file intensive-testing.py
-*
-* \brief This script tests the enhanced position by using  the logreplayer at a given frame rate.
-*
-* \author Philippe Colliot <philippe.colliot@mpsa.com>
-*
-* \version 1.0
-*
-* This Source Code Form is subject to the terms of the
-* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-* List of changes:
-* <date>, <name>, <description of change>
-*
-* @licence end@
-**************************************************************************
-"""
-import sys,tty,termios,select,gobject,time,dbus,re,argparse,subprocess,signal,os
-
-from subprocess import call 
-from subprocess import Popen 
-from threading import Timer
-from enum import Enum
-from dbus.mainloop.glib import DBusGMainLoop
-from traceback import print_exc
-
-# Define some constants
-DURATION_TESTING = 20000 #in ms
-PATH_LOGFILES='./'
-
-def startEnhancedPositionServer(): 
-	global pathEnhancedposition
-	enhancedposition=pathEnhancedposition + 'enhanced-position-service'
-	FNULL = open(os.devnull,'w')
-	pid = Popen([enhancedposition], stdout=FNULL, stderr=FNULL)
-	return pid
-
-def launchLog(file): 
-	global pathLogreplayer
-	logreplayer=pathLogreplayer + 'log-replayer'
-	file=PATH_LOGFILES + file
-	FNULL = open(os.devnull,'w')
-	call([logreplayer, file], stdout=FNULL, stderr=FNULL)
-
-class Genivi(Enum):
-	ENHANCEDPOSITIONSERVICE_LATITUDE = 0x0020
-	ENHANCEDPOSITIONSERVICE_LONGITUDE = 0x0021
-	ENHANCEDPOSITIONSERVICE_ALTITUDE = 0x0022
-      
-def loopDbus():
-	global testCounter
-	# launch the logreplayer with test file
-	launchLog("test.log")
-	# get the geolocation
-	geoLocation = enhancedPositionInterface.GetData(dbus.Array([Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE,Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE]))
-	latitude=float(geoLocation[dbus.UInt16(Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE)])
-	longitude=float(geoLocation[dbus.UInt16(Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE)])
-	testCounter += 1
-	print str(testCounter), str(latitude), str(longitude)
-	if testCounter >= maxLoopTesting:
-		cleanExit()
-	return True 
-
-def cleanExit():
-	global enhancedpositionPid
-	enhancedpositionPid.kill()
-	sys.exit(1)
-	
-def exitProg(signum, frame):
-	# restore the original signal handler and exit 
-	signal.signal(signal.SIGINT, original_sigint)
-	cleanExit()
-
-# Main program begins here
-parser = argparse.ArgumentParser(description='Intensive testing of enhanced position.')
-parser.add_argument('-p','--path',action='store', dest='path', help='Path for the bin of positioning')
-parser.add_argument('-f','--frame',action='store', dest='frame', type=int, help='Number of messages per second')
-args = parser.parse_args()
-
-if args.path == None:
-	pathEnhancedposition='../../src/navigation/bin/positioning/enhanced-position-service/src/'
-	pathLogreplayer='../../src/navigation/bin/positioning/log-replayer/src/'
-else:
-	pathEnhancedposition = args.path + 'bin/positioning/enhanced-position-service/src/' 
-	pathLogreplayer= args.path + 'bin/positioning/log-replayer/src/'
-
-if args.frame == None:
-	periodicityTesting = 200 #in ms
-else:
-	periodicityTesting = 1000/args.frame #in ms
-maxLoopTesting = DURATION_TESTING/periodicityTesting
-
-# Start the enhanced position server
-enhancedpositionPid = startEnhancedPositionServer()
-time.sleep(.5)
- 
-# Initialize DBus loop as the main loop
-DBusGMainLoop(set_as_default=True)
-
-# Connect on the bus
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-dbusConnectionBus = dbus.SessionBus()
-
-# Enhanced position
-try:
-	enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.positioning.EnhancedPosition", "/org/genivi/positioning/EnhancedPosition")
-except dbus.DBusException:
-	print "connection to Enhanced position failed"
-	print_exc()
-	cleanExit()
-
-enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.positioning.EnhancedPosition")
-
-# Start
-testCounter=0
-original_sigint = signal.getsignal(signal.SIGINT)
-signal.signal(signal.SIGINT, exitProg)
-gobject.timeout_add(periodicityTesting,loopDbus)
-loop = gobject.MainLoop()
-loop.run()
-
-
-
diff --git a/test/navigation/test-address-input.py b/test/navigation/test-address-input.py
index f561172..e9ab02a 100755
--- a/test/navigation/test-address-input.py
+++ b/test/navigation/test-address-input.py
@@ -330,15 +330,15 @@ def search_result_list_handler(handle, total_size, window_offset, window_size, r
 
 # add signal receiver
 bus.add_signal_receiver(search_status_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchStatus')
 
 bus.add_signal_receiver(search_result_list_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchResultList')
 
 bus.add_signal_receiver(content_updated_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='ContentUpdated')
 
 
@@ -374,16 +374,16 @@ def startSearch(address_index):
 
 startTrigger(test_name)  
   
-session = bus.get_object('org.genivi.navigationcore.Session', '/org/genivi/navigationcore')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session', '/org/genivi/navigationcore')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 # Get SessionHandle
 ret = session_interface.CreateSession(dbus.String('test location input'))
 session_handle=ret[1]
 print 'Session handle = ' + str(session_handle)
 
-location_input_obj = bus.get_object('org.genivi.navigationcore.LocationInput', '/org/genivi/navigationcore')
-location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigationcore.LocationInput')
+location_input_obj = bus.get_object('org.genivi.navigation.navigationcore.LocationInput', '/org/genivi/navigationcore')
+location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigation.navigationcore.LocationInput')
 
 # Get LocationInputHandle
 ret = location_input_interface.CreateLocationInput(dbus.UInt32(session_handle))
diff --git a/test/navigation/test-guidance.py b/test/navigation/test-guidance.py
index 7d8cb90..be53895 100755
--- a/test/navigation/test-guidance.py
+++ b/test/navigation/test-guidance.py
@@ -275,52 +275,52 @@ if __name__ == '__main__':
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(routing_routeCalculationProgressUpdate_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationProgressUpdate")
 
 bus.add_signal_receiver(routing_routeCalculationSuccessful_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationSuccessful")
 
 bus.add_signal_receiver(routing_routeDeleted_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteDeleted")
 
 bus.add_signal_receiver(session_sessionDeleted_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Session", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Session", \
                         signal_name = "SessionDeleted")
 
 bus.add_signal_receiver(guidance_guidanceStatusChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Guidance", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
                         signal_name = "GuidanceStatusChanged")
 
 bus.add_signal_receiver(guidance_positionOnRouteChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Guidance", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
                         signal_name = "PositionOnRouteChanged")
 
 bus.add_signal_receiver(mapmatchedposition_simulationStatusChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.MapMatchedPosition", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.MapMatchedPosition", \
                         signal_name = "SimulationStatusChanged")
 
 startTrigger(test_name)
 
-navigationcore_session_obj = bus.get_object('org.genivi.navigationcore.Session','/org/genivi/navigationcore')
-g_navigationcore_session_interface = dbus.Interface(navigationcore_session_obj, dbus_interface='org.genivi.navigationcore.Session')
+navigationcore_session_obj = bus.get_object('org.genivi.navigation.navigationcore.Session','/org/genivi/navigationcore')
+g_navigationcore_session_interface = dbus.Interface(navigationcore_session_obj, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
-routing_obj = bus.get_object('org.genivi.navigationcore.Routing','/org/genivi/navigationcore')
-g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigationcore.Routing')
+routing_obj = bus.get_object('org.genivi.navigation.navigationcore.Routing','/org/genivi/navigationcore')
+g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigation.navigationcore.Routing')
 
-guidance_obj = bus.get_object('org.genivi.navigationcore.Guidance','/org/genivi/navigationcore')
-g_guidance_interface = dbus.Interface(guidance_obj, dbus_interface='org.genivi.navigationcore.Guidance')
+guidance_obj = bus.get_object('org.genivi.navigation.navigationcore.Guidance','/org/genivi/navigationcore')
+g_guidance_interface = dbus.Interface(guidance_obj, dbus_interface='org.genivi.navigation.navigationcore.Guidance')
 
-mapviewer_session_obj = bus.get_object('org.genivi.mapviewer.Session','/org/genivi/mapviewer')
-g_mapviewer_session_interface = dbus.Interface(mapviewer_session_obj, dbus_interface='org.genivi.mapviewer.Session')
+mapviewer_session_obj = bus.get_object('org.genivi.navigation.mapviewer.Session','/org/genivi/mapviewer')
+g_mapviewer_session_interface = dbus.Interface(mapviewer_session_obj, dbus_interface='org.genivi.navigation.mapviewer.Session')
 
-g_mapviewercontrol_obj = bus.get_object('org.genivi.mapviewer.MapViewerControl','/org/genivi/mapviewer')
-g_mapviewercontrol_interface = dbus.Interface(g_mapviewercontrol_obj, dbus_interface='org.genivi.mapviewer.MapViewerControl')
+g_mapviewercontrol_obj = bus.get_object('org.genivi.navigation.mapviewer.MapViewerControl','/org/genivi/mapviewer')
+g_mapviewercontrol_interface = dbus.Interface(g_mapviewercontrol_obj, dbus_interface='org.genivi.navigation.mapviewer.MapViewerControl')
 
-g_mapmatchedposition_obj = bus.get_object('org.genivi.navigationcore.MapMatchedPosition','/org/genivi/navigationcore')
-g_mapmatchedposition_interface = dbus.Interface(g_mapmatchedposition_obj, dbus_interface='org.genivi.navigationcore.MapMatchedPosition')
+g_mapmatchedposition_obj = bus.get_object('org.genivi.navigation.navigationcore.MapMatchedPosition','/org/genivi/navigationcore')
+g_mapmatchedposition_interface = dbus.Interface(g_mapmatchedposition_obj, dbus_interface='org.genivi.navigation.navigationcore.MapMatchedPosition')
 
 #get navigationcore session handle
 ret = g_navigationcore_session_handle = g_navigationcore_session_interface.CreateSession(dbus.String("test guidance"))
diff --git a/test/navigation/test-location-input.py b/test/navigation/test-location-input.py
index 2d5fe1f..935c1f9 100755
--- a/test/navigation/test-location-input.py
+++ b/test/navigation/test-location-input.py
@@ -411,19 +411,19 @@ def search_result_list_handler(handle, total_size, window_offset, window_size, r
 
 # add signal receiver
 bus.add_signal_receiver(search_status_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchStatus')
 
 bus.add_signal_receiver(search_result_list_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchResultList')
 
 bus.add_signal_receiver(spell_result_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SpellResult')
 
 bus.add_signal_receiver(content_updated_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='ContentUpdated')
 
 
@@ -464,16 +464,16 @@ def startSearch(address_index):
 
 startTrigger(test_name)  
   
-session = bus.get_object('org.genivi.navigationcore.Session', '/org/genivi/navigationcore')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session', '/org/genivi/navigationcore')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 # Get SessionHandle
 ret = session_interface.CreateSession(dbus.String('test location input'))
 session_handle=ret[1]
 print 'Session handle = ' + str(session_handle)
 
-location_input_obj = bus.get_object('org.genivi.navigationcore.LocationInput', '/org/genivi/navigationcore')
-location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigationcore.LocationInput')
+location_input_obj = bus.get_object('org.genivi.navigation.navigationcore.LocationInput', '/org/genivi/navigationcore')
+location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigation.navigationcore.LocationInput')
 
 # Get LocationInputHandle
 ret = location_input_interface.CreateLocationInput(dbus.UInt32(session_handle))
diff --git a/test/navigation/test-map-viewer-control.py b/test/navigation/test-map-viewer-control.py
index 628e706..aae6058 100755
--- a/test/navigation/test-map-viewer-control.py
+++ b/test/navigation/test-map-viewer-control.py
@@ -102,14 +102,14 @@ if __name__ == '__main__':
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(mapviewer_mapViewScaleChanged_handler, \
-                        dbus_interface = "org.genivi.mapviewer.MapViewerControl", \
+                        dbus_interface = "org.genivi.navigation.mapviewer.MapViewerControl", \
                         signal_name = "MapViewScaleChanged")
 
 
 startTrigger(test_name)  
 
-session = bus.get_object('org.genivi.mapviewer.Session','/org/genivi/mapviewer')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.mapviewer.Session')
+session = bus.get_object('org.genivi.navigation.mapviewer.Session','/org/genivi/mapviewer')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.mapviewer.Session')
 
 #get session handle
 ret = session_interface.CreateSession(dbus.String("test mapviewer"))
@@ -122,8 +122,8 @@ print 'Session status: ' + str(sessionstatus)
 sessionlist = session_interface.GetAllSessions();
 print 'Active sessions = ' + str(len(sessionlist))
 
-MapViewerControl_obj = bus.get_object('org.genivi.mapviewer.MapViewerControl','/org/genivi/mapviewer')
-MapViewerControl_interface = dbus.Interface(MapViewerControl_obj, dbus_interface='org.genivi.mapviewer.MapViewerControl')
+MapViewerControl_obj = bus.get_object('org.genivi.navigation.mapviewer.MapViewerControl','/org/genivi/mapviewer')
+MapViewerControl_interface = dbus.Interface(MapViewerControl_obj, dbus_interface='org.genivi.navigation.mapviewer.MapViewerControl')
 
 #get mapviewer handle
 ret = MapViewerControl_interface.CreateMapViewInstance( \
diff --git a/test/navigation/test-poi.py b/test/navigation/test-poi.py
index 6346175..7df6c82 100755
--- a/test/navigation/test-poi.py
+++ b/test/navigation/test-poi.py
@@ -107,27 +107,27 @@ print("Search for hotel and station with keyword: "+ STRING_TO_SEARCH)
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(catch_poi_configurationChanged_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POIConfiguration", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POIConfiguration", \
                         signal_name = "configurationChanged")
 
 bus.add_signal_receiver(catch_poi_poiStatus_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POISearch", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
                         signal_name = "poiStatus")
 
 bus.add_signal_receiver(catch_poi_resultListChanged_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POISearch", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
                         signal_name = "resultListChanged")
 
 startTrigger(test_name)
 
-poiConfiguration = bus.get_object('org.genivi.poiservice.POIConfiguration','/org/genivi/poiservice')
-g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.poiservice.POIConfiguration')
+poiConfiguration = bus.get_object('org.genivi.navigation.poiservice.POIConfiguration','/org/genivi/poiservice')
+g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.navigation.poiservice.POIConfiguration')
 
-poiContentAccess = bus.get_object('org.genivi.poiservice.POIContentAccess','/org/genivi/poiservice')
-g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.poiservice.POIContentAccess')
+poiContentAccess = bus.get_object('org.genivi.navigation.poiservice.POIContentAccess','/org/genivi/poiservice')
+g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.navigation.poiservice.POIContentAccess')
 
-poiSearch = bus.get_object('org.genivi.poiservice.POISearch','/org/genivi/poiservice')
-g_poiSearch_interface = dbus.Interface(poiSearch, dbus_interface='org.genivi.poiservice.POISearch')
+poiSearch = bus.get_object('org.genivi.navigation.poiservice.POISearch','/org/genivi/poiservice')
+g_poiSearch_interface = dbus.Interface(poiSearch, dbus_interface='org.genivi.navigation.poiservice.POISearch')
 
 g_poiConfiguration_interface.setLocale(dbus.String("fra"),dbus.String("FRA"),dbus.String("Latn"))
 
diff --git a/test/navigation/test-route-calculation.py b/test/navigation/test-route-calculation.py
index 35fd997..f0a5221 100755
--- a/test/navigation/test-route-calculation.py
+++ b/test/navigation/test-route-calculation.py
@@ -145,15 +145,15 @@ def catchall_route_deleted_signals_handler(routeHandle):
     print('Route handle deleted: '+str(routeHandle))
 
 bus.add_signal_receiver(catchall_route_calculation_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationProgressUpdate")
 
 bus.add_signal_receiver(catchall_route_deleted_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteDeleted")
 
 bus.add_signal_receiver(catchall_session_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Session", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Session", \
                         signal_name = "SessionDeleted")
 
 #timeout
@@ -197,16 +197,16 @@ def launch_route_calculation(route):
 
 startTrigger(test_name)  
 
-session = bus.get_object('org.genivi.navigationcore.Session','/org/genivi/navigationcore')
-g_session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session','/org/genivi/navigationcore')
+g_session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 #get session handle
 ret = g_session_interface.CreateSession(dbus.String("test route calculation"))
 g_session_handle=ret[1]
 print 'Session handle: ' + str(g_session_handle)
 
-routing_obj = bus.get_object('org.genivi.navigationcore.Routing','/org/genivi/navigationcore')
-g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigationcore.Routing')
+routing_obj = bus.get_object('org.genivi.navigation.navigationcore.Routing','/org/genivi/navigationcore')
+g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigation.navigationcore.Routing')
 
 g_current_route = 0
 launch_route_calculation(0)