Fixed broker_cn references