Fix class naming