Refactoring switched from strings to symbols