Rename Class
Minor refactor
Rename class
Rename class