Changed Class Names to comply with the Exercise Spec