CustomerGateway renaming