diff --git a/frappe/build.js b/frappe/build.js
index 46053916af..7823923172 100644
--- a/frappe/build.js
+++ b/frappe/build.js
@@ -283,7 +283,10 @@ function watch_less(ondirty) {
 }
 
 function watch_js(ondirty) {
-	const watcher = chokidar.watch(path_join(apps_path, '**', '*.js')).on('change', (filename, stats) => {
+	chokidar.watch([
+		path_join(apps_path, '**', '*.js'),
+		path_join(apps_path, '**', '*.html')
+	]).on('change', (filename) => {
 		// build the target js file for which this js/html file is input
 		for (const target in build_map) {
 			const sources = build_map[target];
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 1237b68073..ab77fa14b6 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -264,7 +264,7 @@
 		"public/js/frappe/form/templates/form_links.html",
 		"public/js/frappe/views/formview.js",
 		"public/js/legacy/form.js",
-		"public/js/legacy/clientscriptAPI.js",
+		"public/js/legacy/client_script_helpers.js",
 		"public/js/frappe/form/toolbar.js",
 		"public/js/frappe/form/dashboard.js",
 		"public/js/frappe/form/document_flow.js",
diff --git a/frappe/public/js/legacy/clientscriptAPI.js b/frappe/public/js/legacy/client_script_helpers.js
similarity index 100%
rename from frappe/public/js/legacy/clientscriptAPI.js
rename to frappe/public/js/legacy/client_script_helpers.js