HOPKINS: Some more renaming