Feature/use tenant name externally

done