diff --git a/core/language/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids
index 246418d85..2006bc5fc 100644
--- a/core/language/en-GB/ControlPanel.tids
+++ b/core/language/en-GB/ControlPanel.tids
@@ -1,4 +1,4 @@
-title: $:/lingo/ControlPanel/
+title: $:/language/ControlPanel/
 
 Basics/Caption: Basics
 Basics/Version: ~TiddlyWiki version
diff --git a/core/language/en-GB/languageprompt.tid b/core/language/en-GB/languageprompt.tid
index 4ae10351a..1c9a742f9 100644
--- a/core/language/en-GB/languageprompt.tid
+++ b/core/language/en-GB/languageprompt.tid
@@ -1,3 +1,3 @@
-title: $:/lingo/ControlPanel/Language/prompt
+title: $:/language/ControlPanel/Language/prompt
 
 Hello! Current language:
\ No newline at end of file
diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js
index 0b07b3c48..473e1b351 100644
--- a/core/modules/pluginswitcher.js
+++ b/core/modules/pluginswitcher.js
@@ -3,7 +3,7 @@ title: $:/core/modules/pluginswitcher.js
 type: application/javascript
 module-type: global
 
-Manages switching plugins for themes and lingo.
+Manages switching plugins for themes and languages.
 
 \*/
 (function(){
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index f513604c4..b53be5730 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -1,15 +1,15 @@
 title: $:/core/ui/ControlPanel/Basics
 tags: $:/tags/ControlPanel
-caption: {{$:/lingo/ControlPanel/Basics/Caption}}
+caption: {{$:/language/ControlPanel/Basics/Caption}}
 
-\define lingo-base() $:/lingo/ControlPanel/
+\define lingo-base() $:/language/ControlPanel/
 |<<lingo Basics/Version>> |''<<version>>'' |
 |<$link to="SiteTitle"><<lingo Basics/Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
 |<$link to="SiteSubtitle"><<lingo Basics/Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Basics/Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
 |<$link to="$:/config/AnimationDuration"><<lingo Basics/AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
 |<$link to="$:/DefaultTiddlers"><<lingo Basics/DefaultTiddlers>></$link> |<<lingo Basics/DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo Basics/DefaultTiddlers/Hint>>// |
-|{{$:/lingo/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} |
+|{{$:/language/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} |
 |<<lingo Basics/Tiddlers>> |''<$count filter="[!is[system]]"/>'' |
 |<<lingo Basics/Tags>> |''<$count filter="[tags[]]"/>'' |
 |<<lingo Basics/SystemTiddlers>> |''<$count filter="[is[system]]"/>'' |
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
index a14d3518e..2c99e0b29 100644
--- a/core/wiki/languageswitcher.tid
+++ b/core/wiki/languageswitcher.tid
@@ -1,6 +1,6 @@
 title: $:/snippets/languageswitcher
 
-{{$:/lingo/ControlPanel/Language/prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/></$view></$view>
+{{$:/language/ControlPanel/Language/prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/></$view></$view>
 
 <$linkcatcher to="$:/language">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div>
diff --git a/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid b/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid
index 6e84f2326..815eaef9c 100644
--- a/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid
+++ b/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid
@@ -16,7 +16,7 @@ MultiTiddlerFiles have the extension `tids`. The file is structured as a block o
 For axample:
 
 ```
-title: $:/lingo/ControlPanel/
+title: $:/language/ControlPanel/
 tags: strings
 modifier: JoeBloggs
 
@@ -25,6 +25,6 @@ Basics/Caption: Basics
 Basics/Version: ~TiddlyWiki Version
 ```
 
-This example defines two tiddlers, ''"""$:/lingo/ControlPanel/Basics/Caption"""'' and ''"""$:/lingo/ControlPanel/Basics/Version"""''.
+This example defines two tiddlers, ''"""$:/language/ControlPanel/Basics/Caption"""'' and ''"""$:/language/ControlPanel/Basics/Version"""''.
 
 If a `title` field is specified in the header then it is treated as a prefix for the individual tiddlers defined in the title.
diff --git a/languages/de-AT/languageprompt.tid b/languages/de-AT/languageprompt.tid
index 304b822b4..ec895ed5e 100644
--- a/languages/de-AT/languageprompt.tid
+++ b/languages/de-AT/languageprompt.tid
@@ -1,3 +1,3 @@
-title: $:/lingo/ControlPanel/Language/prompt
+title: $:/language/ControlPanel/Language/prompt
 
 Hallo! Aktuelle Sprache:
\ No newline at end of file
diff --git a/languages/en-US/languageprompt.tid b/languages/en-US/languageprompt.tid
index b27355356..4e588833c 100644
--- a/languages/en-US/languageprompt.tid
+++ b/languages/en-US/languageprompt.tid
@@ -1,3 +1,3 @@
-title: $:/lingo/ControlPanel/Language/prompt
+title: $:/language/ControlPanel/Language/prompt
 
 Hiya! Current language:
\ No newline at end of file
diff --git a/languages/fr-FR/languageprompt.tid b/languages/fr-FR/languageprompt.tid
index 395559e9c..528435b96 100644
--- a/languages/fr-FR/languageprompt.tid
+++ b/languages/fr-FR/languageprompt.tid
@@ -1,3 +1,3 @@
-title: $:/lingo/ControlPanel/Language/prompt
+title: $:/language/ControlPanel/Language/prompt
 
 Bonjour! Langage courant:
\ No newline at end of file