diff --git a/ftl/core/actions.ftl b/ftl/core/actions.ftl
index 82c31e1ed..8fd3df0f7 100644
--- a/ftl/core/actions.ftl
+++ b/ftl/core/actions.ftl
@@ -48,9 +48,9 @@ actions-update-card = Update Card
 actions-update-deck = Update Deck
 actions-forget-card = Reset Card
 actions-build-filtered-deck = Build Deck
-actions-add-notetype = Add Notetype
-actions-remove-notetype = Remove Notetype
-actions-update-notetype = Update Notetype
+actions-add-notetype = Add Note Type
+actions-remove-notetype = Remove Note Type
+actions-update-notetype = Update Note Type
 actions-update-config = Update Config
 actions-card-info = Card Info
 actions-previous-card-info = Previous Card Info
diff --git a/ftl/core/adding.ftl b/ftl/core/adding.ftl
index b95210ee9..e94333008 100644
--- a/ftl/core/adding.ftl
+++ b/ftl/core/adding.ftl
@@ -7,6 +7,6 @@ adding-history = History
 adding-note-deleted = (Note deleted)
 adding-shortcut = Shortcut: { $val }
 adding-the-first-field-is-empty = The first field is empty.
-adding-you-have-a-cloze-deletion-note = You have a cloze notetype but have not made any cloze deletions. Proceed?
-adding-cloze-outside-cloze-notetype = Cloze deletion can only be used on cloze notetypes.
+adding-you-have-a-cloze-deletion-note = You have a cloze note type but have not made any cloze deletions. Proceed?
+adding-cloze-outside-cloze-notetype = Cloze deletion can only be used on cloze note types.
 adding-cloze-outside-cloze-field = Cloze deletion can only be used in fields which use the 'cloze:' filter. This is typically the first field.
diff --git a/ftl/core/browsing.ftl b/ftl/core/browsing.ftl
index 644d158ac..c04d3c8e9 100644
--- a/ftl/core/browsing.ftl
+++ b/ftl/core/browsing.ftl
@@ -29,7 +29,7 @@ browsing-change-deck = Change Deck
 browsing-change-deck2 = Change Deck...
 browsing-change-note-type = Change Note Type
 browsing-change-note-type2 = Change Note Type...
-browsing-change-notetype = Change Notetype
+browsing-change-notetype = Change Note Type
 browsing-clear-unused-tags = Clear Unused Tags
 browsing-confirm-saved-search-overwrite = A saved search with the name { $name } already exists. Do you want to overwrite it?
 browsing-created = Created
@@ -142,7 +142,7 @@ browsing-tooltip-card-modified = The last time changes were made to a card, incl
 browsing-tooltip-note-modified = The last time changes were made to a note, usually field content or tag edits
 browsing-tooltip-card = The name of a card's card template
 browsing-tooltip-cards = The number of cards a note has
-browsing-tooltip-notetype = The name of a note's notetype
+browsing-tooltip-notetype = The name of a note's note type
 browsing-tooltip-question = The front side of a card, customisable in the card template editor
 browsing-tooltip-answer = The back side of a card, customisable in the card template editor
 browsing-studied-today = Studied
diff --git a/ftl/core/card-templates.ftl b/ftl/core/card-templates.ftl
index b61fcec90..18a7a76b4 100644
--- a/ftl/core/card-templates.ftl
+++ b/ftl/core/card-templates.ftl
@@ -20,11 +20,11 @@ card-templates-night-mode = Night Mode
 # on a mobile device.
 card-templates-add-mobile-class = Add Mobile Class
 card-templates-preview-settings = Options
-card-templates-invalid-template-number = Card template { $number } in notetype '{ $notetype }' has a problem.
+card-templates-invalid-template-number = Card template { $number } in note type '{ $notetype }' has a problem.
 card-templates-identical-front = The front side is identical to card template { $number }.
 card-templates-no-front-field = Expected to find a field replacement on the front of the card template.
 card-templates-missing-cloze = Expected to find '{ "{{" }cloze:Text{ "}}" }' or similar on the front and back of the card template.
-card-templates-extraneous-cloze = 'cloze:' can only be used on cloze notetypes.
+card-templates-extraneous-cloze = 'cloze:' can only be used on cloze note types.
 card-templates-see-preview = See the preview for more information.
 card-templates-field-not-found = Field '{ $field }' not found.
 card-templates-changes-saved = Changes saved.
@@ -59,7 +59,7 @@ card-templates-this-will-create-card-proceed =
     }
 card-templates-type-boxes-warning = Only one typing box per card template is supported.
 card-templates-restore-to-default = Restore to Default
-card-templates-restore-to-default-confirmation = This will reset all fields and templates in this notetype to their default
+card-templates-restore-to-default-confirmation = This will reset all fields and templates in this note type to their default
     values, removing any extra fields/templates and their content, and any custom styling. Do you wish to proceed?
-card-templates-restored-to-default = Notetype has been restored to its original state.
+card-templates-restored-to-default = Note type has been restored to its original state.
 
