diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ead5cf..0d81826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.0] - 2020-05-28
+### Changed
+- Settings in `janiscommercerc.json` now are no longer mapped, the newClients settings will be setted in the new client document
+- Setting `database` renamed from `dbDatabase`
+
 ## [1.3.0] - 2020-05-26
 ### Removed
 - `session` in client create API and Listener
diff --git a/lib/model-client.js b/lib/model-client.js
index 327f5a7..3d7b92c 100644
--- a/lib/model-client.js
+++ b/lib/model-client.js
@@ -33,14 +33,14 @@ class Client extends Model {
 	}
 
 	static get excludeFieldsInLog() {
-		return ['user', 'password', 'host'];
+		return ['user', 'password', 'host', 'protocol', 'port', 'database'];
 	}
 
 	getFormattedClient(code) {
 		return {
 			code,
 			status: this.constructor.statuses.active,
-			dbDatabase: `janis-${code}`
+			database: `janis-${code}`
 		};
 	}
 }
diff --git a/package.json b/package.json
index ab5fa17..7605663 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janiscommerce/client-creator",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "A packge that wraps all the client creation in a JANIS Service",
   "main": "index.js",
   "scripts": {
@@ -34,10 +34,10 @@
     "test": "tests"
   },
   "dependencies": {
-    "@janiscommerce/api": "^4.3.0",
     "@janiscommerce/api-test": "^2.3.1",
-    "@janiscommerce/event-listener": "^1.2.0",
+    "@janiscommerce/api": "^4.3.0",
     "@janiscommerce/event-listener-test": "^1.0.0",
+    "@janiscommerce/event-listener": "^1.2.0",
     "@janiscommerce/model": "^4.1.0",
     "@janiscommerce/mongodb-index-creator": "^1.2.1",
     "@janiscommerce/settings": "^1.0.1"
diff --git a/tests/api-create.js b/tests/api-create.js
index ee19c88..6ac4ea7 100644
--- a/tests/api-create.js
+++ b/tests/api-create.js
@@ -18,7 +18,6 @@ describe('APIs', () => {
 		const fakeSettings = {
 
 			database: {
-
 				core: {
 					host: 'core-database-host',
 					protocol: 'core-protocol://',
@@ -43,7 +42,7 @@ describe('APIs', () => {
 			code: 'some-client',
 			status: ClientModel.statuses.active,
 			...fakeSettings.database.newClients,
-			dbDatabase: 'janis-some-client'
+			database: 'janis-some-client'
 		};
 
 		APITest(ClientCreateAPI, '/api/client', [
@@ -83,7 +82,7 @@ describe('APIs', () => {
 						{
 							...expectedClientObject,
 							code: 'other-client',
-							dbDatabase: 'janis-other-client'
+							database: 'janis-other-client'
 						}
 					]);
 
diff --git a/tests/listener-created.js b/tests/listener-created.js
index be91d55..764311e 100644
--- a/tests/listener-created.js
+++ b/tests/listener-created.js
@@ -25,7 +25,6 @@ describe('Client Created Listener', async () => {
 	const fakeSettings = {
 
 		database: {
-
 			core: {
 				host: 'core-database-host',
 				protocol: 'core-protocol://',
@@ -50,7 +49,7 @@ describe('Client Created Listener', async () => {
 		code: 'some-client',
 		status: ClientModel.statuses.active,
 		...fakeSettings.database.newClients,
-		dbDatabase: 'janis-some-client'
+		database: 'janis-some-client'
 	};
 
 	await EventListenerTest(handler, [
diff --git a/tests/model-client.js b/tests/model-client.js
index 5e70ef6..7815bb5 100644
--- a/tests/model-client.js
+++ b/tests/model-client.js
@@ -85,7 +85,7 @@ describe('ClientModel', () => {
 		});
 
 		it('Should return the exclude fields for logging', async () => {
-			assert.deepStrictEqual(ClientModel.excludeFieldsInLog, ['user', 'password', 'host']);
+			assert.deepStrictEqual(ClientModel.excludeFieldsInLog, ['user', 'password', 'host', 'protocol', 'port', 'database']);
 		});
 
 		it('Should return false when shouldCreateLogs', () => {