GUI-568: Convert key pair name to template variable where applicable to allow auto-escaping of double curly braces