Keep old USI names so we don't break upgrading users.

See #68