Conventions: Add a trailing comment to header guards
Conventions: Include the class name in the class header