HOPKINS: Misc renaming