Modification to display tenant name instead of ID