Fixed class naming