Revert "better name for gateway"

This reverts commit b6d081bda0a83059358cfcc2fad6bb392634ed1b.