tidied "bus" naming to be consistent