diff --git a/src/p7/main.c b/src/p7/main.c
index 4e1c62d..28a958a 100644
--- a/src/p7/main.c
+++ b/src/p7/main.c
@@ -231,7 +231,7 @@ int main(int ac, char **av)
 			}
 
 			/* send the file */
-			err = p7_sendstream(handle, args.local, filesize,
+			err = p7_sendfile(handle, args.local,
 				args.dirname, args.filename,
 				args.storage, 1, args.force ? NULL : &sendfile_confirm,
 				args.nicedisp ? &sendfile_display : NULL);
@@ -242,15 +242,15 @@ int main(int ac, char **av)
 				? &sendfile_display : NULL);
 			break;
 		case mn_copy:
-			err = p7_copyfile(handle, args.dirname, args.filename,
+			err = p7_copy(handle, args.dirname, args.filename,
 				args.newdir, args.newname, args.storage);
 			break;
 		case mn_del:
-			err = p7_delfile(handle, args.dirname, args.filename,
+			err = p7_delete(handle, args.dirname, args.filename,
 				args.storage);
 			break;
 		case mn_ls:
-			err = p7_lsfiles(handle, args.storage, &print_file_info, NULL);
+			err = p7_list(handle, args.storage, &print_file_info, NULL);
 			break;
 		case mn_reset:
 			err = p7_resetflash(handle, args.storage);
diff --git a/src/p7os/main.c b/src/p7os/main.c
index c919588..31c743a 100644
--- a/src/p7os/main.c
+++ b/src/p7os/main.c
@@ -151,7 +151,7 @@ int main(int ac, char **av)
 	case mn_get:
 		/* get the os */
 		printf("Gathering the OS...\n");
-		err = p7_backup_rom(handle, args.local, osdisp);
+		err = p7_backup_romfile(handle, args.local, osdisp);
 		if (err) goto fail;
 		fclose(args.local);
 		break;
diff --git a/src/p7os/prepare.c b/src/p7os/prepare.c
index 36a3f11..4523e01 100644
--- a/src/p7os/prepare.c
+++ b/src/p7os/prepare.c
@@ -57,8 +57,7 @@ int prepare_ops(p7_handle_t *handle, FILE *uexe, void (*disp)())
 	}
 
 	/* send the thing */
-	if ((err = p7_sendexe_stream(handle, uexe, (p7uint_t)usize,
-		0x88030000, 0x88030000, disp))) {
+	if ((err = p7_sendexe_file(handle, uexe, 0x88030000, 0x88030000, disp))) {
 		fclose(uexe);
 		return (err);
 	}