Renamed files and corrected access to tenant info in json file