HOPKINS: More renaming