Put all the renames back.  The code was completely broken.