HOPKINS: More renaming in the Global class