Refactor Tenant to be closer to Hozr etc.
Add tenant info to header.