PDIO-386 Fixes unintended tokenization of app names, access keys and event names