Refactored the visitor names.

Added support for Switch Ranges.