diff --git a/downpour/query.py b/downpour/query.py
index 10dd874..199c3bf 100644
--- a/downpour/query.py
+++ b/downpour/query.py
@@ -91,14 +91,14 @@ def query_data(cloud, config, args):
 
     for pattern in args.server_name:
         LOG.info('searching for servers matching pattern %r', pattern)
-        for server_info in cloud.search_servers(name_or_id=pattern):
-            editor.add_server(server_info)
+        for info in cloud.search_servers(name_or_id=pattern):
+            editor.add_server(info)
 
     for flavor in args.server_flavor:
         LOG.info('searching for servers using flavor %r', flavor)
-        for server_info in cloud.search_servers(
+        for info in cloud.search_servers(
                 filters={'flavor': {'id': flavor}}):
-            editor.add_server(server_info)
+            editor.add_server(info)
 
     for pattern in args.image_name:
         LOG.info('searching for images matching pattern %r', pattern)