pass validation client name to template and rename validator and client ...

...key attributes