HOPKINS: Some renaming and refactoring