Minor refactor
Rename class