HOPKINS: Get rid of a magic value, more renaming