In one embodiment, a method includes receiving data that includes an association between a nickname and a primary name, determining whether the association meets a nickname association threshold, and generating at least one expanded index entry that associates the nickname with the primary name when the association meets the nickname association threshold. The data may include a log entry indicating that a search for the nickname that returned the primary name as a result was followed by a user selection of the primary name, and the method may further include incrementing a counter value associated with the nickname and the primary name. The data may include a first log entry indicating that a search for the nickname returned a result the user did not select, followed by a second log entry indicating that a search for the primary name returned the primary name, and a user selected the primary name.