Renamed activities and xml files