Rename class name to reflect recent changes