Add missing topologies
Update naming convention