bus: use new library naming conventions