Prepare for proper name change