HOPKINS: More misc renaming