Renamed "property" into "tenant" (#1578)

* Renamed "property" into "tenant"

* Fixed merging issue

* Fixed tests

* Fixed typo
1 file changed