Removed 'Solr' prefix from class names