diff --git a/ftl/core/change-notetype.ftl b/ftl/core/change-notetype.ftl
index 419030389..f21abd3d2 100644
--- a/ftl/core/change-notetype.ftl
+++ b/ftl/core/change-notetype.ftl
@@ -8,7 +8,7 @@ change-notetype-will-discard-cards = Will remove the following cards:
 change-notetype-fields = Fields
 change-notetype-templates = Templates
 change-notetype-to-from-cloze =
-    When changing to or from a Cloze notetype, card numbers remain unchanged.
+    When changing to or from a Cloze note type, card numbers remain unchanged.
     
-    If changing to a regular notetype, and there are more cloze deletions
+    If changing to a regular note type, and there are more cloze deletions
     than available card templates, any extra cards will be removed.
diff --git a/ftl/core/database-check.ftl b/ftl/core/database-check.ftl
index 67d6812e7..8a9e4e178 100644
--- a/ftl/core/database-check.ftl
+++ b/ftl/core/database-check.ftl
@@ -51,7 +51,7 @@ database-check-fixed-invalid-ids =
        *[other] Fixed { $count } objects with timestamps in the future.
     }
 # "db-check" is always in English
-database-check-notetypes-recovered = One or more notetypes were missing. The notes that used them have been given new notetypes starting with "db-check", but field names and card design have been lost, so you may be better off restoring from an automatic backup.
+database-check-notetypes-recovered = One or more note types were missing. The notes that used them have been given new note types starting with "db-check", but field names and card design have been lost, so you may be better off restoring from an automatic backup.
 
 ## Progress info
 
diff --git a/ftl/core/errors.ftl b/ftl/core/errors.ftl
index c3f5a3b18..65ee5365b 100644
--- a/ftl/core/errors.ftl
+++ b/ftl/core/errors.ftl
@@ -5,7 +5,7 @@ errors-100-tags-max =
     A maximum of 100 tags can be selected. Listing the
     tags you want instead of the ones you don't want is usually simpler, and there
     is no need to select child tags if you have selected a parent tag.
-errors-multiple-notetypes-selected = Please select notes from only one notetype.
+errors-multiple-notetypes-selected = Please select notes from only one note type.
 errors-please-check-database = Please use the Check Database action, then try again.
 errors-please-check-media = Please use the Check Media action, then try again.
 errors-collection-too-new = This collection requires a newer version of Anki to open.
diff --git a/ftl/core/exporting.ftl b/ftl/core/exporting.ftl
index be612f7da..422a580e4 100644
--- a/ftl/core/exporting.ftl
+++ b/ftl/core/exporting.ftl
@@ -40,5 +40,5 @@ exporting-processed-media-files =
        *[other] Processed { $count } media files...
     }
 exporting-include-deck = Include deck name
-exporting-include-notetype = Include notetype name
+exporting-include-notetype = Include note type name
 exporting-include-guid = Include unique identifier
diff --git a/ftl/core/importing.ftl b/ftl/core/importing.ftl
index 0987818e1..bf3162809 100644
--- a/ftl/core/importing.ftl
+++ b/ftl/core/importing.ftl
@@ -8,7 +8,7 @@ importing-anki2-files-are-not-directly-importable = .anki2 files are not directl
 importing-appeared-twice-in-file = Appeared twice in file: { $val }
 importing-by-default-anki-will-detect-the = By default, Anki will detect the character between fields, such as a tab, comma, and so on. If Anki is detecting the character incorrectly, you can enter it here. Use \t to represent tab.
 importing-cannot-merge-notetypes-of-different-kinds =
-    Cloze notetypes cannot be merged with regular notetypes.
+    Cloze note types cannot be merged with regular note types.
     You may still import the file with '{ importing-merge-notetypes }' disabled.
 importing-change = Change
 importing-colon = Colon
@@ -33,13 +33,13 @@ importing-map-to = Map to { $val }
 importing-map-to-tags = Map to Tags
 importing-mapped-to = mapped to <b>{ $val }</b>
 importing-mapped-to-tags = mapped to <b>Tags</b>
-# the action of combining two existing notetypes to create a new one
-importing-merge-notetypes = Merge notetypes
+# the action of combining two existing note types to create a new one
+importing-merge-notetypes = Merge note types
 importing-merge-notetypes-help =
-    If checked, and you or the deck author altered the schema of a notetype, Anki will
+    If checked, and you or the deck author altered the schema of a note type, Anki will
     merge the two versions instead of keeping both.
     
-    Altering a notetype's schema means adding, removing, or reordering fields or templates,
+    Altering a note type's schema means adding, removing, or reordering fields or templates,
     or changing the sort field.
     As a counterexample, changing the front side of an existing template does *not* constitute
     a schema change.
@@ -50,7 +50,7 @@ importing-multicharacter-separators-are-not-supported-please = Multi-character s
 importing-notes-added-from-file = Notes added from file: { $val }
 importing-notes-found-in-file = Notes found in file: { $val }
 importing-notes-skipped-as-theyre-already-in = Notes skipped, as up-to-date copies are already in your collection: { $val }
