Have forked children rename themselves

(untested as Brad's changes are so disperse and undocumented it
makes things impossible to test)