Update the class name based on feedback from Bart