Add y-or-no-p to replace yes-or-no-p