FIX: gate name discordances (mainly) between classes and topology