rename some dbus functions and clear up a bit of my own confusion about the locking...