Rename generator to use same namespace