Modify dbus name
merge conflict