Updated class names for correct terminology.