Change names to be consistent