Fix tenantName location in dict