Renamed some files and refererences