Updating templates

- rename project to tenant
- add and removew whitespace here and there