Fixed bad class naming