diff --git a/flow-client/package.json b/flow-client/package.json
index d3773cabb6b..3645c12b7d5 100644
--- a/flow-client/package.json
+++ b/flow-client/package.json
@@ -10,9 +10,10 @@
   },
   "scripts": {
     "lint": "eslint 'src/main/resources/META-INF/resources/frontend/FlowBootstrap.js' && tslint 'src/main/resources/META-INF/resources/frontend/**/*.ts'",
-    "_copy": "ncp target/classes/META-INF/resources/VAADIN/static/client/client-*.cache.js src/main/resources/META-INF/resources/frontend/FlowClient.js",
-    "_replace": "replace-in-files --regex '(.+[\\s\\S]*)' --replacement 'const init = function(){\\n$1\\n};\\nexport {init};\\n' src/main/resources/META-INF/resources/frontend/FlowClient.js",
-    "client": "npm run _copy && npm run _replace",
+    "_cp_to_src": "ncp target/classes/META-INF/resources/VAADIN/static/client/client-*.cache.js src/main/resources/META-INF/resources/frontend/FlowClient.js",
+    "_wrap_fnc": "replace-in-files --regex '(.+[\\s\\S]*)' --replacement 'const init = function(){\\n$1\\n};\\nexport {init};\\n' src/main/resources/META-INF/resources/frontend/FlowClient.js",
+    "_cp_to_tgt": "ncp src/main/resources/META-INF/resources/frontend/FlowClient.js target/classes/META-INF/resources/frontend/FlowClient.js",
+    "client": "npm run _cp_to_src && npm run _wrap_fnc && npm run _cp_to_tgt",
     "webpack": "webpack --config=webpack.tests.config.js",
     "build": "npm run client && tsc",
     "compile": "npm run lint && npm run build",