Done I've fixed the first issue in all core messages I found it in in mwr:70325. Also fixed another inconsistency I spotted. If there is another matter you want to address, please do so in a separate topic. Thanks.