-importing-notes-skipped-update-due-to-notetype = Notes not updated, as notetype has been modified since you first imported the notes: { $val }
+importing-notes-skipped-update-due-to-notetype = Notes not updated, as note type has been modified since you first imported the notes: { $val }
 importing-notes-updated-as-file-had-newer = Notes updated, as file had newer version: { $val }
 importing-include-reviews = Include reviews
 importing-also-import-progress = Import any learning progress
@@ -90,10 +90,10 @@ importing-update-notes = Update notes
 importing-update-notes-help =
     When to update an existing note in your collection. By default, this is only done
     if the matching imported note was more recently modified.
-importing-update-notetypes = Update notetypes
+importing-update-notetypes = Update note types
 importing-update-notetypes-help =
-    When to update an existing notetype in your collection. By default, this is only done
-    if the matching imported notetype was more recently modified. Changes to template text
+    When to update an existing note type in your collection. By default, this is only done
+    if the matching imported note type was more recently modified. Changes to template text
     and styling can always be imported, but for schema changes (e.g. the number or order of
     fields has changed), the '{ importing-merge-notetypes }' option will also need to be enabled.
 importing-note-added =
@@ -148,7 +148,7 @@ importing-file = File
 # "Match scope: notetype / notetype and deck". Controls how duplicates are matched.
 importing-match-scope = Match scope
 # Used with the 'match scope' option
-importing-notetype-and-deck = Notetype and deck
+importing-notetype-and-deck = Note type and deck
 importing-cards-added =
     { $count ->
         [one] { $count } card added.
@@ -182,8 +182,8 @@ importing-conflicting-notes-skipped =
     }
 importing-conflicting-notes-skipped2 =
     { $count ->
-        [one] { $count } note was not imported, because its notetype has changed, and '{ importing-merge-notetypes }' was not enabled.
-        *[other] { $count } notes were not imported, because their notetype has changed, and '{ importing-merge-notetypes }' was not enabled.
+        [one] { $count } note was not imported, because its note type has changed, and '{ importing-merge-notetypes }' was not enabled.
+        *[other] { $count } notes were not imported, because their note type has changed, and '{ importing-merge-notetypes }' was not enabled.
     }
 importing-import-log = Import Log
 importing-no-notes-in-file = No notes found in file.
@@ -198,8 +198,8 @@ importing-status = Status
 importing-duplicate-note-added = Duplicate note added
 importing-added-new-note = New note added
 importing-existing-note-skipped = Note skipped, as an up-to-date copy is already in your collection
-importing-note-skipped-update-due-to-notetype = Note not updated, as notetype has been modified since you first imported the note
-importing-note-skipped-update-due-to-notetype2 = Note not updated, as notetype has been modified since you first imported the note, and '{ importing-merge-notetypes }' was not enabled
+importing-note-skipped-update-due-to-notetype = Note not updated, as note type has been modified since you first imported the note
+importing-note-skipped-update-due-to-notetype2 = Note not updated, as note type has been modified since you first imported the note, and '{ importing-merge-notetypes }' was not enabled
 importing-note-updated-as-file-had-newer = Note updated, as file had newer version
 importing-note-skipped-due-to-missing-notetype = Note skipped, as its notetype was missing
 importing-note-skipped-due-to-missing-deck = Note skipped, as its deck was missing
@@ -216,10 +216,10 @@ importing-allow-html-in-fields-help =
     '&lt;br&gt;', it will appear as a line break on your card. On the other hand, with this
     option disabled, the literal characters '&lt;br&gt;' will be rendered.
 importing-notetype-help =
-    Newly-imported notes will have this notetype, and only existing notes with this
-    notetype will be updated.
+    Newly-imported notes will have this note type, and only existing notes with this
+    note type will be updated.
     
-    You can choose which fields in the file correspond to which notetype fields with the
+    You can choose which fields in the file correspond to which note type fields with the
     mapping tool.
 importing-deck-help = Imported cards will be placed in this deck.
 importing-existing-notes-help =
@@ -229,7 +229,7 @@ importing-existing-notes-help =
     - `{ importing-preserve }`: Do nothing.
     - `{ importing-duplicate }`: Create a new note.
 importing-match-scope-help =
-    Only existing notes with the same notetype will be checked for duplicates. This can
+    Only existing notes with the same note type will be checked for duplicates. This can
     additionally be restricted to notes with cards in the same deck.
 importing-tag-all-notes-help =
     These tags will be added to both newly-imported and updated notes.
diff --git a/ftl/core/notetypes.ftl b/ftl/core/notetypes.ftl
index 665b9f409..f7eccd08b 100644
--- a/ftl/core/notetypes.ftl
+++ b/ftl/core/notetypes.ftl
@@ -1,4 +1,4 @@
-notetypes-notetype = Notetype
+notetypes-notetype = Note Type
 
 ## Default field names in newly created note types