Switched to only unlocalized name, update keys