diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 00a7b9ad90cd8ab48c5a1686634056ac9905c2b5..83fa798885bcaa018bec6dc5f1dcfd43cda38df6 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -319,7 +319,7 @@ $config = array(
             'VuFind\CacheManager' => 'VuFind\Cache\Manager',
             'VuFind\Mailer' => 'VuFind\Mailer',
             'VuFind\RecordLoader' => 'VuFind\Record\Loader',
-            'searchspecsreader' => 'VuFind\Config\SearchSpecsReader',
+            'VuFind\SearchSpecsReader' => 'VuFind\Config\SearchSpecsReader',
             'sessionmanager' => 'Zend\Session\SessionManager',
             'sms' => 'VuFind\Mailer\SMS',
             'worldcatconnection' => 'VuFind\Connection\WorldCat',
diff --git a/module/VuFind/src/VuFind/Connection/Solr.php b/module/VuFind/src/VuFind/Connection/Solr.php
index c3b066faff2ebad4c95c23765b0fecb9be6941c7..9d2293ad303be509eb0db73cd328d83eaffe91cb 100644
--- a/module/VuFind/src/VuFind/Connection/Solr.php
+++ b/module/VuFind/src/VuFind/Connection/Solr.php
@@ -227,8 +227,8 @@ class Solr implements ServiceLocatorAwareInterface, \Zend\Log\LoggerAwareInterfa
     {
         // Only load specs once:
         if ($this->searchSpecs === false) {
-            $this->searchSpecs = $this->getServiceLocator()->get('SearchSpecsReader')
-                ->get($this->searchSpecsFile);
+            $this->searchSpecs = $this->getServiceLocator()
+                ->get('VuFind\SearchSpecsReader')->get($this->searchSpecsFile);
         }
 
         // Special case -- null $handler means we want all search specs.
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index d843d06d26e631544191390d0b1294a92298f078..066a0a5e0ab2d46a9c80692bc0337f3a5e9527f0 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -128,7 +128,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
                 'VuFind\RecordDriverPluginManager', $recordDriverFactory
             );
             $this->serviceManager->setService(
-                'SearchSpecsReader', new \VuFind\Config\SearchSpecsReader()
+                'VuFind\SearchSpecsReader', new \VuFind\Config\SearchSpecsReader()
             );
             $this->serviceManager->setService(
                 'VuFind\Logger', new \VuFind\Log\Logger()
diff --git a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
index 2c92d80a68c3871325a78cf79bceda7fd1fedfc7..0f8a6f676385debf7a394747d3706dbb74f545eb 100644
--- a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
@@ -49,7 +49,7 @@ class SearchSpecsReaderTest extends \VuFindTest\Unit\TestCase
     {
         // The searchspecs.yaml file should define author dismax fields (among many
         // other things).
-        $reader = $this->getServiceManager()->get('SearchSpecsReader');
+        $reader = $this->getServiceManager()->get('VuFind\SearchSpecsReader');
         $specs = $reader->get('searchspecs.yaml');
         $this->assertTrue(
             isset($specs['Author']['DismaxFields'])