HOPKINS: Various renaming