      #(:name %)
      (map #(second %)
           (filter (fn [[key spec]]
-                    (let [docstr  (:full-doc spec)
-                          docstr  (str docstr " " (overtone-ugen-name (:name spec)))
-                          matches (filter #(re-find % docstr) regexps)]
+                    (let [names (str (:name spec) " "
+                                     (.toLowerCase (:name spec)) " "
+                                     (overtone-ugen-name (:name spec)))
+                          search-str (str (:full-doc spec) " " names)
+                          matches (filter #(re-find % search-str) regexps)]
                       (= matches regexps)))
                   (combined-specs))))))
 
-(defn- print-ug-summaries
+(defn- print-ugen-summaries
   "Pretty print out a list of ugen specs by printing their name and summary on
   separate lines."
   [specs longest-name-len]

            (:full-doc ug-spec)
            "\n\n"))))

(defn print-ug-docs
  "Pretty print out a list of ugen specs by printing out their names and
  full-doc strings."
  [specs]

     :default
     (print-ug-summaries specs longest-name-len))))

(defmacro find-ugen-doc
  "Find a ugen containing the specified terms which may be either strings or
  regexp patterns. Will search the ugen's docstrings for occurrances of all the
  specified terms. Prints out each ugens full docstring. Similar to find-doc.
