Namespace fixup: use "request" consistently

43 files changed, 188 insertions, 188 deletions

diff --git a/src/allocaddr.c b/src/allocaddr.c
index 9d8d6d8..b6cf133 100644
--- a/src/allocaddr.c
+++ b/src/allocaddr.c
@@ -31,6 +31,6 @@ eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv)
 		die(EX_USAGE, "wrong number of arguments to allocate-address");
 
 	if (vpc)
-		eclat_query_add_param(env->query, "Domain", "vpc");
+		eclat_request_add_param(env->request, "Domain", "vpc");
 	return 0;
 }
diff --git a/src/asscaddr.c b/src/asscaddr.c
index 3e6ca44..26e5d5c 100644
--- a/src/asscaddr.c
+++ b/src/asscaddr.c
@@ -34,21 +34,21 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv)
 		die(EX_USAGE, "wrong number of arguments to associate-address");
 
 	translate_ids(1, argv, MAP_INSTANCE);
-	eclat_query_add_param(env->query, "InstanceId", argv[0]);
+	eclat_request_add_param(env->request, "InstanceId", argv[0]);
 	if (vpc) {
-		eclat_query_add_param(env->query, "AllocationId", argv[1]);
+		eclat_request_add_param(env->request, "AllocationId", argv[1]);
 		if (iface)
-			eclat_query_add_param(env->query, "NetworkInterfaceId",
+			eclat_request_add_param(env->request, "NetworkInterfaceId",
                                               iface);
 		if (privaddr)
-			eclat_query_add_param(env->query, "PrivateIpAddress", 
+			eclat_request_add_param(env->request, "PrivateIpAddress", 
                                               privaddr);
 		if (reassoc)
-			eclat_query_add_param(env->query, "AllowReassociation", 
+			eclat_request_add_param(env->request, "AllowReassociation", 
                                               "true");
 		
 	} else {
-		eclat_query_add_param(env->query, "PublicIp", argv[1]);
+		eclat_request_add_param(env->request, "PublicIp", argv[1]);
 	}
 	return 0;
 }
diff --git a/src/atvol.c b/src/atvol.c
index b07bea2..36abcb5 100644
--- a/src/atvol.c
+++ b/src/atvol.c
@@ -35,9 +35,9 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv)
 	translate_ids(1, argv, MAP_VOLUME);
 	translate_ids(1, argv + 1, MAP_INSTANCE);
 
-	eclat_query_add_param(env->query, "VolumeId", argv[0]);
-	eclat_query_add_param(env->query, "InstanceId", argv[1]);
-	eclat_query_add_param(env->query, "Device", argv[2]);
+	eclat_request_add_param(env->request, "VolumeId", argv[0]);
+	eclat_request_add_param(env->request, "InstanceId", argv[1]);
+	eclat_request_add_param(env->request, "Device", argv[2]);
 
 	return 0;
 }
diff --git a/src/cpimg.c b/src/cpimg.c
index fa9db23..ef92ffb 100644
--- a/src/cpimg.c
+++ b/src/cpimg.c
@@ -20,14 +20,14 @@
 int
 eclat_copy_image(eclat_command_env_t *env, int argc, char **argv)
 {
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	parse_options(env, argc, argv);
 
-	eclat_query_add_param(q, "SourceRegion", region);
-	eclat_query_add_param(q, "SourceImageId", image);
+	eclat_request_add_param(q, "SourceRegion", region);
+	eclat_request_add_param(q, "SourceImageId", image);
 	if (name)
-		eclat_query_add_param(q, "Name", name);
+		eclat_request_add_param(q, "Name", name);
 	if (descr)
-		eclat_query_add_param(q, "Description", descr);
+		eclat_request_add_param(q, "Description", descr);
 	return 0;
 }
