adding NameToken for better error messages