fixup! Reorganize locales keys