Fix class naming convention