diff --git a/CMakeLists.txt b/CMakeLists.txt
index 269ad2f..7352f80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,10 +26,10 @@ SET( FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Final install path
 SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
 
 SET( QLSCRIBE_DBUS_SERVICE org.lightscribe )
-SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.Manager )
+SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.printManager )
 SET( QLSCRIBE_DBUS_DRIVES_SERVICE ${QLSCRIBE_DBUS_SERVICE}.drives )
 SET( QLSCRIBE_DBUS_PATH /org/lightscribe )
-SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/Manager ) # path to manager
+SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/printManager ) # path to manager
 SET( QLSCRIBE_DBUS_DRIVES_PATH ${QLSCRIBE_DBUS_PATH}/drives )   # base path under which drives located
 
 SUBDIRS( src )
diff --git a/debian/conffiles b/debian/conffiles
index 475600e..dfd4a8f 100644
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -1 +1 @@
-/usr/share/dbus-1/services/org.lightscribe.Manager.service
+/usr/share/dbus-1/services/org.lightscribe.printManager.service
diff --git a/lscribed/CMakeLists.txt b/lscribed/CMakeLists.txt
index 81f54a2..f31aeef 100644
--- a/lscribed/CMakeLists.txt
+++ b/lscribed/CMakeLists.txt
@@ -22,7 +22,7 @@ FIND_PACKAGE( Dbus32 REQUIRED )
 FIND_PACKAGE( LightScribe REQUIRED )
 
 SET( LSCRIBED_CONF_FILE ${CMAKE_CURRENT_BINARY_DIR}/lightscribe.conf )
-SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.Manager.service )
+SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.printManager.service )
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lscribed.h.in ${CMAKE_CURRENT_BINARY_DIR}/lscribed.h @ONLY )
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lightscribe.conf.in ${LSCRIBED_CONF_FILE}  @ONLY )
diff --git a/lscribed/introspecthandler.cpp b/lscribed/introspecthandler.cpp
index 84a8a92..b43a99b 100644
--- a/lscribed/introspecthandler.cpp
+++ b/lscribed/introspecthandler.cpp
@@ -45,7 +45,7 @@ DBusHandlerResult IntrospectHandler::processMessage( const Message &msg )
                           std::string( DBusManagerPath + pathlen, sublen )
                           + "\"/>";
          } else
-            introspect += "<node name=\"Manager\"/><node name=\"drives\"/>";
+            introspect += "<node name=\"printManager\"/><node name=\"drives\"/>";
       }
       introspect += "</node>";
 
diff --git a/lscribed/lightscribe.conf.in b/lscribed/lightscribe.conf.in
index e7e0382..e16854c 100644
--- a/lscribed/lightscribe.conf.in
+++ b/lscribed/lightscribe.conf.in
@@ -7,15 +7,12 @@
   <!-- Only root can own the service -->
   <policy user="root">
     <allow own="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on the interfaces -->
   <policy context="default">
-    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
-    <allow receive_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
+    <allow send_destination="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_destination="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
   </policy>
 
 </busconfig>