Added a type for symbolic names
Refactoring