diff --git a/src/cpsnap.c b/src/cpsnap.c
index 16de3f2..93e6535 100644
--- a/src/cpsnap.c
+++ b/src/cpsnap.c
@@ -20,13 +20,13 @@
 int
 eclat_copy_snapshot(eclat_command_env_t *env, int argc, char **argv)
 {
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	
 	parse_options(env, argc, argv);
 
-	eclat_query_add_param(q, "SourceRegion", region);
-	eclat_query_add_param(q, "SourceSnapshotId", image);
+	eclat_request_add_param(q, "SourceRegion", region);
+	eclat_request_add_param(q, "SourceSnapshotId", image);
 	if (descr)
-		eclat_query_add_param(q, "Description", descr);
+		eclat_request_add_param(q, "Description", descr);
 	return 0;
 }
diff --git a/src/deimg.c b/src/deimg.c
index b607fd5..67e5444 100644
--- a/src/deimg.c
+++ b/src/deimg.c
@@ -30,7 +30,7 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv)
 		die(EX_USAGE, "bad number of arguments");
 
 	translate_ids(argc, argv, MAP_IMAGE);
-	eclat_query_add_param(env->query, "ImageId", argv[0]);
+	eclat_request_add_param(env->request, "ImageId", argv[0]);
 	return 0;
 }
 	
diff --git a/src/devmap.c b/src/devmap.c
index 9f9a85a..54308bc 100644
--- a/src/devmap.c
+++ b/src/devmap.c
@@ -26,7 +26,7 @@ isnumstr(const char *p)
 }
 
 void
-eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
+eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list)
 {
 	int i;
 	char *bufptr = NULL;
@@ -46,18 +46,18 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 		grecs_asprintf(&bufptr, &bufsize,
 			       "BlockDeviceMapping.%d.DeviceName",
 			       i);
-		eclat_query_add_param(q, bufptr, dev);
+		eclat_request_add_param(q, bufptr, dev);
 		
 		if (strcmp(p, "none") == 0) {
 			grecs_asprintf(&bufptr, &bufsize,
 				       "BlockDeviceMapping.%d.NoDevice",
 				       i);
-			eclat_query_add_param(q, bufptr, NULL);
+			eclat_request_add_param(q, bufptr, NULL);
 		} else if (strncmp(p, "ephemeral", 9) == 0) {
 			grecs_asprintf(&bufptr, &bufsize,
 				       "BlockDeviceMapping.%d.VirtualName",
 				       i);
-			eclat_query_add_param(q, bufptr, p);
+			eclat_request_add_param(q, bufptr, p);
 		} else {
 			struct wordsplit ws;
 
@@ -95,7 +95,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 						    ws.ws_wordv[0]);
 					}
 				}
-				eclat_query_add_param(q, bufptr,
+				eclat_request_add_param(q, bufptr,
 						      ws.ws_wordv[0]);
 			} else if (ws.ws_wordc < 2) {
 				die(EX_USAGE,
@@ -107,7 +107,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 						       "BlockDeviceMapping.%d."
 						       "Ebs.SnapshotId",
 						       i);
-					eclat_query_add_param(q, bufptr,
+					eclat_request_add_param(q, bufptr,
 							      ws.ws_wordv[0]);
 				}
 				
@@ -116,7 +116,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 						       "BlockDeviceMapping.%d."
 						       "Ebs.VolumeSize",
 						       i);
-					eclat_query_add_param(q, bufptr,
+					eclat_request_add_param(q, bufptr,
 							      ws.ws_wordv[1]);
 				}
 			}
@@ -131,7 +131,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 					grecs_asprintf(&bufptr, &bufsize,
 					       "BlockDeviceMapping.%d.Ebs.Iops",
 						       i);
-					eclat_query_add_param(q, bufptr, 
+					eclat_request_add_param(q, bufptr, 
 							      ws.ws_wordv[4]);
 				}
 				/* fall through */
@@ -140,7 +140,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 					grecs_asprintf(&bufptr, &bufsize,
 					 "BlockDeviceMapping.%d.Ebs.VolumeType",
 						       i);
-					eclat_query_add_param(q, bufptr,
+					eclat_request_add_param(q, bufptr,
 							      ws.ws_wordv[3]);
 				}
 				/* fall through */
