Change the names a bit.