HOPKINS: Apply a couple of renamings suggested by wjp