@@ -156,7 +156,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
 					       "BlockDeviceMapping.%d."
 					       "Ebs.DeleteOnTermination",
 						       i);
-					eclat_query_add_param(q, bufptr,
+					eclat_request_add_param(q, bufptr,
 							      ws.ws_wordv[2]);
 				}
 			case 2:
diff --git a/src/devol.c b/src/devol.c
index ceda9be..76a8423 100644
--- a/src/devol.c
+++ b/src/devol.c
@@ -22,7 +22,7 @@ int
 eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	
 	parse_options(env, argc, argv, &i);
 	argc -= i;
@@ -33,14 +33,14 @@ eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv)
 
 	translate_ids(1, argv, MAP_VOLUME);
 
-	eclat_query_add_param(q, "VolumeId", argv[0]);
+	eclat_request_add_param(q, "VolumeId", argv[0]);
 	if (argc > 1) {
 		translate_ids(1, argv + 1, MAP_INSTANCE);
-		eclat_query_add_param(q, "InstanceId", argv[1]);
+		eclat_request_add_param(q, "InstanceId", argv[1]);
 		if (argc > 2)
-			eclat_query_add_param(q, "Device", argv[2]);
+			eclat_request_add_param(q, "Device", argv[2]);
 	}
 	if (force)
-		eclat_query_add_param(q, "Force", "true");
+		eclat_request_add_param(q, "Force", "true");
 	return 0;
 }
diff --git a/src/disasaddr.c b/src/disasaddr.c
index 27711f6..8c6b88c 100644
--- a/src/disasaddr.c
+++ b/src/disasaddr.c
@@ -22,7 +22,7 @@ int
 eclat_disassociate_address(eclat_command_env_t *env, int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 
 	parse_options(env, argc, argv, &i);
 	argc -= i;
@@ -31,7 +31,7 @@ eclat_disassociate_address(eclat_command_env_t *env, int argc, char **argv)
 	if (argc != 1)
 		die(EX_USAGE, "wrong number of arguments to disassociate-address");
 
-	eclat_query_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]);
+	eclat_request_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]);
 
 	return 0;
 }
diff --git a/src/ec2map.c b/src/ec2map.c
index 943409c..6e2be10 100644
--- a/src/ec2map.c
+++ b/src/ec2map.c
@@ -138,7 +138,7 @@ static int
 ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
 {
 	struct ec2_map *map = data;
-	struct ec2_query *q;
+	struct ec2_request *q;
 	struct grecs_list_entry *ep;
 	struct wordsplit ws;
 	int wsflags;
@@ -146,9 +146,9 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
 	struct grecs_node *tree, *node;
 	int rc;
 	
-	q = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0, endpoint, "/",
+	q = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0, endpoint, "/",
 			       region_name, access_key, security_token);
-	eclat_query_add_param(q, "Action", map->action);
+	eclat_request_add_param(q, "Action", map->action);
 
 	env[0] = "key";
 	env[1] = key;
@@ -171,20 +171,20 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
 		p = strchr(ws.ws_wordv[0], '=');
 		if (p) {
 			*p++ = 0;
-			eclat_query_add_param(q, ws.ws_wordv[0], p);
+			eclat_request_add_param(q, ws.ws_wordv[0], p);
 		} else
-			eclat_query_add_param(q, ws.ws_wordv[0], "");
+			eclat_request_add_param(q, ws.ws_wordv[0], "");
 	}
 
 	if (wsflags & WRDSF_REUSE)
 		wordsplit_free(&ws);
 	
 	if (rc) {
-		eclat_query_free(q);
+		eclat_request_free(q);
 		return eclat_map_failure;
 	}
 	
-	rc = eclat_send_query(map->io->curl, q);
+	rc = eclat_send_request(map->io->curl, q);
 
 	if (rc)
 		return eclat_map_failure;
diff --git a/src/eclat.c b/src/eclat.c
index 66cabdc..beaa934 100644
--- a/src/eclat.c
+++ b/src/eclat.c
@@ -646,14 +646,14 @@ eclat_do_command(eclat_command_env_t *env, struct eclat_command *command,
 	int rc;
 	
 	if (!(command->flags & CMD_NOQRY)) {
-		env->query = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0,
+		env->request = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0,
 						endpoint, "/",
 						region_name, access_key,
 						security_token);
 	}
 
 	if (command->tag)
