Moving names from switch attributes to keyword attributes