Long Name Preservation

TBD.