-		eclat_query_add_param(env->query, "Action", command->tag);
+		eclat_request_add_param(env->request, "Action", command->tag);
 		
 	rc = command->handler(env, argc, argv);
 			
@@ -661,7 +661,7 @@ eclat_do_command(eclat_command_env_t *env, struct eclat_command *command,
 		if (!eclat_confirm(confirm_mode,
 				   "Proceed with %s", command->ident))
 			die(EX_CANCELLED, "command not confirmed");
-		rc = eclat_send_query(env->curl, env->query);
+		rc = eclat_send_request(env->curl, env->request);
 	}
 	return rc;
 }
diff --git a/src/eclat.h b/src/eclat.h
index 28fcaf0..a8ac2a0 100644
--- a/src/eclat.h
+++ b/src/eclat.h
@@ -81,7 +81,7 @@ int run_config_finish_hooks(void);
 struct eclat_command_env {
 	struct eclat_command const *cmd;
 	CURL *curl;
-	struct ec2_query *query;
+	struct ec2_request *request;
 };
 
 typedef struct eclat_command_env eclat_command_env_t;
@@ -180,12 +180,12 @@ void define_format(const char *name, const char *format, grecs_locus_t *locus);
 void set_command_format(const char *name, const char *format,
 			grecs_locus_t *locus);
 
-void describe_query_create(eclat_command_env_t *env, int argc, char **argv,
+void describe_request_create(eclat_command_env_t *env, int argc, char **argv,
 			   const char *uparm);
-void describe_query_update(eclat_command_env_t *env, int argc, char **argv,    
+void describe_request_update(eclat_command_env_t *env, int argc, char **argv,    
 			   const char *uparm, int n_in, int *n_out);
 
-int eclat_send_query(CURL *curl, struct ec2_query *q);
+int eclat_send_request(CURL *curl, struct ec2_request *q);
 char *eclat_get_instance_zone(void);
 void eclat_get_instance_creds(char *id,
 			      char **access_key_ptr, char **secret_key_ptr,
@@ -230,7 +230,7 @@ int get_scr_cols(void);
 
 void translate_ids(int argc, char **argv, const char *map);
 void translate_resource_ids(int argc, char **argv);
-void eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list);
+void eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list);
 
 int get_access_creds(const char *id, char **access_key_ptr,
 		     char **secret_key_ptr);
diff --git a/src/getconout.c b/src/getconout.c
index 28527d7..f294866 100644
--- a/src/getconout.c
+++ b/src/getconout.c
@@ -35,6 +35,6 @@ eclat_get_console_output(eclat_command_env_t *env, int argc, char **argv)
 		die(EX_USAGE, "only one argument is allowed");
 	translate_ids(argc, argv, MAP_INSTANCE);
 	
-	describe_query_create(env, argc, argv, "InstanceId");
+	describe_request_create(env, argc, argv, "InstanceId");
 	return 0;
 }
diff --git a/src/lsaattr.c b/src/lsaattr.c
index b3c729a..9ab8547 100644
--- a/src/lsaattr.c
+++ b/src/lsaattr.c
@@ -31,7 +31,7 @@ int
 eclat_describe_image_attribute(eclat_command_env_t *env, int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	const char *attrname;
 	
 	generic_proginfo->args_doc = "AMI-ID [ATTR]";
@@ -56,8 +56,8 @@ eclat_describe_image_attribute(eclat_command_env_t *env, int argc, char **argv)
 	}
 		
 	translate_ids(1, argv, MAP_IMAGE);
-	eclat_query_add_param(q, "ImageId", argv[0]);
-	eclat_query_add_param(q, "Attribute", attrname);
+	eclat_request_add_param(q, "ImageId", argv[0]);
+	eclat_request_add_param(q, "Attribute", attrname);
 	return 0;
 }
 	
