diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Options.php b/module/VuFind/src/VuFind/Search/SolrAuth/Options.php
index 52172b67266313c4e87b340e6630473af5681976..6b6e34154f05c40ab0d30bc8f0740443edfd324f 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Options.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuth/Options.php
@@ -26,7 +26,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Solr Authority Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
index 7636963a965e84e47680de0dcf4cd9ee1673e0cc..cae5e038415f8668a9b6752b84e773d90062e06b 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
@@ -26,7 +26,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Authority Search Parameters
@@ -37,6 +37,6 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
 }
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php b/module/VuFind/src/VuFind/Search/SolrAuth/Results.php
index bb22442ddabfd08a0051e95d807ccc61f852affb..755eff52aded50b7888a410ddc4644fa39c0485d 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuth/Results.php
@@ -28,7 +28,7 @@
 namespace VuFind\Search\SolrAuth;
 use VuFind\RecordDriver\SolrAuth as SolrAuthRecord,
     VuFind\Search\Base\Params as BaseParams,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Solr Authority Search Parameters
@@ -39,7 +39,7 @@ use VuFind\RecordDriver\SolrAuth as SolrAuthRecord,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php
index 24b732595247dee59cb9bfc54d4f7b586a9e1683..3e5646fb8ae0977fc68fc35a8a426df514c639ae 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php
@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Author Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
index e39ea6d428f6a0869fd6b3c63b3a6c883e924ee2..29b76fb0e7caee44a0350e7da1082d4a7c35c70c 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Config\Reader as ConfigReader, VuFind\Search\Base\Params as BaseParams;
+use VuFind\Config\Reader as ConfigReader, VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Author Search Options
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Search\Base\Params as BaseParam
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
     /**
      * Support method for _initSearch() -- handle basic settings.
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php
index 9f636a6e9bb7799eb4069a8ec258a73cefa2f36b..937812610b9eb471d1cf4b08f24ec4b3de8cbdab 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php
@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Base\Results as BaseResults;
+use VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Author Search Options
@@ -38,7 +38,7 @@ use VuFind\Search\Base\Results as BaseResults;
  * @link     http://vufind.org   Main Site
  */
 
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php
index 4c4dadd827e807ceca809dff5556ef939d51eacd..a123ecf704f8ccd0aaa42312c720da209195c586 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php
@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * AuthorFacets Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
index 8fe91fcc77fa27b12202da4a73e04f5786b9121a..b759e95e88e7148cb591c618c8e27146d904cf24 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * AuthorFacets Search Parameters
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
     /**
      * Set parameters based on a search object
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php
index 8a9e0b72eb89e834e72e7a72d4c41493ab5cfa62..96213845d25501a8671f32a95a12db577e8e50f2 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php
@@ -27,7 +27,7 @@
  */
 namespace VuFind\Search\SolrAuthorFacets;
 use VuFind\Connection\Manager as ConnectionManager,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * AuthorFacets Search Results
@@ -38,7 +38,7 @@ use VuFind\Connection\Manager as ConnectionManager,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Support method for performAndProcessSearch -- perform a search based on the
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Options.php b/module/VuFind/src/VuFind/Search/SolrReserves/Options.php
index 68b5f4641d37cb5d2bc52a7c78902acf92d6538e..74450d5bd2f65e74267e78d5a5a6520d05c413df 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Options.php
+++ b/module/VuFind/src/VuFind/Search/SolrReserves/Options.php
@@ -27,7 +27,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Solr Reserves Search Options
@@ -39,7 +39,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
index ee802f670b4b32902adf93bc7da4580226d8c01d..800844c181e8a9005371be20c0b8bbe0b09ae2dc 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
@@ -27,7 +27,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrReserves;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Reserves Search Parameters
@@ -39,6 +39,6 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
 }
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php b/module/VuFind/src/VuFind/Search/SolrReserves/Results.php
index 71ce186c2ada33c43c02e4caceef1595435f6a68..f197deffd495cd5ffa99756de26565b9328a71fb 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php
+++ b/module/VuFind/src/VuFind/Search/SolrReserves/Results.php
@@ -29,7 +29,7 @@
 namespace VuFind\Search\SolrReserves;
 use VuFind\RecordDriver\SolrReserves as SolrReservesRecord,
     VuFind\Search\Base\Params as BaseParams,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Solr Reserves Search Parameters
@@ -41,7 +41,7 @@ use VuFind\RecordDriver\SolrReserves as SolrReservesRecord,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor