Renaming gateways controller. Fixes #391