Button up string id changes.
All tests pass!