Revert back to using normalized first and last on DDL.