Fix naming convention
Fix class header