Rename servers to gateways