5 files changed, 6 insertions, 7 deletions
diff --git a/scripts/index.php b/scripts/index.php
index eb328b5..5afbee0 100644
--- a/scripts/index.php
+++ b/scripts/index.php
@@ -39,7 +39,6 @@ $db->getSetup()->setup();
 
 $rs = new Repositories();
 list($repos, $count) = $rs->getList(0, 10000);
-$idx = new Indexer_Elasticsearch();
 foreach ($repos as $repo) {
     echo 'Indexing ' . $repo->id . "\n";
     $idx->addRepo($repo, filectime($repo->gitDir));
diff --git a/src/phorkie/Database.php b/src/phorkie/Database.php
index e9a75a1..9854e7c 100644
--- a/src/phorkie/Database.php
+++ b/src/phorkie/Database.php
@@ -5,17 +5,17 @@ class Database
 {
     public function getSearch()
     {
-        return new Search_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Search();
     }
 
     public function getIndexer()
     {
-        return new Indexer_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Indexer();
     }
 
     public function getSetup()
     {
-        return new Database_Setup_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Setup();
     }
 }
 
diff --git a/src/phorkie/Indexer/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Indexer.php
index 077865e..d9d1032 100644
--- a/src/phorkie/Indexer/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Indexer.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Indexer_Elasticsearch
+class Database_Adapter_Elasticsearch_Indexer
 {
     public function __construct()
     {
diff --git a/src/phorkie/Search/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Search.php
index 06a0cfe..88ad4ac 100644
--- a/src/phorkie/Search/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Search.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Search_Elasticsearch
+class Database_Adapter_Elasticsearch_Search
 {
     public function __construct()
     {
diff --git a/src/phorkie/Database/Setup/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
index b5e2005..acbe77c 100644
--- a/src/phorkie/Database/Setup/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Database_Setup_Elasticsearch
+class Database_Adapter_Elasticsearch_Setup
 {
     public function __construct()
     {