gpg: Rename two card related functions in card-util.