confbridge: Rename items for clarity and consistency.