Updated class definition names