HOPKINS: Some renaming