diff --git a/app/client/aclui/AccessRules.ts b/app/client/aclui/AccessRules.ts
index 7f49a2d2..8a558d78 100644
--- a/app/client/aclui/AccessRules.ts
+++ b/app/client/aclui/AccessRules.ts
@@ -55,7 +55,7 @@ import {
 import {makeT} from 'app/client/lib/localization';
 import isEqual = require('lodash/isEqual');
 
-const t = makeT('aclui.AccessRules');
+const t = makeT('AccessRules');
 
 // tslint:disable:max-classes-per-file no-console
 
diff --git a/app/client/aclui/PermissionsWidget.ts b/app/client/aclui/PermissionsWidget.ts
index e121302f..5d3a467b 100644
--- a/app/client/aclui/PermissionsWidget.ts
+++ b/app/client/aclui/PermissionsWidget.ts
@@ -15,7 +15,7 @@ import {makeT} from 'app/client/lib/localization';
 // One of the strings 'read', 'update', etc.
 export type PermissionKey = keyof PartialPermissionSet;
 
-const t = makeT('aclui.PermissionsWidget');
+const t = makeT('PermissionsWidget');
 
 /**
  * Renders a box for each of availableBits, and a dropdown with a description and some shortcuts.
diff --git a/app/client/components/ActionLog.ts b/app/client/components/ActionLog.ts
index 4ea80f3e..aa0bdb9d 100644
--- a/app/client/components/ActionLog.ts
+++ b/app/client/components/ActionLog.ts
@@ -47,7 +47,7 @@ const state = {
   DEFAULT: 'default'
 };
 
-const t = makeT('components.ActionLog');
+const t = makeT('ActionLog');
 
 export class ActionLog extends dispose.Disposable implements IDomComponent {
 
diff --git a/app/client/components/ChartView.ts b/app/client/components/ChartView.ts
index 1d267ce9..0f025002 100644
--- a/app/client/components/ChartView.ts
+++ b/app/client/components/ChartView.ts
@@ -50,7 +50,7 @@ const DONUT_DEFAULT_TEXT_SIZE = 24;
 
 const testId = makeTestId('test-chart-');
 
-const t = makeT('components.ChartView');
+const t = makeT('ChartView');
 
 function isPieLike(chartType: string) {
   return ['pie', 'donut'].includes(chartType);
diff --git a/app/client/components/CodeEditorPanel.ts b/app/client/components/CodeEditorPanel.ts
index 99363842..19167a74 100644
--- a/app/client/components/CodeEditorPanel.ts
+++ b/app/client/components/CodeEditorPanel.ts
@@ -9,7 +9,7 @@ import {makeT} from 'app/client/lib/localization';
 const hljs           = require('highlight.js/lib/core');
 hljs.registerLanguage('python', require('highlight.js/lib/languages/python'));
 
-const t = makeT('components.CodeEditorPanel');
+const t = makeT('CodeEditorPanel');
 
 export class CodeEditorPanel extends DisposableWithEvents {
   private _schema = Observable.create(this, '');
diff --git a/app/client/components/DataTables.ts b/app/client/components/DataTables.ts
index 06bcd75a..9f169b6a 100644
--- a/app/client/components/DataTables.ts
+++ b/app/client/components/DataTables.ts
@@ -16,7 +16,7 @@ import {makeT} from 'app/client/lib/localization';
 
 const testId = makeTestId('test-raw-data-');
 
-const t = makeT('components.DataTables');
+const t = makeT('DataTables');
 
 export class DataTables extends Disposable {
   private _tables: Observable<TableRec[]>;
diff --git a/app/client/components/DocumentUsage.ts b/app/client/components/DocumentUsage.ts
index 914ef0ba..54cb1d9f 100644
--- a/app/client/components/DocumentUsage.ts
+++ b/app/client/components/DocumentUsage.ts
@@ -13,7 +13,7 @@ import {canUpgradeOrg} from 'app/common/roles';
 import {Computed, Disposable, dom, DomContents, DomElementArg, makeTestId, styled} from 'grainjs';
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('components.DocumentUsage');
+const t = makeT('DocumentUsage');
 
 const testId = makeTestId('test-doc-usage-');
 
diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts
index c5c8f46e..13a11ec6 100644
--- a/app/client/components/GristDoc.ts
+++ b/app/client/components/GristDoc.ts
@@ -87,7 +87,7 @@ import * as ko from 'knockout';
 import cloneDeepWith = require('lodash/cloneDeepWith');
 import isEqual = require('lodash/isEqual');
 
-const t = makeT('components.GristDoc');
+const t = makeT('GristDoc');
 
 const G = getBrowserGlobals('document', 'window');
 
diff --git a/app/client/components/Importer.ts b/app/client/components/Importer.ts
index c9fdf8e9..def7e146 100644
--- a/app/client/components/Importer.ts
+++ b/app/client/components/Importer.ts
@@ -36,7 +36,7 @@ import {labeledSquareCheckbox} from 'app/client/ui2018/checkbox';
 import {ACCESS_DENIED, AUTH_INTERRUPTED, canReadPrivateFiles, getGoogleCodeForReading} from 'app/client/ui/googleAuth';
 import debounce = require('lodash/debounce');
 
-const t = makeT('components.Importer');
+const t = makeT('Importer');
 
 
 // We expect a function for creating the preview GridView, to avoid the need to require the
diff --git a/app/client/components/PluginScreen.ts b/app/client/components/PluginScreen.ts
index 3eb9cb88..1e434287 100644
--- a/app/client/components/PluginScreen.ts
+++ b/app/client/components/PluginScreen.ts
@@ -7,7 +7,7 @@ import { PluginInstance } from 'app/common/PluginInstance';
 import { RenderTarget } from 'app/plugin/RenderOptions';
 import { Disposable, dom, DomContents, Observable, styled } from 'grainjs';
 
-const t = makeT('components.PluginScreen');
+const t = makeT('PluginScreen');
 
 /**
  * Rendering options for the PluginScreen modal.
diff --git a/app/client/components/RecordLayout.js b/app/client/components/RecordLayout.js
index dfa48e3a..6dd6f582 100644
--- a/app/client/components/RecordLayout.js
+++ b/app/client/components/RecordLayout.js
@@ -41,7 +41,7 @@ var {menu} = require('../ui2018/menus');
 var {testId} = require('app/client/ui2018/cssVars');
 var {contextMenu} = require('app/client/ui/contextMenu');
 
-const t = makeT('components.RecordLayout');
+const t = makeT('RecordLayout');
 
 /**
  * Construct a RecordLayout.
diff --git a/app/client/components/RecordLayoutEditor.js b/app/client/components/RecordLayoutEditor.js
index 79955c1d..e91aff4c 100644
--- a/app/client/components/RecordLayoutEditor.js
+++ b/app/client/components/RecordLayoutEditor.js
@@ -6,7 +6,7 @@ var {makeT} = require('app/client/lib/localization');
 var commands = require('./commands');
 var LayoutEditor = require('./LayoutEditor');
 
-const t = makeT('components.RecordLayoutEditor');
+const t = makeT('RecordLayoutEditor');
 const {basicButton, cssButton, primaryButton} = require('app/client/ui2018/buttons');
 const {icon} = require('app/client/ui2018/icons');
 const {menu, menuDivider, menuItem} = require('app/client/ui2018/menus');
diff --git a/app/client/components/RefSelect.ts b/app/client/components/RefSelect.ts
index e45377aa..a751bd56 100644
--- a/app/client/components/RefSelect.ts
+++ b/app/client/components/RefSelect.ts
@@ -14,7 +14,7 @@ import ko from 'knockout';
 import {menu, menuItem} from 'popweasel';
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('components.RefSelect');
+const t = makeT('RefSelect');
 
 interface Item {
   label: string;
diff --git a/app/client/components/SelectionSummary.ts b/app/client/components/SelectionSummary.ts
index 1e3d2bbe..15610e6c 100644
--- a/app/client/components/SelectionSummary.ts
+++ b/app/client/components/SelectionSummary.ts
@@ -16,7 +16,7 @@ import ko from 'knockout';
 import {Computed, Disposable, dom, makeTestId, Observable, styled, subscribe} from 'grainjs';
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('components.SelectionSummary');
+const t = makeT('SelectionSummary');
 
 /**
  * A beginning and end index for a range of columns or rows.
diff --git a/app/client/components/TypeTransform.ts b/app/client/components/TypeTransform.ts
index 509e8890..4741e8c8 100644
--- a/app/client/components/TypeTransform.ts
+++ b/app/client/components/TypeTransform.ts
@@ -19,7 +19,7 @@ import {UserAction} from 'app/common/DocActions';
 import {Computed, dom, fromKo, Observable} from 'grainjs';
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('components.TypeTransformation');
+const t = makeT('TypeTransformation');
 
 // To simplify diff (avoid rearranging methods to satisfy private/public order).
 /* eslint-disable @typescript-eslint/member-ordering */
diff --git a/app/client/components/ValidationPanel.js b/app/client/components/ValidationPanel.js
index e9f155a7..c7b1dbee 100644
--- a/app/client/components/ValidationPanel.js
+++ b/app/client/components/ValidationPanel.js
@@ -7,7 +7,7 @@ var kf = require('../lib/koForm');
 var AceEditor = require('./AceEditor');
 var {makeT} = require('app/client/lib/localization');
 
-const t = makeT('components.ValidationPanel');
+const t = makeT('ValidationPanel');
 
 /**
  * Document level configuration settings.
diff --git a/app/client/components/ViewConfigTab.js b/app/client/components/ViewConfigTab.js
index 6510f11d..9202f636 100644
--- a/app/client/components/ViewConfigTab.js
+++ b/app/client/components/ViewConfigTab.js
@@ -19,7 +19,7 @@ const {makeT} = require('app/client/lib/localization');
 
 const testId = makeTestId('test-vconfigtab-');
 
-const t = makeT('components.ViewConfigTab');
+const t = makeT('ViewConfigTab');
 
 /**
  * Helper class that combines one ViewSection's data for building dom.
diff --git a/app/client/components/duplicatePage.ts b/app/client/components/duplicatePage.ts
index a4e7bca9..393f9e1f 100644
--- a/app/client/components/duplicatePage.ts
+++ b/app/client/components/duplicatePage.ts
@@ -15,7 +15,7 @@ import zip = require('lodash/zip');
 import zipObject = require('lodash/zipObject');
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('components.duplicatePage');
+const t = makeT('duplicatePage');
 
 // Duplicate page with pageId. Starts by prompting user for a new name.
 export async function duplicatePage(gristDoc: GristDoc, pageId: number) {
diff --git a/app/client/lib/ACUserManager.ts b/app/client/lib/ACUserManager.ts
index 66cc095e..3ce4e318 100644
--- a/app/client/lib/ACUserManager.ts
+++ b/app/client/lib/ACUserManager.ts
@@ -18,7 +18,7 @@ import {createUserImage, cssUserImage} from "app/client/ui/UserImage";
 import {Computed, computed, dom, DomElementArg, Holder, IDisposableOwner, Observable, styled} from "grainjs";
 import {cssMenuItem} from "popweasel";
 
-const t = makeT('lib.ACUserManager');
+const t = makeT('ACUserManager');
 
 export interface ACUserItem extends ACItem {
   value: string;
diff --git a/app/client/models/AppModel.ts b/app/client/models/AppModel.ts
index 5a0b3849..4defcde7 100644
--- a/app/client/models/AppModel.ts
+++ b/app/client/models/AppModel.ts
@@ -24,7 +24,7 @@ import {getOrgName, Organization, OrgError, UserAPI, UserAPIImpl} from 'app/comm
 import {getUserPrefObs, getUserPrefsObs} from 'app/client/models/UserPrefs';
 import {bundleChanges, Computed, Disposable, Observable, subscribe} from 'grainjs';
 
-const t = makeT('models.AppModel');
+const t = makeT('AppModel');
 
 // Reexported for convenience.
 export {reportError} from 'app/client/models/errors';
diff --git a/app/client/models/DocPageModel.ts b/app/client/models/DocPageModel.ts
index 6db13d20..0b15ec72 100644
--- a/app/client/models/DocPageModel.ts
+++ b/app/client/models/DocPageModel.ts
@@ -29,7 +29,7 @@ import {makeT} from 'app/client/lib/localization';
 
 // tslint:disable:no-console
 
-const t = makeT('models.DocPageModel');
+const t = makeT('DocPageModel');
 
 export interface DocInfo extends Document {
   isReadonly: boolean;
diff --git a/app/client/models/UserManagerModel.ts b/app/client/models/UserManagerModel.ts
index 9e648be8..2e6d4096 100644
--- a/app/client/models/UserManagerModel.ts
+++ b/app/client/models/UserManagerModel.ts
@@ -12,7 +12,7 @@ import {ANONYMOUS_USER_EMAIL, Document, EVERYONE_EMAIL, FullUser, getRealAccess,
 import {computed, Computed, Disposable, obsArray, ObsArray, observable, Observable} from 'grainjs';
 import some = require('lodash/some');
 
-const t = makeT('models.UserManagerModel');
+const t = makeT('UserManagerModel');
 
 export interface UserManagerModel {
   initData: PermissionData;                    // PermissionData used to initialize the UserManager
diff --git a/app/client/ui2018/ColorSelect.ts b/app/client/ui2018/ColorSelect.ts
index b6d41d97..a473fed7 100644
--- a/app/client/ui2018/ColorSelect.ts
+++ b/app/client/ui2018/ColorSelect.ts
@@ -10,7 +10,7 @@ import {BindableValue, Computed, Disposable, dom, Observable, onKeyDown, styled}
 import {defaultMenuOptions, IOpenController, setPopupToCreateDom} from 'popweasel';
 import {makeT} from 'app/client/lib/localization';
 
-const t = makeT('ui2018.ColorSelect');
+const t = makeT('ColorSelect');
 
 export interface StyleOptions {
   textColor: ColorOption,
diff --git a/app/client/ui2018/breadcrumbs.ts b/app/client/ui2018/breadcrumbs.ts
index cb13f67a..16723452 100644
--- a/app/client/ui2018/breadcrumbs.ts
+++ b/app/client/ui2018/breadcrumbs.ts
@@ -14,7 +14,7 @@ import { cssLink } from 'app/client/ui2018/links';
 import { BindableValue, dom, Observable, styled } from 'grainjs';
 import { tooltip } from 'popweasel';
 
-const t = makeT('ui2018.breadcrumbs');
+const t = makeT('breadcrumbs');
 
 export const cssBreadcrumbs = styled('div', `
   color: ${theme.lightText};
diff --git a/app/client/ui2018/menus.ts b/app/client/ui2018/menus.ts
index e8a19dab..93fe952f 100644
--- a/app/client/ui2018/menus.ts
+++ b/app/client/ui2018/menus.ts
@@ -11,7 +11,7 @@ import { BindableValue, Computed, dom, DomElementArg, DomElementMethod, IDomArgs
          MaybeObsArray, MutableObsArray, Observable, styled } from 'grainjs';
 import * as weasel from 'popweasel';
 
-const t = makeT('ui2018.menus');
+const t = makeT('menus');
 
 export interface IOptionFull<T> {
   value: T;
diff --git a/app/client/ui2018/modals.ts b/app/client/ui2018/modals.ts
index a126d867..a6b365d1 100644
--- a/app/client/ui2018/modals.ts
+++ b/app/client/ui2018/modals.ts
@@ -12,7 +12,7 @@ import {Computed, Disposable, dom, DomContents, DomElementArg, input, keyframes,
   MultiHolder, Observable, styled} from 'grainjs';
 import {cssMenuElem} from 'app/client/ui2018/menus';
 
-const t = makeT('ui2018.modals');
+const t = makeT('modals');
 
 // IModalControl is passed into the function creating the body of the modal.
 export interface IModalControl {
diff --git a/app/client/ui2018/pages.ts b/app/client/ui2018/pages.ts
index 2bae3e61..5a7cef71 100644
--- a/app/client/ui2018/pages.ts
+++ b/app/client/ui2018/pages.ts
@@ -8,7 +8,7 @@ import { hoverTooltip } from 'app/client/ui/tooltips';
 import { menu, menuItem, menuText } from "app/client/ui2018/menus";
 import { dom, domComputed, DomElementArg, makeTestId, observable, Observable, styled } from "grainjs";
 
-const t = makeT('ui2018.pages');
+const t = makeT('pages');
 
 const testId = makeTestId('test-docpage-');
 
diff --git a/app/client/ui2018/search.ts b/app/client/ui2018/search.ts
index f2d9f1f6..acb72723 100644
--- a/app/client/ui2018/search.ts
+++ b/app/client/ui2018/search.ts
@@ -17,7 +17,7 @@ import debounce = require('lodash/debounce');
 
 export * from 'app/client/models/SearchModel';
 
-const t = makeT('ui2018.search');
+const t = makeT('search');
 
 const EXPAND_TIME = .5;