0
@@ -19,12 +19,12 @@ module AwsSdb
0
     end
0
     
0
     # TODO Make this options hash not a param list
0
-    def list_domains(max_results = nil, more_token = nil)
0
+    def list_domains(max = nil, token = nil)
0
       params = { 'Action' => 'ListDomains' }
0
       params['MoreToken'] = 
0
-        more_token unless more_token.nil? || more_token.empty?
0
+        token unless token.nil? || token.empty?
0
       params['MaxResults'] = 
0
-        max_results.to_s unless max_results.nil? || max_results.to_i == 0
0
+        max.to_s unless max.nil? || max.to_i == 0
0
       doc = call(:get, params)
0
       results = []
0
       REXML::XPath.each(doc, '//DomainName/text()') do |domain| 
0
@@ -46,23 +46,17 @@ module AwsSdb
0
       nil
0
     end  
0
     
0
-    def query( 
0
-        domain_name, 
0
-        query_expression, 
0
-        sort = nil,
0
-        max_results = nil, 
0
-        more_token = nil 
0
-      )
0
+    def query(domain, query, sort = nil, max = nil, token = nil)
0
       params = { 
0
         'Action' => 'Query', 
0
-        'QueryExpression' => query_expression,
0
-        'DomainName' => domain_name.to_s 
0
+        'QueryExpression' => query,
0
+        'DomainName' => domain.to_s 
0
       }
0
       params['Sort'] = sort unless sort.nil? || sort.empty?
0
       params['MoreToken'] = 
0
-        more_token unless more_token.nil? || more_token.empty?
0
+        token unless token.nil? || token.empty?
0
       params['MaxResults'] = 
0
-        max_results.to_s unless max_results.nil? || max_results.to_i != 0
0
+        max.to_s unless max.nil? || max.to_i != 0
0
       doc = call(:get, params)
0
       results = []
0
       REXML::XPath.each(doc, '//ItemName/text()') do |item|