Made solr field names more consistent.