Change names a bit