*Really* rename all the things
Show what the client says, too.