Small menu typo
Rename classes in preparation for a new class in a coming commit
More refactoring