--- embedtools/src/voucher.c	2012/07/22 22:46:48	1.2
+++ embedtools/src/voucher.c	2013/01/18 13:18:14	1.2.4.1
@@ -31,7 +31,7 @@ Usage()
 static void
 AtExit()
 {
-	io_freeVars(&vs);
+	ait_freeVars(&vs);
 	if (output != stdout)
 		fclose(output);
 }
@@ -113,8 +113,8 @@ ShowConfig(char mode, int rid, int cnt)
 	else
 		printf(">>> Test voucher ticket(s) %d\n", cnt);
 
-	for (i = 0; i < io_arraySize(vs); i++)
-		printf(" + Voucher[%d]= %s\n", i, AIT_GET_STR(io_getVars(&vs, i)));
+	for (i = 0; i < array_Size(vs); i++)
+		printf(" + Voucher[%d]= %s\n", i, AIT_GET_STR(ait_getVars(&vs, i)));
 	printf(" + Roll ID %d bits\n", (int) 
 			strtol(cfg_getAttribute(&cfg, "voucher", "rollbits"), NULL, 0));
 	printf(" + Ticket ID %d bits\n", (int) 
@@ -289,8 +289,8 @@ TestVouchers(array_t * __restrict v, RSA * __restrict 
 		magic ^= magic;
 	}
 
-	for (i = 0, code = 0; i < io_arraySize(v); i++, code = 0) {
-		voucher = AIT_GET_STR(io_getVars(&v, i));
+	for (i = 0, code = 0; i < array_Size(v); i++, code = 0) {
+		voucher = AIT_GET_STR(ait_getVars(&v, i));
 
 		/* convert from voucher string to number */
 		p = (u_char*) strrchr(voucher, '\0'); 
@@ -395,9 +395,9 @@ main(int argc, char **argv)
 		rid = strtol(argv[0], NULL, 0);
 	} else {
 		cnt = argc;
-		vs = io_allocVars(cnt);
+		vs = ait_allocVars(cnt);
 		for (i = 0; i < argc; i++)
-			AIT_SET_STR(io_getVars(&vs, i), argv[i]);
+			AIT_SET_STR(ait_getVars(&vs, i), argv[i]);
 	}
 
 	if (cfgLoadConfig(szConfig, &cfg)) {