Cleanup: rename generator modules