Renamed some variables to conform to vala naming