Rename class
Cleanup comments and typos