More name change edits.