Renamed EndPoint mappings to Queue mappings