Renamed some variables to adhere to coding style
Fixed conflict