Change a couple of names.