Renamed all variables and files