Prepare for name change