Minor updates to class names and references