HOPKINS: Some more refactoring and renaming