Updated to reflect change in class names