Switch names-generator arrays to be long-form Upstream-commit: bba3c14e2e15e07fee0e519a7b083dd89614a343 Component: engine