Change more gapi2 to gapi3