diff --git a/README.md b/README.md
index 2551810..1627b71 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ In the repository configuration, you need to specify the `:adapter`:
 ```elixir
 config :my_app, MyApp.Repo,
   adapter: ArangoDB.Ecto,
-  database_name: "my_app"
+  database: "my_app"
   ...
 ```
    
@@ -40,7 +40,7 @@ Unless specified otherwise, the show default values are used.
 host: "localhost",
 port: 8529,
 scheme: "http",
-database_name: "_system",
+database: "_system",
 arrango_version: 30_000,
 headers: %{"Accept": "*/*"},
 use_auth: :basic,
@@ -75,6 +75,7 @@ defmodule Post do
   end
 end
 ```
+
 ## Installation
 
 If [available in Hex](https://hex.pm/docs/publish), the package can be installed
@@ -92,7 +93,9 @@ end
 * on conflict
 * upserts
 
-Documentation can be generated with [ExDoc](https://github.com/elixir-lang/ex_doc)
-and published on [HexDocs](https://hexdocs.pm). Once published, the docs can
-be found at [https://hexdocs.pm/arangodb_ecto](https://hexdocs.pm/arangodb_ecto).
-
+## Testing
+Before running the tests, configure access to your Arango database by setting
+these environment variables:
+- `ARANGO_SRV`
+- `ARANGO_USR`
+- `ARANGO_PWD`
diff --git a/lib/arangodb_ecto/utils.ex b/lib/arangodb_ecto/utils.ex
index f74f357..2b78689 100644
--- a/lib/arangodb_ecto/utils.ex
+++ b/lib/arangodb_ecto/utils.ex
@@ -3,11 +3,12 @@ defmodule ArangoDB.Ecto.Utils do
 
   @spec get_endpoint(Ecto.Adapter.repo, String.t | nil) :: Arangoex.Endpoint.t
   def get_endpoint(repo, prefix \\ nil) do
-    config = repo.config
-    config = if prefix == nil,
-      do: config,
-      else: Keyword.put(config, :database_name, prefix)
-    
+    config = repo.config()
+    database = prefix || Keyword.get(config, :database) || Keyword.get(config, :database_name)
+    config =
+      config
+      |> Keyword.put(:database_name, database)
+
     struct(Arangoex.Endpoint, config)
   end
-end
\ No newline at end of file
+end
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 6c0f6fe..0824104 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -12,7 +12,7 @@ alias Ecto.Integration.TestRepo
 
 Application.put_env(:ecto, TestRepo,
   adapter: ArangoDB.Ecto,
-  database_name: "test")
+  database: "test")
 
 defmodule Ecto.Integration.TestRepo do
   use Ecto.Integration.Repo, otp_app: :ecto
@@ -74,4 +74,4 @@ _   = ArangoDB.Ecto.storage_down(PoolRepo.config)
 :ok = Ecto.Migrator.up(PoolRepo, 0, Ecto.Integration.Migration, log: false)
 
 
-Process.flag(:trap_exit, true)
\ No newline at end of file
+Process.flag(:trap_exit, true)