Changed name of the gateway as per code review comments