Looks like the filename is ultimately <selector>_<identifier>_<localeIdentifier>, but we have to pass both the identifier and localeIdentifier through a lot of methods before that concatenation happens. What I'm wondering is if the macro still has a localeIdentifier parameter (not mixed) but the concatenation happens right there (identifier = <identifer>_<localeIdentifier>). That way all the code below that can be indifferent to the fact that there's a localeIdentifier. If I'm understanding right, that doesn't mix identifier and localeIdentifier any more than it's mixed in this PR, we're just concatenating sooner. Sound right?