diff --git a/src/lsaddr.c b/src/lsaddr.c
index e008856..edc9729 100644
--- a/src/lsaddr.c
+++ b/src/lsaddr.c
@@ -27,7 +27,7 @@ eclat_describe_addresses(eclat_command_env_t *env, int argc, char **argv)
 	argv += i;
 	argc -= i;
 	
-	describe_query_create(env, argc, argv,
+	describe_request_create(env, argc, argv,
 			      vpc ? "AllocationId" : "PublicIp");
 	return 0;
 }
diff --git a/src/lsiattr.c b/src/lsiattr.c
index 62b1dfb..6301588 100644
--- a/src/lsiattr.c
+++ b/src/lsiattr.c
@@ -36,7 +36,7 @@ int
 eclat_describe_instance_attribute(eclat_command_env_t *env, int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	char *attrname;
 	
 	generic_proginfo->args_doc = "INST-ID ATTR";
@@ -56,8 +56,8 @@ eclat_describe_instance_attribute(eclat_command_env_t *env, int argc, char **arg
 	if (!attrname)
 		die(EX_USAGE, "unrecognized attribute name");
 
-	eclat_query_add_param(q, "InstanceId", argv[0]);
-	eclat_query_add_param(q, "Attribute", attrname);
+	eclat_request_add_param(q, "InstanceId", argv[0]);
+	eclat_request_add_param(q, "Attribute", attrname);
 	
 	return 0;
 }
diff --git a/src/lsimg-cl.opt b/src/lsimg-cl.opt
index 9d3a026..5bde0d1 100644
--- a/src/lsimg-cl.opt
+++ b/src/lsimg-cl.opt
@@ -24,28 +24,28 @@ OPTION(all,a,,
        [<describe all images>])
 BEGIN
         grecs_asprintf(&bufptr, &bufsize, "Owner.%d", ++owner_n);
-	eclat_query_add_param(q, bufptr, "all");
+	eclat_request_add_param(q, bufptr, "all");
 END
 
 OPTION(owner,u,[<ID|amazon|aws-marketplace|self|all>],
        [<select AMIs with a particular owner>])
 BEGIN
         grecs_asprintf(&bufptr, &bufsize, "Owner.%d", ++owner_n);
-	eclat_query_add_param(q, bufptr, optarg);
+	eclat_request_add_param(q, bufptr, optarg);
 END
 
 OPTION(executable-by, x, [<ID|all|self>],
        [<select images executable by the given user>])
 BEGIN
         grecs_asprintf(&bufptr, &bufsize, "ExecutableBy.%d", ++xby_n);
-	eclat_query_add_param(q, bufptr, optarg);
+	eclat_request_add_param(q, bufptr, optarg);
 END
 
 ECLAT_CL_END
 
 ECLAT_CL_PARSER(parse_options,[<int argc, char *argv[], int *idx>], [<
 {
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	char *bufptr = NULL;
 	size_t bufsize = 0;
 	static char *arch[] = {	"i386", "x86_64", NULL };
diff --git a/src/lsimg.c b/src/lsimg.c
index 4129a1e..2a2776c 100644
--- a/src/lsimg.c
+++ b/src/lsimg.c
@@ -28,7 +28,7 @@ eclat_describe_images(eclat_command_env_t *env, int argc, char **argv)
 	argv += i;
 
 	translate_ids(argc, argv, MAP_IMAGE);
-	describe_query_create(env, argc, argv, "ImageId");
+	describe_request_create(env, argc, argv, "ImageId");
 
 	return 0;
 }
diff --git a/src/lsinst.c b/src/lsinst.c
index ccf433f..7c65495 100644
--- a/src/lsinst.c
+++ b/src/lsinst.c
@@ -147,6 +147,6 @@ eclat_describe_instances(eclat_command_env_t *env, int argc, char **argv)
 	argc -= i;
 	translate_ids(argc, argv, MAP_INSTANCE);
 
-	describe_query_create(env, argc, argv, "InstanceId");
+	describe_request_create(env, argc, argv, "InstanceId");
 	return 0;
 }
diff --git a/src/lsistat.c b/src/lsistat.c
index 3638db7..3866384 100644
--- a/src/lsistat.c
+++ b/src/lsistat.c
@@ -28,9 +28,9 @@ eclat_describe_instance_status(eclat_command_env_t *env, int argc, char **argv)
 	argc -= i;
 	translate_ids(argc, argv, MAP_INSTANCE);
 	
-	describe_query_create(env, argc, argv, "InstanceId");
+	describe_request_create(env, argc, argv, "InstanceId");
 
 	if (all_option)
-		eclat_query_add_param(env->query, "IncludeAllInstances", "1");
+		eclat_request_add_param(env->request, "IncludeAllInstances", "1");
 	return 0;
 }
diff --git a/src/lsreg.c b/src/lsreg.c
index 94acf86..11c8203 100644
--- a/src/lsreg.c
+++ b/src/lsreg.c
@@ -44,6 +44,6 @@ eclat_describe_regions(eclat_command_env_t *env, int argc, char **argv)
 	argc -= i;
 	translate_ids(argc, argv, MAP_REG);
 
-	describe_query_create(env, argc, argv, "RegionName");
+	describe_request_create(env, argc, argv, "RegionName");
 	return 0;
 }
