7 files changed, 11 insertions, 11 deletions
diff --git a/src/main/scala/com/google/gimd/Database.scala b/src/main/scala/com/google/gimd/DatabaseSpi.scala
index 74cf51a..6c4b9be 100644
--- a/src/main/scala/com/google/gimd/Database.scala
+++ b/src/main/scala/com/google/gimd/DatabaseSpi.scala
@@ -21,7 +21,7 @@ import query.{Predicate, Handler}
  * Trait that provides all functionality for Gimd to ask specific storage implementation
  * for needed data in an efficient way.
  */
-trait Database {
+trait DatabaseSpi {
 
   /**
    * @return iterator over collection of all Files that conform to passed FileType[T].
diff --git a/src/main/scala/com/google/gimd/DatabaseException.scala b/src/main/scala/com/google/gimd/DatabaseSpiException.scala
index d47ac31..bebe31c 100644
--- a/src/main/scala/com/google/gimd/DatabaseException.scala
+++ b/src/main/scala/com/google/gimd/DatabaseSpiException.scala
@@ -14,5 +14,5 @@
 
 package com.google.gimd
 
-abstract class DatabaseException(message: String, cause: Throwable)
+abstract class DatabaseSpiException(message: String, cause: Throwable)
         extends Exception(message, cause)
diff --git a/src/main/scala/com/google/gimd/jgit/JGitFile.scala b/src/main/scala/com/google/gimd/jgit/JGitFile.scala
index a2ffc15..9ff43cd 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitFile.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitFile.scala
@@ -28,7 +28,7 @@ final class JGitFile[T](val path: String, val blobId: ObjectId, val fileType: Fi
   private lazy val blobInputStream = {
     val objectLoader = jgitRepository.openBlob(blobId)
     if (objectLoader == null)
-      throw new JGitDatabaseException("Blob '" + blobId.name + "' does not exist.")
+      throw new JGitProviderException("Blob '" + blobId.name + "' does not exist.")
 
     new ByteArrayInputStream(objectLoader.getCachedBytes)
   }
diff --git a/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala b/src/main/scala/com/google/gimd/jgit/JGitProvider.scala
index 48f8009..be9f47d 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitProvider.scala
@@ -21,7 +21,7 @@ import org.spearce.jgit.treewalk.filter.{AndTreeFilter, PathFilter, PathSuffixFi
 import org.spearce.jgit.treewalk.filter.TreeFilter
 import org.spearce.jgit.treewalk.TreeWalk
 
-final class JGitDatabase(val jgitRepository: Repository) extends Database {
+final class JGitProvider(val jgitRepository: Repository) extends DatabaseSpi {
 
   def all[T](fileType: FileType[T]): Iterator[File[T]] = {
     val id = jgitRepository.resolve(Constants.HEAD)
diff --git a/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala b/src/main/scala/com/google/gimd/jgit/JGitProviderException.scala
index c7fd49a..df0f3d6 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitProviderException.scala
@@ -14,8 +14,8 @@
 
 package com.google.gimd.jgit
 
-class JGitDatabaseException(message: String, cause: Throwable)
-        extends DatabaseException(message, cause) {
+class JGitProviderException(message: String, cause: Throwable)
+        extends DatabaseSpiException(message, cause) {
 
   def this(message: String) = this(message, null)
 
diff --git a/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala b/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
index a4d3fcb..48046ca 100644
--- a/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
+++ b/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
@@ -62,7 +62,7 @@ class JGitFileTestCase extends AbstractJGitTestCase {
     assertEquals(expected, jGitFile.userObject)
   }
 
-  @Test{val expected = classOf[JGitDatabaseException]}
+  @Test{val expected = classOf[JGitProviderException]}
   def testMessageOfNonExistingObject {
     val jGitFile = new JGitFile("test", ObjectId.zeroId, SimpleMessageFileType, repository)
     jGitFile.message
diff --git a/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala b/src/test/scala/com/google/gimd/jgit/JGitProviderTestCase.scala
index 8dc017f..c519083 100644
--- a/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala
+++ b/src/test/scala/com/google/gimd/jgit/JGitProviderTestCase.scala
@@ -19,7 +19,7 @@ import org.junit.Test
 import org.junit.Assert._
 import org.spearce.jgit.lib.ObjectId
 
-final class JGitDatabaseTestCase extends AbstractJGitTestCase {
+final class JGitProviderTestCase extends AbstractJGitTestCase {
 
   case class SimpleMessage(name: String, value: Int)
 
@@ -51,7 +51,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
     )
     commit(files)
 
-    val db = new JGitDatabase(repository)
+    val db = new JGitProvider(repository)
 
     val foundFiles = db.all(SimpleMessageFileType).toList
 
@@ -71,7 +71,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
     )
     commit(files)
 
-    val db = new JGitDatabase(repository)
+    val db = new JGitProvider(repository)
 
     val foundFiles = db.all(SimpleMessageFileType).toList
 
@@ -92,7 +92,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
     val commitId = createCommit("Test commit", treeId)
     moveHEAD(commitId)
 
-    val db = new JGitDatabase(repository)
+    val db = new JGitProvider(repository)
 
     val foundFiles = db.all(SimpleMessageFileType).toList
     assertEquals(Nil, foundFiles)