Fix: Derive correct Broker service name