Add some more "localization" switches to fix the two word naming issue, see #670