Fix a couple of names