Update for name changes in Data.String