diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 2f075121c..d360ae5a5 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -482,12 +482,12 @@ void cb_question(void *ctx, alpm_question_t *question)
 				/* print conflict only if it contains new information */
 				if(strcmp(q->conflict->package1, q->conflict->reason->name) == 0
 						|| strcmp(q->conflict->package2, q->conflict->reason->name) == 0) {
-					q->remove = noyes(_("%s and %s are in conflict. Remove %s?"),
+					q->remove = yesno(_("%s and %s are in conflict. Remove %s?"),
 							q->conflict->package1,
 							q->conflict->package2,
 							q->conflict->package2);
 				} else {
-					q->remove = noyes(_("%s and %s are in conflict (%s). Remove %s?"),
+					q->remove = yesno(_("%s and %s are in conflict (%s). Remove %s?"),
 							q->conflict->package1,
 							q->conflict->package2,
 							q->conflict->reason->name,
@@ -511,7 +511,7 @@ void cb_question(void *ctx, alpm_question_t *question)
 							count));
 				list_display("     ", namelist, getcols());
 				printf("\n");
-				q->skip = noyes(_n(
+				q->skip = yesno(_n(
 							"Do you want to skip the above package for this upgrade?",
 							"Do you want to skip the above packages for this upgrade?",
 							count));
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index e8f4e3e43..0c6a2e092 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -140,7 +140,7 @@ int pacman_remove(alpm_list_t *targets)
 			holdpkg = 1;
 		}
 	}
-	if(holdpkg && (noyes(_("HoldPkg was found in target list. Do you want to continue?")) == 0)) {
+	if(holdpkg && (yesno(_("HoldPkg was found in target list. Do you want to continue?")) == 0)) {
 		retval = 1;
 		goto cleanup;
 	}
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 2dd8e1846..a5cc23bf6 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -195,7 +195,7 @@ static int sync_cleancache(int level)
 			}
 			printf(_("removing old packages from cache...\n"));
 		} else {
-			if(!noyes(_("Do you want to remove ALL files from cache?"))) {
+			if(!yesno(_("Do you want to remove ALL files from cache?"))) {
 				printf("\n");
 				continue;
 			}