HOPKINS: More renaming and refactoring