HOPKINS: Some renaming, remove useless self-accessing code pointed by wjp