Small refactor.
Renamed any classes.
Small refactor.