Renamed methods for visitor pattern
Renamed some things, implement visitor pattern for rendering.