diff --git a/index.html b/index.html
index f58bc8e..c40f1ae 100644
--- a/index.html
+++ b/index.html
@@ -1223,10 +1223,10 @@ dogapi.screenboard.share(1234, function(err, res){
 <div class="row">
 <h2 class="bg-primary" style="text-indent:1rem">search</h2></div>
 <ul class="nav nav-pills">
-<li role"presentation"><a href="#search-search">search</a></li>
+<li role"presentation"><a href="#search-query">query</a></li>
 </ul>
-<div class="function row" id="search-search">
-<h3 class="bg-info" style="text-indent:.5rem;padding:.5rem;margin-top:.5rem">search(query, callback)</h3>
+<div class="function row" id="search-query">
+<h3 class="bg-info" style="text-indent:.5rem;padding:.5rem;margin-top:.5rem">query(query, callback)</h3>
 <div class="col-md-6">
 <p>search for metrics and hosts from the past 24 hours</p>
 <h4>Parameters:</h4>
@@ -1247,7 +1247,7 @@ var options = {
 };
 dogapi.initialize(options);
 var query = &quot;app&quot;;
-dogapi.search.search(query, function(err, res){
+dogapi.search.query(query, function(err, res){
   console.dir(res);
 });
 </code></pre>
diff --git a/lib/api/search.js b/lib/api/search.js
index f0cba2f..39c700b 100644
--- a/lib/api/search.js
+++ b/lib/api/search.js
@@ -15,12 +15,12 @@ var client = require("../client");
  *  };
  *  dogapi.initialize(options);
  *  var query = "app";
- *  dogapi.search.search(query, function(err, res){
+ *  dogapi.search.query(query, function(err, res){
  *    console.dir(res);
  *  });
  *  ```
  */
-function search(query, callback){
+function query(query, callback){
     var params = {
         query: {
             q: query
@@ -30,22 +30,22 @@ function search(query, callback){
 }
 
 module.exports = {
-    search: search,
+    query: query,
     getUsage: function(){
         return [
-            "  dogapi search <query>"
+            "  dogapi search query <query>"
         ];
     },
     getHelp: function(){
         return [
             "Search:",
             "  Subcommands:",
-            "    search <query>    search for hosts and metrics from the last 24 hours"
+            "    query <query>    search for hosts and metrics from the last 24 hours"
         ];
     },
     handleCli: function(subcommand, args, callback){
-        if(subcommand === "search"){
-            search(args["<query>"], callback);
+        if(subcommand === "query" && args._.length > 4){
+            query(args._[4], callback);
         } else {
             callback("unknown subcommand or arguments try `dogapi search --help` for help", false);
         }