Simple rename to TenantsHandler