Yah - I guess renaming might be good so that if one key fails to load you can see which one.

As for linking to #220...  I'm opposed to that. It's not really clear what the issue in #220 is and I'm not convinced it's not user error. The inspiration for this commit is #220 but I'm not sure this commit fixes that. The guy said he "I inserted the system keys directly via PHP and not via Copy&Paste" making me think spaces weren't the issue so it's unclear what - if anything - was. He does say that the commit fixed one of the issues for him but I'm not convinced it wasn't just dumb luck on his part either. Like maybe there keys aren't matching in most of the cases but in this one case they were. idk.

Anyway, how would you propose "linking" to that issue anyway?

Finally, I'm thinking having the unit test be merged with the commit that improved the handling was a mistake. Unit tests are nice but I don't think fixes should be held up until unit tests are written either. This PR already has a unit test in it so I guess it's too late for this PR (unless I delete the unit test and submit a new PR for just this) but just something to think about in the future I guess..