Edit strings to better comply with STS (refactored IDs too)

Vanity is a vain thing.