Migrated gates
Minor renaming