diff --git a/src/lssattr.c b/src/lssattr.c
index febf425..66ed07f 100644
--- a/src/lssattr.c
+++ b/src/lssattr.c
@@ -27,7 +27,7 @@ eclat_describe_snapshot_attribute(eclat_command_env_t *env,
 				  int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	const char *attrname;
 	
 	generic_proginfo->args_doc = "SNAP-ID [ATTR]";
@@ -52,8 +52,8 @@ eclat_describe_snapshot_attribute(eclat_command_env_t *env,
 	}
 		
 	translate_ids(1, argv, MAP_SNAPSHOT);
-	eclat_query_add_param(q, "SnapshotId", argv[0]);
-	eclat_query_add_param(q, "Attribute", attrname);
+	eclat_request_add_param(q, "SnapshotId", argv[0]);
+	eclat_request_add_param(q, "Attribute", attrname);
 	return 0;
 }
 
@@ -79,7 +79,7 @@ eclat_modify_snapshot_attribute(eclat_command_env_t *env,
 				int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	char *bufptr = NULL;
 	size_t bufsize = 0;
 	
@@ -123,12 +123,12 @@ eclat_modify_snapshot_attribute(eclat_command_env_t *env,
 
 		if (argv[i][0] == 'u')
 			remdash(argv[i] + 2);
-		eclat_query_add_param(q, bufptr, argv[i] + 2);
+		eclat_request_add_param(q, bufptr, argv[i] + 2);
 	}
 	free(bufptr);
 	
 	translate_ids(1, argv + i, MAP_SNAPSHOT);
-	eclat_query_add_param(q, "SnapshotId", argv[i]);
+	eclat_request_add_param(q, "SnapshotId", argv[i]);
 	
 	return 0;
 }
