name refactoring ("stepped" to "switch")