Re-factored to versioned naming schme.

- Also updated model for SearchRequest to reflect that it is not
  sending a function every time.