changes to use names instead of numbers for topologies and topology options