Better controller naming
Merge branch 'config-tool-capi-put' of github.com:guardian/frontend into config-tool-capi-put