diff --git a/implementations/javascript/packages/core/package.json b/implementations/javascript/packages/core/package.json
index 24637d7..dd72a7f 100644
--- a/implementations/javascript/packages/core/package.json
+++ b/implementations/javascript/packages/core/package.json
@@ -14,11 +14,13 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "scripts": {
     "clean": "rm -rf lib dist",
-    "prepare": "tsc && rollup -c",
-    "rollupwatch": "rollup -c -w",
+    "prepare": "yarn compile && yarn rollup",
+    "compile": "tsc",
+    "compile:watch": "yarn compile -w",
+    "rollup": "rollup -c",
+    "rollup:watch": "yarn rollup -w",
     "test": "jest",
-    "testwatch": "jest --watch",
-    "veryclean": "yarn run clean && rm -rf node_modules",
-    "watch": "tsc -w"
+    "test:watch": "jest --watch",
+    "veryclean": "yarn run clean && rm -rf node_modules"
   }
 }
diff --git a/implementations/javascript/watchall b/implementations/javascript/watchall
index 073f0bd..4b1fcf9 100755
--- a/implementations/javascript/watchall
+++ b/implementations/javascript/watchall
@@ -14,11 +14,11 @@ open() {
     fi
 }
 
-open "cd packages/core; yarn run watch"
-open "cd packages/core; yarn run rollupwatch"
-open "cd packages/core; yarn run testwatch"
-open "cd packages/schema; yarn run watch"
-open "cd packages/schema; yarn run rollupwatch"
-open "cd packages/schema; yarn run testwatch"
+open "cd packages/core; yarn run compile:watch"
+open "cd packages/core; yarn run rollup:watch"
+open "cd packages/core; yarn run test:watch"
+open "cd packages/schema; yarn run compile:watch"
+open "cd packages/schema; yarn run rollup:watch"
+open "cd packages/schema; yarn run test:watch"
 
 tmux select-layout even-vertical