Renamed and sycn some variables