@@ -138,7 +138,7 @@ eclat_reset_snapshot_attribute(eclat_command_env_t *env,
 			       int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	
 	generic_proginfo->args_doc = "SNAP-ID";
 	generic_parse_options(env->cmd,
@@ -151,8 +151,8 @@ eclat_reset_snapshot_attribute(eclat_command_env_t *env,
 		die(EX_USAGE, "wrong number of arguments");
 	
 	translate_ids(1, argv, MAP_SNAPSHOT);
-	eclat_query_add_param(q, "SnapshotId", argv[0]);
-	eclat_query_add_param(q, "Attribute", "CreateVolumePermission");
+	eclat_request_add_param(q, "SnapshotId", argv[0]);
+	eclat_request_add_param(q, "Attribute", "CreateVolumePermission");
 
 	return 0;
 }
diff --git a/src/lssg.c b/src/lssg.c
index 9c60798..1d043c8 100644
--- a/src/lssg.c
+++ b/src/lssg.c
@@ -29,7 +29,7 @@ eclat_describe_security_groups(eclat_command_env_t *env, int argc, char **argv)
 	argc -= i;
 	translate_ids(argc, argv, groupkw[name_option].map);
 	
-	describe_query_create(env, argc, argv, groupkw[name_option].resid);
+	describe_request_create(env, argc, argv, groupkw[name_option].resid);
 	return 0;
 }
 	
diff --git a/src/lssnap.c b/src/lssnap.c
index 544c0a3..d78ac84 100644
--- a/src/lssnap.c
+++ b/src/lssnap.c
@@ -53,14 +53,14 @@ eclat_describe_snapshots(eclat_command_env_t *env, int argc, char **argv)
 	argv += i;
 	translate_ids(argc, argv, MAP_SNAPSHOT);
 
-	describe_query_create(env, argc, argv, "SnapshotId");
+	describe_request_create(env, argc, argv, "SnapshotId");
 	
 	if (parmlist) {
 		for (ep = parmlist->head; ep; ep = ep->next) {
 			struct param *param = ep->data;
 			grecs_asprintf(&buf, &size, "%s.%u",
 				       param->name, param->idx);
-			eclat_query_add_param(env->query, buf, param->value);
+			eclat_request_add_param(env->request, buf, param->value);
 		}
 	}
 	grecs_list_free(parmlist);
diff --git a/src/lstag.c b/src/lstag.c
index d0eb30e..2a39868 100644
--- a/src/lstag.c
+++ b/src/lstag.c
@@ -32,7 +32,7 @@ eclat_describe_tags(eclat_command_env_t *env, int argc, char **argv)
 	translate_resource_ids(argc, argv);
 
 	if (reslist->head) {
-		eclat_query_add_param(env->query,
+		eclat_request_add_param(env->request,
 				      "Filter.1.Name", "resource-id");
 		for (ep = reslist->head, i = 1; ep; ep = ep->next, i++) {
 			struct resource *res = ep->data;
@@ -40,11 +40,11 @@ eclat_describe_tags(eclat_command_env_t *env, int argc, char **argv)
 				translate_ids(1, &res->resid, res->map);
 			grecs_asprintf(&bufptr, &bufsize,
 				       "Filter.1.Value.%d", i);
-			eclat_query_add_param(env->query, bufptr, res->resid);
+			eclat_request_add_param(env->request, bufptr, res->resid);
 		}
 		n++;
 	}
-	describe_query_update(env, argc, argv, NULL, n, NULL);
+	describe_request_update(env, argc, argv, NULL, n, NULL);
 	
 	return 0;
 }
diff --git a/src/lsvol.c b/src/lsvol.c
index 44cab84..47e8960 100644
--- a/src/lsvol.c
+++ b/src/lsvol.c
@@ -58,6 +58,6 @@ eclat_describe_volumes(eclat_command_env_t *env, int argc, char **argv)
 	argc -= i;
 	translate_ids(argc, argv, MAP_VOLUME);
 
-	describe_query_create(env, argc, argv, "VolumeId");
+	describe_request_create(env, argc, argv, "VolumeId");
 	return 0;
 }
diff --git a/src/lszon.c b/src/lszon.c
index 653b482..e9673c9 100644
--- a/src/lszon.c
+++ b/src/lszon.c
@@ -51,6 +51,6 @@ eclat_describe_avaialbility_zones(eclat_command_env_t *env,
 	argc -= i;
 	translate_ids(argc, argv, MAP_AZ);
 
-	describe_query_create(env, argc, argv, "ZoneName");
+	describe_request_create(env, argc, argv, "ZoneName");
 	return 0;
 }
diff --git a/src/mkimg.c b/src/mkimg.c
index 26aa0b5..21a4f86 100644
--- a/src/mkimg.c
+++ b/src/mkimg.c
@@ -24,7 +24,7 @@ int
 eclat_create_image(eclat_command_env_t *env, int argc, char **argv)
 {
 	int i;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	
 	parse_options(env, argc, argv, &i);
 	argc -= i;