Adjust stats/map keys to address longer strings

Fixes Bug 998994