Updated class naming