Renamed tenant files to remove some redundancy