Technologies are described herein for identifying query intent from a raw query. A method for identifying intent may include repeatedly separating and merging terms of a natural language expression based on a set of rule-based transpositions of natural language terms into one or more defined terms based on predetermined naming conventions for at least one software function. Thereafter, a cluster of previous search terms related to the defined terms may be identified, and the natural language expression may be associated with the identified cluster to create intent-based cluster information.