diff --git a/src/storage/elasticsearch/elasticsearch.ts b/src/storage/elasticsearch/elasticsearch.ts
index 07eba923..d7fa4d8d 100644
--- a/src/storage/elasticsearch/elasticsearch.ts
+++ b/src/storage/elasticsearch/elasticsearch.ts
@@ -548,20 +548,22 @@ export class Elasticsearch implements Database {
       throw new Error('Database is undefined. You have to configure the query build');
     }
 
+    // check if the database version is defined and in the expected format
     if (typeof this.config.internal.database.version === 'undefined'
       || typeof this.config.internal.database.version !== 'string') {
       throw new Error('Database version is malformed. Check your config file');
     }
 
+    // create elasticsearch configuration out of data from database configuration
     const esConfig: ElasticsearchConfig = {
-      name: 'elasticsearch',
+      name: this.config.internal.database.name as 'elasticsearch',
       version: this.config.internal.database.version,
     };
 
     if (typeof this.config.internal.database.query !== 'undefined') {
-        esConfig.query =
-          this.config.internal.database
-            .query as ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig;
+      esConfig.query =
+        this.config.internal.database
+          .query as ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig;
     }
 
     const searchRequest: ES.SearchParams = {