diff --git a/code/editor.go b/code/editor.go
index 41ed07c7..87b9b78e 100644
--- a/code/editor.go
+++ b/code/editor.go
@@ -250,7 +250,7 @@ func (cv *Code) JoinParaLines() { //types:add
 	if tv.HasSelection() {
 		tv.Buffer.JoinParaLines(tv.SelectRegion.Start.Ln, tv.SelectRegion.End.Ln)
 	} else {
-		tv.Buffer.JoinParaLines(0, tv.NLines-1)
+		tv.Buffer.JoinParaLines(0, tv.NumLines-1)
 	}
 }
 
@@ -264,7 +264,7 @@ func (cv *Code) TabsToSpaces() { //types:add
 	if tv.HasSelection() {
 		tv.Buffer.TabsToSpacesRegion(tv.SelectRegion.Start.Ln, tv.SelectRegion.End.Ln)
 	} else {
-		tv.Buffer.TabsToSpacesRegion(0, tv.NLines-1)
+		tv.Buffer.TabsToSpacesRegion(0, tv.NumLines-1)
 	}
 }
 
@@ -278,7 +278,7 @@ func (cv *Code) SpacesToTabs() { //types:add
 	if tv.HasSelection() {
 		tv.Buffer.SpacesToTabsRegion(tv.SelectRegion.Start.Ln, tv.SelectRegion.End.Ln)
 	} else {
-		tv.Buffer.SpacesToTabsRegion(0, tv.NLines-1)
+		tv.Buffer.SpacesToTabsRegion(0, tv.NumLines-1)
 	}
 }
 
diff --git a/code/spellpanel.go b/code/spellpanel.go
index c6500dcb..b91f40a0 100644
--- a/code/spellpanel.go
+++ b/code/spellpanel.go
@@ -218,7 +218,7 @@ func (sv *SpellPanel) CheckNext() {
 			break
 		} else {
 			sv.CurLn++
-			if sv.CurLn >= tv.NLines {
+			if sv.CurLn >= tv.NumLines {
 				done = true
 				break
 			}
diff --git a/mail/send.go b/mail/send.go
index 38afb041..74e14304 100644
--- a/mail/send.go
+++ b/mail/send.go
@@ -34,7 +34,7 @@ func (a *App) Compose() { //types:add
 	a.ComposeMessage.To = []*mail.Address{{}}
 	b := core.NewBody().AddTitle("Send message")
 	core.NewForm(b).SetStruct(a.ComposeMessage)
-	ed := texteditor.NewSoloEditor(b)
+	ed := texteditor.NewEditor(b)
 	ed.Buffer.SetLang("md")
 	ed.Buffer.Options.LineNumbers = false
 	ed.Styler(func(s *styles.Style) {
diff --git a/numbers/databrowser/datatab.go b/numbers/databrowser/datatab.go
index 2342ccf0..00a9ab9f 100644
--- a/numbers/databrowser/datatab.go
+++ b/numbers/databrowser/datatab.go
@@ -87,7 +87,7 @@ func (br *Browser) NewTabEditorString(label, content string) *texteditor.Editor
 		ed.Buffer.SetText([]byte(content))
 		return ed
 	}
-	ed := texteditor.NewSoloEditor(tab)
+	ed := texteditor.NewEditor(tab)
 	ed.Buffer.SetText([]byte(content))
 	br.Update()
 	return ed
diff --git a/numbers/databrowser/filetree.go b/numbers/databrowser/filetree.go
index 376ad263..76a62d17 100644
--- a/numbers/databrowser/filetree.go
+++ b/numbers/databrowser/filetree.go
@@ -102,7 +102,7 @@ func (br *Browser) NewTabEditor(label, filename string) *texteditor.Editor {
 		ed.Buffer.Open(core.Filename(filename))
 		return ed
 	}
-	ed := texteditor.NewSoloEditor(tab)
+	ed := texteditor.NewEditor(tab)
 	ed.Buffer.Open(core.Filename(filename))
 	br.Update()
 	return ed