diff --git a/src/kiri/app/api.js b/src/kiri/app/api.js
index d87f99d6..cc0ff6e2 100644
--- a/src/kiri/app/api.js
+++ b/src/kiri/app/api.js
@@ -35,7 +35,7 @@ import { stats } from './stats.js';
 import { types as load } from '../../load/file.js';
 import { UI } from './inputs.js';
 import { updateTool } from '../mode/cam/tools.js';
-import { view as viewModule } from './viewmode.js';
+import { view as viewModule } from './view-mode.js';
 import { visuals } from './visuals.js';
 import { widgets } from '../core/widgets.js';
 import { workspace } from './workspace.js';
diff --git a/src/kiri/app/tools.js b/src/kiri/app/face-tool.js
similarity index 100%
rename from src/kiri/app/tools.js
rename to src/kiri/app/face-tool.js
diff --git a/src/kiri/app/init/sync.js b/src/kiri/app/init/sync.js
index 90a4b842..93b10010 100644
--- a/src/kiri/app/init/sync.js
+++ b/src/kiri/app/init/sync.js
@@ -10,7 +10,7 @@ import { settings as set_ctrl } from '../conf/manager.js';
 import { settingsOps } from '../conf/settings.js';
 import { space } from '../../../moto/space.js';
 import { VIEWS } from '../../core/consts.js';
-import * as view_tools from '../tools.js';
+import * as view_tools from '../face-tool.js';
 
 const { SETUP, LOCAL } = api.const;
 const { catalog, client, platform, selection, stats, ui } = api;
diff --git a/src/kiri/app/viewmode.js b/src/kiri/app/view-mode.js
similarity index 100%
rename from src/kiri/app/viewmode.js
rename to src/kiri/app/view-mode.js
diff --git a/src/kiri/app/workers.js b/src/kiri/app/workers.js
index 2f6a564f..e0a9871d 100644
--- a/src/kiri/app/workers.js
+++ b/src/kiri/app/workers.js
@@ -48,7 +48,7 @@ function send(fn, data, onreply, zerocopy) {
 
 // code is running in the browser / client context
 export const client = {
-    send: send,
+    send,
 
     setWorkPath(path) {
         workpath = path;
diff --git a/src/kiri/app/workspace.js b/src/kiri/app/workspace.js
index 6c97faa4..c8ea427e 100644
--- a/src/kiri/app/workspace.js
+++ b/src/kiri/app/workspace.js
@@ -71,7 +71,7 @@ function auto_save() {
  * @param {Widget|Array<Widget>} [sel] - Widget(s) to focus on (defaults to all)
  * @param {object} [point] - Optional point {x, y, z} to focus on directly
  */
-function setFocus(sel, point) {
+function set_focus(sel, point) {
     if (point) {
         SPACE.platform.setCenter(point.x, point.z, point.y);
         SPACE.view.setFocus(new THREE.Vector3(point.x, point.y, point.z));
@@ -111,7 +111,7 @@ function setFocus(sel, point) {
  * Shows alert unless quiet=true.
  * @param {boolean} [quiet] - Suppress "workspace saved" alert
  */
-function saveWorkspace(quiet) {
+function save(quiet) {
     api.conf.save();
     const newWidgets = [];
     const oldWidgets = js2o(SDB.getItem('ws-widgets'), []);
@@ -147,7 +147,7 @@ function saveWorkspace(quiet) {
  * @param {boolean} [skip_widget_load] - Skip loading widgets (config only)
  * @returns {boolean} True if widgets were queued for loading
  */
-function restoreWorkspace(ondone, skip_widget_load) {
+function restore(ondone, skip_widget_load) {
     let newset = api.conf.restore(false),
         camera = newset.controller.view,
         toload = ls2o('ws-widgets',[]),
@@ -205,7 +205,7 @@ function restoreWorkspace(ondone, skip_widget_load) {
  * Clear all widgets from workspace.
  * Clears worker cache/memory, selects all widgets, and deletes them.
  */
-function clearWorkspace() {
+function clear() {
     // free up worker cache/mem
     api.client.clear();
     platform.select_all();
@@ -221,12 +221,12 @@ function is_dark() {
 }
 
 export const workspace = {
-    reload,
     auto_save,
-    restore: restoreWorkspace,
-    clear: clearWorkspace,
-    save: saveWorkspace,
-    set_focus: setFocus,
+    clear,
+    is_dark,
+    reload,
+    restore,
+    save,
+    set_focus,
     update: SPACE.update,
-    is_dark
 };
diff --git a/src/kiri/mode/cam/cl-ops.js b/src/kiri/mode/cam/cl-ops.js
index 106efbf9..0f90ba55 100644
--- a/src/kiri/mode/cam/cl-ops.js
+++ b/src/kiri/mode/cam/cl-ops.js
@@ -9,7 +9,7 @@ import { selectHoles } from './cl-hole.js';
 import { selectHelical } from './cl-helical.js';
 import { surfaceAdd } from './cl-surface.js';
 import { traceAdd } from './cl-trace.js';
-import { startFaceUp } from '../../app/tools.js';
+import { startFaceUp } from '../../app/face-tool.js';
 
 const { MODES } = api.const;
 const { uc: UC } = api;