HOPKINS: Some more renaming and refactoring