HOPKINS: More field renamings