Renames solrq -> q, solrfacet -> facet, to conform with the Solr API.