HOPKINS: Some more renaming and refactoring in Globals