HOPKINS: Misc renaming, some sound refactoring