diff --git a/cmd/repl.go b/cmd/repl.go
index 02dcd24..9030a84 100644
--- a/cmd/repl.go
+++ b/cmd/repl.go
@@ -10,7 +10,7 @@ import (
 
 var replCmd = &cobra.Command{
 	Use:   "repl",
-	Short: "matron/crone repl",
+	Short: "norns repl",
 	Run: func(cmd *cobra.Command, args []string) {
 		ConfigureLogger()
 		replRun(args)
diff --git a/cmd/server.go b/cmd/server.go
index 0338a93..f9206c7 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -48,7 +48,7 @@ func init() {
 
 	serverCmd.Flags().StringVar(&dataDir, "data", "data/", "`path` to user data directory (dust)")
 	serverCmd.Flags().StringVar(&appDir, "app", "app/", "`path` to maiden web app directory")
-	serverCmd.Flags().StringVar(&docDir, "doc", "doc/", "`path` to matron lua docs")
+	serverCmd.Flags().StringVar(&docDir, "doc", "doc/", "`path` to norns lua docs")
 
 	// allow config file values to be overridden by command line
 	viper.BindPFlag("dust.path", serverCmd.Flags().Lookup("data"))
diff --git a/notes.md b/notes.md
index 2d5fe63..0db2810 100644
--- a/notes.md
+++ b/notes.md
@@ -7,9 +7,9 @@ as a user/tinkerer/musician i would like to:
 - start a new script
 - start a new script from one (of many) existing templates
 - mark a script as being a template or not
-- load current script into matron
+- load current script
 - be presented with a list of syntax errors which i can click on to bring me to that point in the editor
-- see log output from matron and crone
+- see log output
 - run commands (repl)
 - organize my scripts into folders
 - rename existing scripts, samples
@@ -46,4 +46,4 @@ https://www.digitalocean.com/community/tutorials/how-to-build-go-executables-for
 
 * https://medium.com/@david.gilbertson/icons-as-react-components-de3e33cb8792
 * https://icomoon.io/app/#/select
-* https://formidable.com/open-source/radium/
\ No newline at end of file
+* https://formidable.com/open-source/radium/
diff --git a/web/public/repl-endpoints.json b/web/public/repl-endpoints.json
index 2c41516..3fb81f5 100644
--- a/web/public/repl-endpoints.json
+++ b/web/public/repl-endpoints.json
@@ -1,4 +1,4 @@
 {
-    "matron": "ws://maiden_app_location:5555",
+    "norns": "ws://maiden_app_location:5555",
     "supercollider": "ws://maiden_app_location:5556"
 }
diff --git a/web/src/api.js b/web/src/api.js
index 214e780..d2d2cf9 100644
--- a/web/src/api.js
+++ b/web/src/api.js
@@ -135,7 +135,7 @@ class API {
   }
 
   static fileFromResource(resource) {
-    // MAINT: this totally breaks the encapsulation of script resources and returns what matron would see as the script path
+    // MAINT: this totally breaks the encapsulation of script resources and returns what norns would see as the script path
     const prefix = apiPath('dust/');
     return resource.split(prefix)[1];
   }
diff --git a/web/src/constants.js b/web/src/constants.js
index 20d7847..29f5b8e 100644
--- a/web/src/constants.js
+++ b/web/src/constants.js
@@ -2,7 +2,7 @@ import { Set } from 'immutable';
 
 export const UNTITLED_SCRIPT = 'untitled.lua';
 
-export const MATRON_COMPONENT = 'matron';
+export const MATRON_COMPONENT = 'norns';
 export const CRONE_COMPONENT = 'crone';
 
 export const SIDEBAR_COMPONENT = 'sidebar';
diff --git a/web/src/model/repl-reducers.js b/web/src/model/repl-reducers.js
index bc32c22..d38a146 100644
--- a/web/src/model/repl-reducers.js
+++ b/web/src/model/repl-reducers.js
@@ -86,7 +86,7 @@ const handleReplSend = (action, state, conn) => {
 
 const initialReplState = {
   scrollbackLimit: 200,
-  activeRepl: 'matron',
+  activeRepl: 'norns',
   endpoints: new Map(),
   connections: new Map(),
   buffers: new Map(),
diff --git a/web/src/workspace.js b/web/src/workspace.js
index 4f094a6..8b13c4c 100644
--- a/web/src/workspace.js
+++ b/web/src/workspace.js
@@ -25,7 +25,7 @@ class Workspace extends Component {
     // grab the config so that the theming data is available
     this.props.loadEditorConfig();
 
-    // MAINT: this is a bit odd here but we initiate the connections for the repl early so that any actions taken in the editor (or output from matron/crone) is captured even if the repl isn't being displayed
+    // MAINT: this is a bit odd here but we initiate the connections for the repl early so that any actions taken in the editor (or output from norns-main) is captured even if the repl isn't being displayed
     this.props.replEndpoints(endpoints => {
       endpoints.forEach((endpoint, component) => {
         this.props.replConnect(component, endpoint);