Follow up from #229
In preparation to moving to GNOME all the IDs, DBus object paths, etc should change. Closes #303