diff --git a/app/modules/daemon.js b/app/modules/daemon.js
index 62c0c840e202e991e15eabedaa274d5d450b272b..e87cc9aa1843bb7dbd1b2adedd012fe93509176d 100644
--- a/app/modules/daemon.js
+++ b/app/modules/daemon.js
@@ -8,7 +8,7 @@ module.exports = {
     cli: [{
       name: 'start',
       desc: 'Start Duniter node daemon.',
-      onPluggedDALExecute: (server, conf, program, params, startServices) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params, startServices) => co(function*() {
         const logger = server.logger;
 
         logger.info(">> Server starting...");
diff --git a/app/modules/export-bc.js b/app/modules/export-bc.js
index 42c1cbecf058dd5a15d722833641c9f59dcd3ef8..e5d2915e85ce8aa1a96d0432421649f038e9c972 100644
--- a/app/modules/export-bc.js
+++ b/app/modules/export-bc.js
@@ -10,7 +10,7 @@ module.exports = {
       name: 'export-bc [upto]',
       desc: 'Exports the whole blockchain as JSON array, up to [upto] block number (excluded).',
       logs: false,
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const upto = params[0];
         const logger = server.logger;
         try {
diff --git a/app/modules/gen.js b/app/modules/gen.js
index 4f185f49efc900e08cbab81b5ac6612c7f8347d4..99a564d68054b4808d43f7ab2d46f20bfc21844e 100644
--- a/app/modules/gen.js
+++ b/app/modules/gen.js
@@ -18,7 +18,7 @@ module.exports = {
     cli: [{
       name: 'gen-next [host] [port] [difficulty]',
       desc: 'Tries to generate the next block of the blockchain.',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const host = params[0];
         const port = params[1];
         const difficulty = params[2];
@@ -27,7 +27,7 @@ module.exports = {
     }, {
       name: 'gen-root [host] [port] [difficulty]',
       desc: 'Tries to generate root block, with choice of root members.',
-      onPluggedDALExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
         const host = params[0];
         const port = params[1];
         const difficulty = params[2];
diff --git a/app/modules/peer.js b/app/modules/peer.js
index 32846ea6b2db50dd36078a3c94177a35e0acc4f6..1ebf00e96a6b5d94cdd114b3e381403fdf29ede7 100644
--- a/app/modules/peer.js
+++ b/app/modules/peer.js
@@ -13,7 +13,7 @@ module.exports = {
     cli: [{
       name: 'peer [host] [port]',
       desc: 'Exchange peerings with another node',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const host = params[0];
         const port = params[1];
         const logger = server.logger;
diff --git a/app/modules/reapply.js b/app/modules/reapply.js
index a227551a63e2eb7c6f8c2988e6728909c4f34071..1adb83f31bdc21cb7ff8ef15418f169e05ff2c20 100644
--- a/app/modules/reapply.js
+++ b/app/modules/reapply.js
@@ -7,7 +7,7 @@ module.exports = {
     cli: [{
       name: 'reapply-to [number]',
       desc: 'Reapply reverted blocks until block #[number] is reached. EXPERIMENTAL',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const number = params[0];
         const logger = server.logger;
         try {
diff --git a/app/modules/revert.js b/app/modules/revert.js
index 4e5356e7773c9e017094b4ea227dbfda8c91756b..1fb00afd6bc2af88106b470f9b32c5737a84b31c 100644
--- a/app/modules/revert.js
+++ b/app/modules/revert.js
@@ -7,7 +7,7 @@ module.exports = {
     cli: [{
       name: 'revert [count]',
       desc: 'Revert (undo + remove) the top [count] blocks from the blockchain. EXPERIMENTAL',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const count = params[0];
         const logger = server.logger;
         try {
@@ -23,7 +23,7 @@ module.exports = {
     },{
       name: 'revert-to [number]',
       desc: 'Revert (undo + remove) top blockchain blocks until block #[number] is reached. EXPERIMENTAL',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const number = params[0];
         const logger = server.logger;
         try {
diff --git a/app/modules/synchronization.js b/app/modules/synchronization.js
index c389a3c13a22f55ef755149858adb37f209556d4..5c58eba2635a870cca0901afe0b2c49193e68a2b 100644
--- a/app/modules/synchronization.js
+++ b/app/modules/synchronization.js
@@ -7,7 +7,7 @@ module.exports = {
     cli: [{
       name: 'sync [host] [port] [to]',
       desc: 'Synchronize blockchain from a remote Duniter node',
-      onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+      onDatabaseExecute: (server, conf, program, params) => co(function*() {
         const host = params[0];
         const port = params[1];
         const to   = params[2];
diff --git a/index.js b/index.js
index 404b1d324bc172e40858e99e94623397d99f2091..512d77e1c156eba460d758c75aa7e7ecc4c374a6 100644
--- a/index.js
+++ b/index.js
@@ -263,7 +263,7 @@ function Stack(dependencies) {
         }
       }
 
-      return yield command.onPluggedDALExecute(server, conf, program, params,
+      return yield command.onDatabaseExecute(server, conf, program, params,
 
         // Start services and streaming between them
         () => co(function*() {
diff --git a/test/integration/tools/node.js b/test/integration/tools/node.js
index 832c5fc7f661a731c9169e14832ea8c212aa1381..fc65b020fd5328dce620b72af2b9b06b609e3c0d 100644
--- a/test/integration/tools/node.js
+++ b/test/integration/tools/node.js
@@ -160,7 +160,7 @@ function Node (dbName, options) {
           cli: [{
             name: 'execute',
             desc: 'Unit Test execution',
-            onPluggedDALExecute: (server, conf, program, params, startServices) => co(function*() {
+            onDatabaseExecute: (server, conf, program, params, startServices) => co(function*() {
               yield startServices();
               callback(null, server);
               yield Promise.resolve((res) => null); // Never ending
diff --git a/test/integration/v1.0-modules-api.js b/test/integration/v1.0-modules-api.js
index cff55ee692f89b3c3804ff3043436f3333237f19..e0a8462a0d04a958988e93d63ba94649a16f7856 100644
--- a/test/integration/v1.0-modules-api.js
+++ b/test/integration/v1.0-modules-api.js
@@ -88,7 +88,7 @@ describe("v1.0 Module API", () => {
           cli: [{
             name: 'gimme-conf',
             desc: 'Returns the configuration object.',
-            onPluggedDALExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
+            onDatabaseExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
               // Gimme the conf!
               return conf;
             })
@@ -177,7 +177,7 @@ describe("v1.0 Module API", () => {
           cli: [{
             name: 'hello-service',
             desc: 'Says hello to the world, at service phase. And feed INPUT with a transaction.',
-            onPluggedDALExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
+            onDatabaseExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
               yield startServices();
               fakeI.push("Version: 10\n" +
                 "Type: Transaction\n" +
@@ -211,7 +211,7 @@ describe("v1.0 Module API", () => {
           cli: [{
             name: 'bye-service',
             desc: 'Says goodbye to the world, at service phase.',
-            onPluggedDALExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
+            onDatabaseExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
               yield stopServices();
               return Promise.resolve();
             })