Fixed class naming errors