diff --git a/benches/japanese-language-transformer.bench.js b/benches/japanese-language-transformer.bench.js
index 9265bcc7a1..d253920526 100644
--- a/benches/japanese-language-transformer.bench.js
+++ b/benches/japanese-language-transformer.bench.js
@@ -133,7 +133,6 @@ describe('japanese language transformer', () => {
             'こさせない',
             'こささない',
             'こさせられない',
-            'くるな',
             'きまして',
             'くれば',
             'きちゃう',
@@ -203,7 +202,6 @@ describe('japanese language transformer', () => {
             'ささない',
             'させられない',
             'せさせられない',
-            'するな',
             'しまして',
             'すれば',
             'しちゃう',
diff --git a/ext/js/language/ja/japanese-transforms.js b/ext/js/language/ja/japanese-transforms.js
index dfcc628c2b..5fb178b18b 100644
--- a/ext/js/language/ja/japanese-transforms.js
+++ b/ext/js/language/ja/japanese-transforms.js
@@ -39,7 +39,7 @@ const fuVerbTeConjugations = [
  * @param {Condition[]} conditionsOut
  * @returns {import('language-transformer').SuffixRule<Condition>[]}
  */
-function irregularVerbInflections(suffix, conditionsIn, conditionsOut) {
+function irregularVerbSuffixInflections(suffix, conditionsIn, conditionsOut) {
     const inflections = [];
     for (const verb of ikuVerbs) {
         inflections.push(suffixInflection(`${verb[0]}っ${suffix}`, verb, conditionsIn, conditionsOut));
@@ -81,7 +81,7 @@ const conditions = {
         i18n: [
             {
                 language: 'ja',
-                name: '一段動詞、辞書形',
+                name: '一段動詞、終止形',
             },
         ],
         isDictionaryForm: false,
@@ -91,7 +91,7 @@ const conditions = {
         i18n: [
             {
                 language: 'ja',
-                name: '一段動詞、進行形または完了形',
+                name: '一段動詞、～てる・でる',
             },
         ],
         isDictionaryForm: false,
@@ -112,13 +112,19 @@ const conditions = {
         i18n: [
             {
                 language: 'ja',
-                name: '五段動詞、辞書形',
+                name: '五段動詞、終止形',
             },
         ],
         isDictionaryForm: false,
     },
     'v5s': {
         name: 'Godan verb, short causative form',
+        i18n: [
+            {
+                language: 'ja',
+                name: '五段動詞、～す・さす',
+            },
+        ],
         isDictionaryForm: false,
     },
     'vk': {
@@ -161,44 +167,40 @@ const conditions = {
         ],
         isDictionaryForm: true,
     },
-    '-masu': {
-        name: 'Polite -masu ending',
+    '-ます': {
+        name: 'Polite -ます ending',
         isDictionaryForm: false,
     },
-    '-masen': {
-        name: 'Polite negative -masen ending',
+    '-ません': {
+        name: 'Polite negative -ません ending',
         isDictionaryForm: false,
     },
-    '-te': {
-        name: 'Intermediate -te endings for progressive or perfect tense',
+    '-て': {
+        name: 'Intermediate -て endings for progressive or perfect tense',
         isDictionaryForm: false,
     },
-    '-ba': {
-        name: 'Intermediate -ba endings for conditional contraction',
+    '-ば': {
+        name: 'Intermediate -ば endings for conditional contraction',
         isDictionaryForm: false,
     },
-    'adv': {
-        name: 'Intermediate -ku endings for adverbs',
+    '-く': {
+        name: 'Intermediate -く endings for adverbs',
         isDictionaryForm: false,
     },
-    'past': {
-        name: '-ta past form ending',
+    '-た': {
+        name: '-た form ending',
         isDictionaryForm: false,
     },
-    '-n': {
-        name: '-n negative ending',
+    '-ん': {
+        name: '-ん negative ending',
         isDictionaryForm: false,
     },
-    '-na': {
-        name: 'Intermediate -na ending (imperative negative)',
+    '-なさい': {
+        name: 'Intermediate -なさい ending (polite imperative)',
         isDictionaryForm: false,
     },
-    '-nasai': {
-        name: 'Intermediate -nasai ending (polite imperative)',
-        isDictionaryForm: false,
-    },
-    '-ya': {
-        name: 'Intermediate -ya ending (conditional contraction)',
+    '-ゃ': {
+        name: 'Intermediate -や ending (conditional contraction)',
         isDictionaryForm: false,
     },
 };
@@ -208,69 +210,68 @@ export const japaneseTransforms = {
     language: 'ja',
     conditions,
     transforms: {
-        '-ba': {
-            name: '-ba',
+        '-ば': {
+            name: '-ば',
             description: '1. Conditional form; shows that the previous stated condition\'s establishment is the condition for the latter stated condition to occur.\n' +
             '2. Shows a trigger for a latter stated perception or judgment.\n' +
-            'Usage: Attach ば to the hypothetical/realis form (kateikei/izenkei) of verbs and i-adjectives.',
+            'Usage: Attach ば to the hypothetical form (仮定形) of verbs and i-adjectives.',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ば',
-                    description: '仮定形',
                 },
             ],
             rules: [
-                suffixInflection('ければ', 'い', ['-ba'], ['adj-i']),
-                suffixInflection('えば', 'う', ['-ba'], ['v5']),
-                suffixInflection('けば', 'く', ['-ba'], ['v5']),
-                suffixInflection('げば', 'ぐ', ['-ba'], ['v5']),
-                suffixInflection('せば', 'す', ['-ba'], ['v5']),
-                suffixInflection('てば', 'つ', ['-ba'], ['v5']),
-                suffixInflection('ねば', 'ぬ', ['-ba'], ['v5']),
-                suffixInflection('べば', 'ぶ', ['-ba'], ['v5']),
-                suffixInflection('めば', 'む', ['-ba'], ['v5']),
-                suffixInflection('れば', 'る', ['-ba'], ['v1', 'v5', 'vk', 'vs', 'vz']),
-                suffixInflection('れば', '', ['-ba'], ['-masu']),
+                suffixInflection('ければ', 'い', ['-ば'], ['adj-i']),
+                suffixInflection('えば', 'う', ['-ば'], ['v5']),
+                suffixInflection('けば', 'く', ['-ば'], ['v5']),
+                suffixInflection('げば', 'ぐ', ['-ば'], ['v5']),
+                suffixInflection('せば', 'す', ['-ば'], ['v5']),
+                suffixInflection('てば', 'つ', ['-ば'], ['v5']),
+                suffixInflection('ねば', 'ぬ', ['-ば'], ['v5']),
+                suffixInflection('べば', 'ぶ', ['-ば'], ['v5']),
+                suffixInflection('めば', 'む', ['-ば'], ['v5']),
+                suffixInflection('れば', 'る', ['-ば'], ['v1', 'v5', 'vk', 'vs', 'vz']),
+                suffixInflection('れば', '', ['-ば'], ['-ます']),
             ],
         },
-        '-ya': {
-            name: '-ya',
-            description: 'Contraction of -ba.',
+        '-ゃ': {
+            name: '-ゃ',
+            description: 'Contraction of -ば.',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ゃ',
-                    description: '仮定形の縮約系',
+                    description: '「～ば」の短縮',
                 },
             ],
             rules: [
-                suffixInflection('けりゃ', 'ければ', ['-ya'], ['-ba']),
-                suffixInflection('きゃ', 'ければ', ['-ya'], ['-ba']),
-                suffixInflection('や', 'えば', ['-ya'], ['-ba']),
-                suffixInflection('きゃ', 'けば', ['-ya'], ['-ba']),
-                suffixInflection('ぎゃ', 'げば', ['-ya'], ['-ba']),
-                suffixInflection('しゃ', 'せば', ['-ya'], ['-ba']),
-                suffixInflection('ちゃ', 'てば', ['-ya'], ['-ba']),
-                suffixInflection('にゃ', 'ねば', ['-ya'], ['-ba']),
-                suffixInflection('びゃ', 'べば', ['-ya'], ['-ba']),
-                suffixInflection('みゃ', 'めば', ['-ya'], ['-ba']),
-                suffixInflection('りゃ', 'れば', ['-ya'], ['-ba']),
+                suffixInflection('けりゃ', 'ければ', ['-ゃ'], ['-ば']),
+                suffixInflection('きゃ', 'ければ', ['-ゃ'], ['-ば']),
+                suffixInflection('や', 'えば', ['-ゃ'], ['-ば']),
+                suffixInflection('きゃ', 'けば', ['-ゃ'], ['-ば']),
+                suffixInflection('ぎゃ', 'げば', ['-ゃ'], ['-ば']),
+                suffixInflection('しゃ', 'せば', ['-ゃ'], ['-ば']),
+                suffixInflection('ちゃ', 'てば', ['-ゃ'], ['-ば']),
+                suffixInflection('にゃ', 'ねば', ['-ゃ'], ['-ば']),
+                suffixInflection('びゃ', 'べば', ['-ゃ'], ['-ば']),
+                suffixInflection('みゃ', 'めば', ['-ゃ'], ['-ば']),
+                suffixInflection('りゃ', 'れば', ['-ゃ'], ['-ば']),
             ],
         },
-        '-cha': {
-            name: '-cha',
+        '-ちゃ': {
+            name: '-ちゃ',
             description: 'Contraction of ～ては.\n' +
             '1. Explains how something always happens under the condition that it marks.\n' +
             '2. Expresses the repetition (of a series of) actions.\n' +
             '3. Indicates a hypothetical situation in which the speaker gives a (negative) evaluation about the other party\'s intentions.\n' +
             '4. Used in "Must Not" patterns like ～てはいけない.\n' +
-            'Usage: Attach は after the te-form of verbs, contract ては into ちゃ.',
+            'Usage: Attach は after the て-form of verbs, contract ては into ちゃ.',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ちゃ',
-                    description: '「～ては」の縮約系',
+                    description: '「～ては」の短縮',
                 },
             ],
             rules: [
@@ -293,10 +294,10 @@ export const japaneseTransforms = {
                 suffixInflection('來ちゃ', '來る', ['v5'], ['vk']),
             ],
         },
-        '-chau': {
-            name: '-chau',
-            description: 'Contraction of -shimau.\n' + shimauEnglishDescription +
-            'Usage: Attach しまう after the te-form of verbs, contract てしまう into ちゃう.',
+        '-ちゃう': {
+            name: '-ちゃう',
+            description: 'Contraction of -しまう.\n' + shimauEnglishDescription +
+            'Usage: Attach しまう after the て-form of verbs, contract てしまう into ちゃう.',
             i18n: [
                 {
                     language: 'ja',
@@ -324,10 +325,10 @@ export const japaneseTransforms = {
                 suffixInflection('來ちゃう', '來る', ['v5'], ['vk']),
             ],
         },
-        '-chimau': {
-            name: '-chimau',
-            description: 'Contraction of -shimau.\n' + shimauEnglishDescription +
-            'Usage: Attach しまう after the te-form of verbs, contract てしまう into ちまう.',
+        '-ちまう': {
+            name: '-ちまう',
+            description: 'Contraction of -しまう.\n' + shimauEnglishDescription +
+            'Usage: Attach しまう after the て-form of verbs, contract てしまう into ちまう.',
             i18n: [
                 {
                     language: 'ja',
@@ -355,10 +356,10 @@ export const japaneseTransforms = {
                 suffixInflection('來ちまう', '來る', ['v5'], ['vk']),
             ],
         },
-        '-shimau': {
-            name: '-shimau',
+        '-しまう': {
+            name: '-しまう',
             description: shimauEnglishDescription +
-            'Usage: Attach しまう after the te-form of verbs.',
+            'Usage: Attach しまう after the て-form of verbs.',
             i18n: [
                 {
                     language: 'ja',
@@ -367,14 +368,14 @@ export const japaneseTransforms = {
                 },
             ],
             rules: [
-                suffixInflection('てしまう', 'て', ['v5'], ['-te']),
-                suffixInflection('でしまう', 'で', ['v5'], ['-te']),
+                suffixInflection('てしまう', 'て', ['v5'], ['-て']),
+                suffixInflection('でしまう', 'で', ['v5'], ['-て']),
             ],
         },
-        '-nasai': {
-            name: '-nasai',
+        '-なさい': {
+            name: '-なさい',
             description: 'Polite imperative suffix.\n' +
-            'Usage: Attach なさい after the continuative form (renyoukei) of verbs.',
+            'Usage: Attach なさい after the continuative form (連用形) of verbs.',
             i18n: [
                 {
                     language: 'ja',
@@ -383,28 +384,28 @@ export const japaneseTransforms = {
                 },
             ],
             rules: [
-                suffixInflection('なさい', 'る', ['-nasai'], ['v1']),
-                suffixInflection('いなさい', 'う', ['-nasai'], ['v5']),
-                suffixInflection('きなさい', 'く', ['-nasai'], ['v5']),
-                suffixInflection('ぎなさい', 'ぐ', ['-nasai'], ['v5']),
-                suffixInflection('しなさい', 'す', ['-nasai'], ['v5']),
-                suffixInflection('ちなさい', 'つ', ['-nasai'], ['v5']),
-                suffixInflection('になさい', 'ぬ', ['-nasai'], ['v5']),
-                suffixInflection('びなさい', 'ぶ', ['-nasai'], ['v5']),
-                suffixInflection('みなさい', 'む', ['-nasai'], ['v5']),
-                suffixInflection('りなさい', 'る', ['-nasai'], ['v5']),
-                suffixInflection('じなさい', 'ずる', ['-nasai'], ['vz']),
-                suffixInflection('しなさい', 'する', ['-nasai'], ['vs']),
-                suffixInflection('為なさい', '為る', ['-nasai'], ['vs']),
-                suffixInflection('きなさい', 'くる', ['-nasai'], ['vk']),
-                suffixInflection('来なさい', '来る', ['-nasai'], ['vk']),
-                suffixInflection('來なさい', '來る', ['-nasai'], ['vk']),
+                suffixInflection('なさい', 'る', ['-なさい'], ['v1']),
+                suffixInflection('いなさい', 'う', ['-なさい'], ['v5']),
+                suffixInflection('きなさい', 'く', ['-なさい'], ['v5']),
+                suffixInflection('ぎなさい', 'ぐ', ['-なさい'], ['v5']),
+                suffixInflection('しなさい', 'す', ['-なさい'], ['v5']),
+                suffixInflection('ちなさい', 'つ', ['-なさい'], ['v5']),
+                suffixInflection('になさい', 'ぬ', ['-なさい'], ['v5']),
+                suffixInflection('びなさい', 'ぶ', ['-なさい'], ['v5']),
+                suffixInflection('みなさい', 'む', ['-なさい'], ['v5']),
+                suffixInflection('りなさい', 'る', ['-なさい'], ['v5']),
+                suffixInflection('じなさい', 'ずる', ['-なさい'], ['vz']),
+                suffixInflection('しなさい', 'する', ['-なさい'], ['vs']),
+                suffixInflection('為なさい', '為る', ['-なさい'], ['vs']),
+                suffixInflection('きなさい', 'くる', ['-なさい'], ['vk']),
+                suffixInflection('来なさい', '来る', ['-なさい'], ['vk']),
+                suffixInflection('來なさい', '來る', ['-なさい'], ['vk']),
             ],
         },
-        '-sou': {
-            name: '-sou',
+        '-そう': {
+            name: '-そう',
             description: 'Appearing that; looking like.\n' +
-            'Usage: Attach そう to the continuative form (renyoukei) of verbs, or to the stem of adjectives.',
+            'Usage: Attach そう to the continuative form (連用形) of verbs, or to the stem of adjectives.',
             i18n: [
                 {
                     language: 'ja',
@@ -432,10 +433,10 @@ export const japaneseTransforms = {
                 suffixInflection('來そう', '來る', [], ['vk']),
             ],
         },
-        '-sugiru': {
-            name: '-sugiru',
+        '-すぎる': {
+            name: '-すぎる',
             description: 'Shows something "is too..." or someone is doing something "too much".\n' +
-            'Usage: Attach すぎる to the continuative form (renyoukei) of verbs, or to the stem of adjectives.',
+            'Usage: Attach すぎる to the continuative form (連用形) of verbs, or to the stem of adjectives.',
             i18n: [
                 {
                     language: 'ja',
@@ -463,10 +464,10 @@ export const japaneseTransforms = {
                 suffixInflection('來すぎる', '來る', ['v1'], ['vk']),
             ],
         },
-        '-sugiru-kanji': {
-            name: '-sugiru',
+        '-過ぎる': {
+            name: '-過ぎる',
             description: 'Shows something "is too..." or someone is doing something "too much".\n' +
-            'Usage: Attach 過ぎる to the continuative form (renyoukei) of verbs, or to the stem of adjectives.',
+            'Usage: Attach 過ぎる to the continuative form (連用形) of verbs, or to the stem of adjectives.',
             i18n: [
                 {
                     language: 'ja',
@@ -494,11 +495,11 @@ export const japaneseTransforms = {
                 suffixInflection('來過ぎる', '來る', ['v1'], ['vk']),
             ],
         },
-        '-tai': {
-            name: '-tai',
+        '-たい': {
+            name: '-たい',
             description: '1. Expresses the feeling of desire or hope.\n' +
             '2. Used in ...たいと思います, an indirect way of saying what the speaker intends to do.\n' +
-            'Usage: Attach たい to the continuative form (renyoukei) of verbs. たい itself conjugates as i-adjective.',
+            'Usage: Attach たい to the continuative form (連用形) of verbs. たい itself conjugates as i-adjective.',
             i18n: [
                 {
                     language: 'ja',
@@ -525,11 +526,11 @@ export const japaneseTransforms = {
                 suffixInflection('來たい', '來る', ['adj-i'], ['vk']),
             ],
         },
-        '-tara': {
-            name: '-tara',
+        '-たら': {
+            name: '-たら',
             description: '1. Denotes the latter stated event is a continuation of the previous stated event.\n' +
             '2. Assumes that a matter has been completed or concluded.\n' +
-            'Usage: Attach たら to the continuative form (renyoukei) of verbs after euphonic change form, かったら to the stem of i-adjectives.',
+            'Usage: Attach たら to the continuative form (連用形) of verbs after euphonic change form, かったら to the stem of i-adjectives.',
             i18n: [
                 {
                     language: 'ja',
@@ -555,15 +556,15 @@ export const japaneseTransforms = {
                 suffixInflection('きたら', 'くる', [], ['vk']),
                 suffixInflection('来たら', '来る', [], ['vk']),
                 suffixInflection('來たら', '來る', [], ['vk']),
-                ...irregularVerbInflections('たら', [], ['v5']),
-                suffixInflection('ましたら', 'ます', [], ['-masu']),
+                ...irregularVerbSuffixInflections('たら', [], ['v5']),
+                suffixInflection('ましたら', 'ます', [], ['-ます']),
             ],
         },
-        '-tari': {
-            name: '-tari',
+        '-たり': {
+            name: '-たり',
             description: '1. Shows two actions occurring back and forth (when used with two verbs).\n' +
             '2. Shows examples of actions and states (when used with multiple verbs and adjectives).\n' +
-            'Usage: Attach たり to the continuative form (renyoukei) of verbs after euphonic change form, かったり to the stem of i-adjectives',
+            'Usage: Attach たり to the continuative form (連用形) of verbs after euphonic change form, かったり to the stem of i-adjectives',
             i18n: [
                 {
                     language: 'ja',
@@ -589,53 +590,52 @@ export const japaneseTransforms = {
                 suffixInflection('きたり', 'くる', [], ['vk']),
                 suffixInflection('来たり', '来る', [], ['vk']),
                 suffixInflection('來たり', '來る', [], ['vk']),
-                ...irregularVerbInflections('たり', [], ['v5']),
+                ...irregularVerbSuffixInflections('たり', [], ['v5']),
             ],
         },
-        '-te': {
-            name: '-te',
-            description: 'te-form.\n' +
+        '-て': {
+            name: '-て',
+            description: 'て-form.\n' +
             'It has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\n' +
-            'Usage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives.',
+            'Usage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives.',
             i18n: [
                 {
                     language: 'ja',
                     name: '～て',
-                    description: 'て（で）形',
                 },
             ],
             rules: [
-                suffixInflection('くて', 'い', ['-te'], ['adj-i']),
-                suffixInflection('て', 'る', ['-te'], ['v1']),
-                suffixInflection('いて', 'く', ['-te'], ['v5']),
-                suffixInflection('いで', 'ぐ', ['-te'], ['v5']),
-                suffixInflection('して', 'す', ['-te'], ['v5']),
-                suffixInflection('って', 'う', ['-te'], ['v5']),
-                suffixInflection('って', 'つ', ['-te'], ['v5']),
-                suffixInflection('って', 'る', ['-te'], ['v5']),
-                suffixInflection('んで', 'ぬ', ['-te'], ['v5']),
-                suffixInflection('んで', 'ぶ', ['-te'], ['v5']),
-                suffixInflection('んで', 'む', ['-te'], ['v5']),
-                suffixInflection('じて', 'ずる', ['-te'], ['vz']),
-                suffixInflection('して', 'する', ['-te'], ['vs']),
-                suffixInflection('為て', '為る', ['-te'], ['vs']),
-                suffixInflection('きて', 'くる', ['-te'], ['vk']),
-                suffixInflection('来て', '来る', ['-te'], ['vk']),
-                suffixInflection('來て', '來る', ['-te'], ['vk']),
-                ...irregularVerbInflections('て', ['-te'], ['v5']),
-                suffixInflection('まして', 'ます', [], ['-masu']),
+                suffixInflection('くて', 'い', ['-て'], ['adj-i']),
+                suffixInflection('て', 'る', ['-て'], ['v1']),
+                suffixInflection('いて', 'く', ['-て'], ['v5']),
+                suffixInflection('いで', 'ぐ', ['-て'], ['v5']),
+                suffixInflection('して', 'す', ['-て'], ['v5']),
+                suffixInflection('って', 'う', ['-て'], ['v5']),
+                suffixInflection('って', 'つ', ['-て'], ['v5']),
+                suffixInflection('って', 'る', ['-て'], ['v5']),
+                suffixInflection('んで', 'ぬ', ['-て'], ['v5']),
+                suffixInflection('んで', 'ぶ', ['-て'], ['v5']),
+                suffixInflection('んで', 'む', ['-て'], ['v5']),
+                suffixInflection('じて', 'ずる', ['-て'], ['vz']),
+                suffixInflection('して', 'する', ['-て'], ['vs']),
+                suffixInflection('為て', '為る', ['-て'], ['vs']),
+                suffixInflection('きて', 'くる', ['-て'], ['vk']),
+                suffixInflection('来て', '来る', ['-て'], ['vk']),
+                suffixInflection('來て', '來る', ['-て'], ['vk']),
+                ...irregularVerbSuffixInflections('て', ['-て'], ['v5']),
+                suffixInflection('まして', 'ます', [], ['-ます']),
             ],
         },
-        '-zu': {
-            name: '-zu',
+        '-ず': {
+            name: '-ず',
             description: '1. Negative form of verbs.\n' +
-            '2. Continuative form (renyoukei) of the particle ぬ (nu).\n' +
-            'Usage: Attach ず to the irrealis form (mizenkei) of verbs.',
+            '2. Continuative form (連用形) of the particle ぬ (nu).\n' +
+            'Usage: Attach ず to the irrealis form (未然形) of verbs.',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ず',
-                    description: '口語の否定の助動詞「ぬ」の連用形',
+                    description: '～ない',
                 },
             ],
             rules: [
@@ -657,15 +657,16 @@ export const japaneseTransforms = {
                 suffixInflection('來ず', '來る', [], ['vk']),
             ],
         },
-        '-nu': {
-            name: '-nu',
+        '-ぬ': {
+            name: '-ぬ',
             description: 'Negative form of verbs.\n' +
-            'Usage: Attach ぬ to the irrealis form (mizenkei) of verbs.',
+            'Usage: Attach ぬ to the irrealis form (未然形) of verbs.\n' +
+            'する becomes せぬ',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ぬ',
-                    description: '動作・状態などを「…ない」と否定することを表わす。',
+                    description: '～ない',
                 },
             ],
             rules: [
@@ -687,46 +688,46 @@ export const japaneseTransforms = {
                 suffixInflection('來ぬ', '來る', [], ['vk']),
             ],
         },
-        '-n': {
-            name: '-n',
+        '-ん': {
+            name: '-ん',
             description: 'Negative form of verbs; a sound change of ぬ.\n' +
-            'Usage: Attach ん to the irrealis form (mizenkei) of verbs.\n' +
+            'Usage: Attach ん to the irrealis form (未然形) of verbs.\n' +
             'する becomes せん',
             i18n: [
                 {
                     language: 'ja',
                     name: '～ん',
-                    description: '〔否定の助動詞〕…ない',
+                    description: '～ない',
                 },
             ],
             rules: [
-                suffixInflection('ん', 'る', ['-n'], ['v1']),
-                suffixInflection('かん', 'く', ['-n'], ['v5']),
-                suffixInflection('がん', 'ぐ', ['-n'], ['v5']),
-                suffixInflection('さん', 'す', ['-n'], ['v5']),
-                suffixInflection('たん', 'つ', ['-n'], ['v5']),
-                suffixInflection('なん', 'ぬ', ['-n'], ['v5']),
-                suffixInflection('ばん', 'ぶ', ['-n'], ['v5']),
-                suffixInflection('まん', 'む', ['-n'], ['v5']),
-                suffixInflection('らん', 'る', ['-n'], ['v5']),
-                suffixInflection('わん', 'う', ['-n'], ['v5']),
-                suffixInflection('ぜん', 'ずる', ['-n'], ['vz']),
-                suffixInflection('せん', 'する', ['-n'], ['vs']),
-                suffixInflection('為ん', '為る', ['-n'], ['vs']),
-                suffixInflection('こん', 'くる', ['-n'], ['vk']),
-                suffixInflection('来ん', '来る', ['-n'], ['vk']),
-                suffixInflection('來ん', '來る', ['-n'], ['vk']),
+                suffixInflection('ん', 'る', ['-ん'], ['v1']),
+                suffixInflection('かん', 'く', ['-ん'], ['v5']),
+                suffixInflection('がん', 'ぐ', ['-ん'], ['v5']),
+                suffixInflection('さん', 'す', ['-ん'], ['v5']),
+                suffixInflection('たん', 'つ', ['-ん'], ['v5']),
+                suffixInflection('なん', 'ぬ', ['-ん'], ['v5']),
+                suffixInflection('ばん', 'ぶ', ['-ん'], ['v5']),
+                suffixInflection('まん', 'む', ['-ん'], ['v5']),
+                suffixInflection('らん', 'る', ['-ん'], ['v5']),
+                suffixInflection('わん', 'う', ['-ん'], ['v5']),
+                suffixInflection('ぜん', 'ずる', ['-ん'], ['vz']),
+                suffixInflection('せん', 'する', ['-ん'], ['vs']),
+                suffixInflection('為ん', '為る', ['-ん'], ['vs']),
+                suffixInflection('こん', 'くる', ['-ん'], ['vk']),
+                suffixInflection('来ん', '来る', ['-ん'], ['vk']),
+                suffixInflection('來ん', '來る', ['-ん'], ['vk']),
             ],
         },
-        '-nbakari': {
-            name: '-nbakari',
+        '-んばかり': {
+            name: '-んばかり',
             description: 'Shows an action or condition is on the verge of occurring, or an excessive/extreme degree.\n' +
-            'Usage: Attach んばかり to the irrealis form (mizenkei) of verbs.\n' +
+            'Usage: Attach んばかり to the irrealis form (未然形) of verbs.\n' +
             'する becomes せんばかり',
             i18n: [
                 {
                     language: 'ja',
-                    name: '～ん',
+                    name: '～んばかり',
                     description: '今にもそうなりそうな、しかし辛うじてそうなっていないようなさまを指す表現',
                 },
             ],
@@ -749,11 +750,11 @@ export const japaneseTransforms = {
                 suffixInflection('來んばかり', '來る', [], ['vk']),
             ],
         },
-        '-ntosuru': {
-            name: '-ntosuru',
+        '-んとする': {
+            name: '-んとする',
             description: '1. Shows the speaker\'s will or intention.\n' +
             '2. Shows an action or condition is on the verge of occurring.\n' +
-            'Usage: Attach んとする to the irrealis form (mizenkei) of verbs.\n' +
+            'Usage: Attach んとする to the irrealis form (未然形) of verbs.\n' +
             'する becomes せんとする',
             i18n: [
                 {
@@ -781,12 +782,13 @@ export const japaneseTransforms = {
                 suffixInflection('來んとする', '來る', ['vs'], ['vk']),
             ],
         },
-        '-mu': {
-            name: '-mu',
+        '-む': {
+            name: '-む',
             description: 'Archaic.\n' +
             '1. Shows an inference of a certain matter.\n' +
             '2. Shows speaker\'s intention.\n' +
-            'Usage: Attach む to the irrealis form (mizenkei) of verbs.',
+            'Usage: Attach む to the irrealis form (未然形) of verbs.\n' +
+            'する becomes せむ',
             i18n: [
                 {
                     language: 'ja',
@@ -813,10 +815,11 @@ export const japaneseTransforms = {
                 suffixInflection('來む', '來る', [], ['vk']),
             ],
         },
-        '-zaru': {
-            name: '-zaru',
+        '-ざる': {
+            name: '-ざる',
             description: 'Negative form of verbs.\n' +
-            'Usage: Attach ざる to the irrealis form (mizenkei) of verbs.',
+            'Usage: Attach ざる to the irrealis form (未然形) of verbs.\n' +
+            'する becomes せざる',
             i18n: [
                 {
                     language: 'ja',
@@ -843,11 +846,12 @@ export const japaneseTransforms = {
                 suffixInflection('來ざる', '來る', [], ['vk']),
             ],
         },
-        '-neba': {
-            name: '-neba',
+        '-ねば': {
+            name: '-ねば',
             description: '1. Shows a hypothetical negation; if not ...\n' +
             '2. Shows a must. Used with or without ならぬ.\n' +
-            'Usage: Attach ねば to the irrealis form (mizenkei) of verbs.',
+            'Usage: Attach ねば to the irrealis form (未然形) of verbs.\n' +
+            'する becomes せねば',
             i18n: [
                 {
                     language: 'ja',
@@ -856,48 +860,48 @@ export const japaneseTransforms = {
                 },
             ],
             rules: [
-                suffixInflection('ねば', 'る', ['-ba'], ['v1']),
-                suffixInflection('かねば', 'く', ['-ba'], ['v5']),
-                suffixInflection('がねば', 'ぐ', ['-ba'], ['v5']),
-                suffixInflection('さねば', 'す', ['-ba'], ['v5']),
-                suffixInflection('たねば', 'つ', ['-ba'], ['v5']),
-                suffixInflection('なねば', 'ぬ', ['-ba'], ['v5']),
-                suffixInflection('ばねば', 'ぶ', ['-ba'], ['v5']),
-                suffixInflection('まねば', 'む', ['-ba'], ['v5']),
-                suffixInflection('らねば', 'る', ['-ba'], ['v5']),
-                suffixInflection('わねば', 'う', ['-ba'], ['v5']),
-                suffixInflection('ぜねば', 'ずる', ['-ba'], ['vz']),
-                suffixInflection('せねば', 'する', ['-ba'], ['vs']),
-                suffixInflection('為ねば', '為る', ['-ba'], ['vs']),
-                suffixInflection('こねば', 'くる', ['-ba'], ['vk']),
-                suffixInflection('来ねば', '来る', ['-ba'], ['vk']),
-                suffixInflection('來ねば', '來る', ['-ba'], ['vk']),
+                suffixInflection('ねば', 'る', ['-ば'], ['v1']),
+                suffixInflection('かねば', 'く', ['-ば'], ['v5']),
+                suffixInflection('がねば', 'ぐ', ['-ば'], ['v5']),
+                suffixInflection('さねば', 'す', ['-ば'], ['v5']),
+                suffixInflection('たねば', 'つ', ['-ば'], ['v5']),
+                suffixInflection('なねば', 'ぬ', ['-ば'], ['v5']),
+                suffixInflection('ばねば', 'ぶ', ['-ば'], ['v5']),
+                suffixInflection('まねば', 'む', ['-ば'], ['v5']),
+                suffixInflection('らねば', 'る', ['-ば'], ['v5']),
+                suffixInflection('わねば', 'う', ['-ば'], ['v5']),
+                suffixInflection('ぜねば', 'ずる', ['-ば'], ['vz']),
+                suffixInflection('せねば', 'する', ['-ば'], ['vs']),
+                suffixInflection('為ねば', '為る', ['-ば'], ['vs']),
+                suffixInflection('こねば', 'くる', ['-ば'], ['vk']),
+                suffixInflection('来ねば', '来る', ['-ば'], ['vk']),
+                suffixInflection('來ねば', '來る', ['-ば'], ['vk']),
             ],
         },
-        '-ku': {
-            name: '-ku',
+        '-く': {
+            name: '-く',
             description: 'Adverbial form of i-adjectives.\n',
             i18n: [
                 {
                     language: 'ja',
-                    name: '連用形',
+                    name: '～く',
                     description: '〔形容詞で〕用言へ続く。例、「大きく育つ」の「大きく」。',
                 },
             ],
             rules: [
-                suffixInflection('く', 'い', ['adv'], ['adj-i']),
+                suffixInflection('く', 'い', ['-く'], ['adj-i']),
             ],
         },
         'causative': {
             name: 'causative',
             description: 'Describes the intention to make someone do something.\n' +
-            'Usage: Attach させる to the irrealis form (mizenkei) of ichidan verbs and くる.\n' +
-            'Attach せる to the irrealis form (mizenkei) of godan verbs and する.\n' +
+            'Usage: Attach させる to the irrealis form (未然形) of ichidan verbs and くる.\n' +
+            'Attach せる to the irrealis form (未然形) of godan verbs and する.\n' +
             'It itself conjugates as an ichidan verb.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '使役形',
+                    name: '～せる・させる',
                     description: 'だれかにある行為をさせる意を表わす時の言い方。例、「行かせる」の「せる」。',
                 },
             ],
@@ -927,14 +931,14 @@ export const japaneseTransforms = {
             name: 'short causative',
             description: 'Contraction of the causative form.\n' +
             'Describes the intention to make someone do something.\n' +
-            'Usage: Attach す to the irrealis form (mizenkei) of godan verbs.\n' +
-            'Attach さす to the dictionary form (shuushikei) of ichidan verbs.\n' +
+            'Usage: Attach す to the irrealis form (未然形) of godan verbs.\n' +
+            'Attach さす to the dictionary form (終止形) of ichidan verbs.\n' +
             'する becomes さす, くる becomes こさす.\n' +
             'It itself conjugates as an godan verb.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '使役形の短縮形',
+                    name: '～す・さす',
                     description: 'だれかにある行為をさせる意を表わす時の言い方。例、「食べさす」の「さす」。',
                 },
             ],
@@ -993,16 +997,10 @@ export const japaneseTransforms = {
                 suffixInflection('來い', '來る', [], ['vk']),
             ],
         },
-        'imperative negative': {
-            name: 'imperative negative',
-            rules: [
-                suffixInflection('な', '', ['-na'], ['v']),
-            ],
-        },
         'continuative': {
             name: 'continuative',
             description: 'Used to indicate actions that are (being) carried out.\n' +
-            'Refers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu.',
+            'Refers to 連用形, the part of the verb after conjugating with -ます and dropping ます.',
             i18n: [
                 {
                     language: 'ja',
@@ -1052,7 +1050,7 @@ export const japaneseTransforms = {
             name: 'negative',
             description: '1. Negative form of verbs.\n' +
             '2. Expresses a feeling of solicitation to the other party.\n' +
-            'Usage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません.',
+            'Usage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません.',
             i18n: [
                 {
                     language: 'ja',
@@ -1078,11 +1076,11 @@ export const japaneseTransforms = {
                 suffixInflection('こない', 'くる', ['adj-i'], ['vk']),
                 suffixInflection('来ない', '来る', ['adj-i'], ['vk']),
                 suffixInflection('來ない', '來る', ['adj-i'], ['vk']),
-                suffixInflection('ません', 'ます', ['-masen'], ['-masu']),
+                suffixInflection('ません', 'ます', ['-ません'], ['-ます']),
             ],
         },
-        '-sa': {
-            name: '-sa',
+        '-さ': {
+            name: '-さ',
             description: 'Nominalizing suffix of i-adjectives indicating nature, state, mind or degree.\n' +
             'Usage: Attach さ to the stem of i-adjectives.',
             i18n: [
@@ -1099,11 +1097,11 @@ export const japaneseTransforms = {
         'passive': {
             name: 'passive',
             description: passiveEnglishDescription +
-            'Usage: Attach れる to the irrealis form (mizenkei) of godan verbs.',
+            'Usage: Attach れる to the irrealis form (未然形) of godan verbs.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '受身形',
+                    name: '～れる',
                 },
             ],
             rules: [
@@ -1125,49 +1123,49 @@ export const japaneseTransforms = {
                 suffixInflection('來られる', '來る', ['v1'], ['vk']),
             ],
         },
-        '-ta': {
-            name: '-ta',
+        '-た': {
+            name: '-た',
             description: '1. Indicates a reality that has happened in the past.\n' +
             '2. Indicates the completion of an action.\n' +
             '3. Indicates the confirmation of a matter.\n' +
             '4. Indicates the speaker\'s confidence that the action will definitely be fulfilled.\n' +
             '5. Indicates the events that occur before the main clause are represented as relative past.\n' +
             '6. Indicates a mild imperative/command.\n' +
-            'Usage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives.',
+            'Usage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '～た・かった形',
+                    name: '～た',
                 },
             ],
             rules: [
-                suffixInflection('かった', 'い', ['past'], ['adj-i']),
-                suffixInflection('た', 'る', ['past'], ['v1']),
-                suffixInflection('いた', 'く', ['past'], ['v5']),
-                suffixInflection('いだ', 'ぐ', ['past'], ['v5']),
-                suffixInflection('した', 'す', ['past'], ['v5']),
-                suffixInflection('った', 'う', ['past'], ['v5']),
-                suffixInflection('った', 'つ', ['past'], ['v5']),
-                suffixInflection('った', 'る', ['past'], ['v5']),
-                suffixInflection('んだ', 'ぬ', ['past'], ['v5']),
-                suffixInflection('んだ', 'ぶ', ['past'], ['v5']),
-                suffixInflection('んだ', 'む', ['past'], ['v5']),
-                suffixInflection('じた', 'ずる', ['past'], ['vz']),
-                suffixInflection('した', 'する', ['past'], ['vs']),
-                suffixInflection('為た', '為る', ['past'], ['vs']),
-                suffixInflection('きた', 'くる', ['past'], ['vk']),
-                suffixInflection('来た', '来る', ['past'], ['vk']),
-                suffixInflection('來た', '來る', ['past'], ['vk']),
-                ...irregularVerbInflections('た', ['past'], ['v5']),
-                suffixInflection('ました', 'ます', ['past'], ['-masu']),
-                suffixInflection('でした', '', ['past'], ['-masen']),
-                suffixInflection('かった', '', ['past'], ['-masen', '-n']),
+                suffixInflection('かった', 'い', ['-た'], ['adj-i']),
+                suffixInflection('た', 'る', ['-た'], ['v1']),
+                suffixInflection('いた', 'く', ['-た'], ['v5']),
+                suffixInflection('いだ', 'ぐ', ['-た'], ['v5']),
+                suffixInflection('した', 'す', ['-た'], ['v5']),
+                suffixInflection('った', 'う', ['-た'], ['v5']),
+                suffixInflection('った', 'つ', ['-た'], ['v5']),
+                suffixInflection('った', 'る', ['-た'], ['v5']),
+                suffixInflection('んだ', 'ぬ', ['-た'], ['v5']),
+                suffixInflection('んだ', 'ぶ', ['-た'], ['v5']),
+                suffixInflection('んだ', 'む', ['-た'], ['v5']),
+                suffixInflection('じた', 'ずる', ['-た'], ['vz']),
+                suffixInflection('した', 'する', ['-た'], ['vs']),
+                suffixInflection('為た', '為る', ['-た'], ['vs']),
+                suffixInflection('きた', 'くる', ['-た'], ['vk']),
+                suffixInflection('来た', '来る', ['-た'], ['vk']),
+                suffixInflection('來た', '來る', ['-た'], ['vk']),
+                ...irregularVerbSuffixInflections('た', ['-た'], ['v5']),
+                suffixInflection('ました', 'ます', ['-た'], ['-ます']),
+                suffixInflection('でした', '', ['-た'], ['-ません']),
+                suffixInflection('かった', '', ['-た'], ['-ません', '-ん']),
             ],
         },
-        '-masu': {
-            name: '-masu',
+        '-ます': {
+            name: '-ます',
             description: 'Polite conjugation of verbs and adjectives.\n' +
-            'Usage: Attach ます to the continuative form (renyoukei) of verbs.',
+            'Usage: Attach ます to the continuative form (連用形) of verbs.',
             i18n: [
                 {
                     language: 'ja',
@@ -1175,35 +1173,35 @@ export const japaneseTransforms = {
                 },
             ],
             rules: [
-                suffixInflection('ます', 'る', ['-masu'], ['v1']),
-                suffixInflection('います', 'う', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('きます', 'く', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('ぎます', 'ぐ', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('します', 'す', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('ちます', 'つ', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('にます', 'ぬ', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('びます', 'ぶ', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('みます', 'む', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('ります', 'る', ['-masu'], ['v5d', 'v5s']),
-                suffixInflection('じます', 'ずる', ['-masu'], ['vz']),
-                suffixInflection('します', 'する', ['-masu'], ['vs']),
-                suffixInflection('為ます', '為る', ['-masu'], ['vs']),
-                suffixInflection('きます', 'くる', ['-masu'], ['vk']),
-                suffixInflection('来ます', '来る', ['-masu'], ['vk']),
-                suffixInflection('來ます', '來る', ['-masu'], ['vk']),
-                suffixInflection('くあります', 'い', ['-masu'], ['adj-i']),
+                suffixInflection('ます', 'る', ['-ます'], ['v1']),
+                suffixInflection('います', 'う', ['-ます'], ['v5d']),
+                suffixInflection('きます', 'く', ['-ます'], ['v5d']),
+                suffixInflection('ぎます', 'ぐ', ['-ます'], ['v5d']),
+                suffixInflection('します', 'す', ['-ます'], ['v5d', 'v5s']),
+                suffixInflection('ちます', 'つ', ['-ます'], ['v5d']),
+                suffixInflection('にます', 'ぬ', ['-ます'], ['v5d']),
+                suffixInflection('びます', 'ぶ', ['-ます'], ['v5d']),
+                suffixInflection('みます', 'む', ['-ます'], ['v5d']),
+                suffixInflection('ります', 'る', ['-ます'], ['v5d']),
+                suffixInflection('じます', 'ずる', ['-ます'], ['vz']),
+                suffixInflection('します', 'する', ['-ます'], ['vs']),
+                suffixInflection('為ます', '為る', ['-ます'], ['vs']),
+                suffixInflection('きます', 'くる', ['-ます'], ['vk']),
+                suffixInflection('来ます', '来る', ['-ます'], ['vk']),
+                suffixInflection('來ます', '來る', ['-ます'], ['vk']),
+                suffixInflection('くあります', 'い', ['-ます'], ['adj-i']),
             ],
         },
         'potential': {
             name: 'potential',
             description: 'Indicates a state of being (naturally) capable of doing an action.\n' +
-            'Usage: Attach (ら)れる to the irrealis form (mizenkei) of ichidan verbs.\n' +
-            'Attach る to the imperative form (meireikei) of godan verbs.\n' +
+            'Usage: Attach (ら)れる to the irrealis form (未然形) of ichidan verbs.\n' +
+            'Attach る to the imperative form (命令形) of godan verbs.\n' +
             'する becomes できる, くる becomes こ(ら)れる',
             i18n: [
                 {
                     language: 'ja',
-                    name: '可能',
+                    name: '～(ら)れる',
                 },
             ],
             rules: [
@@ -1227,12 +1225,12 @@ export const japaneseTransforms = {
             name: 'potential or passive',
             description: passiveEnglishDescription +
             '3. Indicates a state of being (naturally) capable of doing an action.\n' +
-            'Usage: Attach られる to the irrealis form (mizenkei) of ichidan verbs.\n' +
+            'Usage: Attach られる to the irrealis form (未然形) of ichidan verbs.\n' +
             'する becomes せられる, くる becomes こられる',
             i18n: [
                 {
                     language: 'ja',
-                    name: '受身・自発・可能・尊敬',
+                    name: '～られる',
                 },
             ],
             rules: [
@@ -1252,13 +1250,13 @@ export const japaneseTransforms = {
             '2. Expresses an invitation to the other party.\n' +
             '3. (Used in …ようとする) Indicates being on the verge of initiating an action or transforming a state.\n' +
             '4. Indicates an inference of a matter.\n' +
-            'Usage: Attach よう to the irrealis form (mizenkei) of ichidan verbs.\n' +
-            'Attach う to the irrealis form (mizenkei) of godan verbs after -o euphonic change form.\n' +
+            'Usage: Attach よう to the irrealis form (未然形) of ichidan verbs.\n' +
+            'Attach う to the irrealis form (未然形) of godan verbs after -o euphonic change form.\n' +
             'Attach かろう to the stem of i-adjectives (4th meaning only).',
             i18n: [
                 {
                     language: 'ja',
-                    name: '～う形',
+                    name: '～う・よう',
                     description: '主体の意志を表わす',
                 },
             ],
@@ -1279,7 +1277,7 @@ export const japaneseTransforms = {
                 suffixInflection('こよう', 'くる', [], ['vk']),
                 suffixInflection('来よう', '来る', [], ['vk']),
                 suffixInflection('來よう', '來る', [], ['vk']),
-                suffixInflection('ましょう', 'ます', [], ['-masu']),
+                suffixInflection('ましょう', 'ます', [], ['-ます']),
                 suffixInflection('かろう', 'い', [], ['adj-i']),
             ],
         },
@@ -1290,6 +1288,13 @@ export const japaneseTransforms = {
             '2. Expresses an invitation to the other party.\n' +
             'Usage: Replace final う with っ of volitional form then add か.\n' +
             'For example: 行こうか -> 行こっか.',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '～っか・よっか',
+                    description: '「うか・ようか」の短縮',
+                },
+            ],
             rules: [
                 suffixInflection('よっか', 'る', [], ['v1']),
                 suffixInflection('おっか', 'う', [], ['v5']),
@@ -1307,16 +1312,16 @@ export const japaneseTransforms = {
                 suffixInflection('こよっか', 'くる', [], ['vk']),
                 suffixInflection('来よっか', '来る', [], ['vk']),
                 suffixInflection('來よっか', '來る', [], ['vk']),
-                suffixInflection('ましょっか', 'ます', [], ['-masu']),
+                suffixInflection('ましょっか', 'ます', [], ['-ます']),
             ],
         },
-        '-mai': {
-            name: '-mai',
+        '-まい': {
+            name: '-まい',
             description: 'Negative volitional form of verbs.\n' +
             '1. Expresses speaker\'s assumption that something is likely not true.\n' +
             '2. Expresses speaker\'s will or intention not to do something.\n' +
-            'Usage: Attach まい to the dictionary form (shuushikei) of verbs.\n' +
-            'Attach まい to the irrealis form (mizenkei) of ichidan verbs.\n' +
+            'Usage: Attach まい to the dictionary form (終止形) of verbs.\n' +
+            'Attach まい to the irrealis form (未然形) of ichidan verbs.\n' +
             'する becomes しまい, くる becomes こまい',
             i18n: [
                 {
@@ -1335,7 +1340,7 @@ export const japaneseTransforms = {
                 suffixInflection('こまい', 'くる', [], ['vk']),
                 suffixInflection('来まい', '来る', [], ['vk']),
                 suffixInflection('來まい', '來る', [], ['vk']),
-                suffixInflection('まい', '', [], ['-masu']),
+                suffixInflection('まい', '', [], ['-ます']),
             ],
         },
         'causative-passive': {
@@ -1346,7 +1351,7 @@ export const japaneseTransforms = {
             i18n: [
                 {
                     language: 'ja',
-                    name: '使役受け身形',
+                    name: '～される',
                 },
             ],
             rules: [
@@ -1360,53 +1365,55 @@ export const japaneseTransforms = {
                 suffixInflection('わされる', 'う', ['v1'], ['v5']),
             ],
         },
-        '-teoku': {
-            name: '-teoku',
+        '-おく': {
+            name: '-おく',
             description: 'To do certain things in advance in preparation (or in anticipation) of latter needs.\n' +
-            'Usage: Attach おく to the te-form of verbs.\n' +
-            'Contraction: ておく → とく, でおく → どく',
+            'Usage: Attach おく to the て-form of verbs.\n' +
+            'Attach でおく after ない negative form of verbs.\n' +
+            'Contracts to とく・どく in speech.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '～ておく',
+                    name: '～おく',
                 },
             ],
             rules: [
-                suffixInflection('ておく', 'て', ['v5'], ['-te']),
-                suffixInflection('でおく', 'で', ['v5'], ['-te']),
-                suffixInflection('とく', 'て', ['v5'], ['-te']),
-                suffixInflection('どく', 'で', ['v5'], ['-te']),
+                suffixInflection('ておく', 'て', ['v5'], ['-て']),
+                suffixInflection('でおく', 'で', ['v5'], ['-て']),
+                suffixInflection('とく', 'て', ['v5'], ['-て']),
+                suffixInflection('どく', 'で', ['v5'], ['-て']),
                 suffixInflection('ないでおく', 'ない', ['v5'], ['adj-i']),
                 suffixInflection('ないどく', 'ない', ['v5'], ['adj-i']),
             ],
         },
-        '-teiru': {
-            name: '-teiru',
+        '-いる': {
+            name: '-いる',
             description: '1. Indicates an action continues or progresses to a point in time.\n' +
             '2. Indicates an action is completed and remains as is.\n' +
             '3. Indicates a state or condition that can be taken to be the result of undergoing some change.\n' +
-            'Usage: Attach いる to the te-form of verbs. い can be dropped in speech.\n' +
-            '(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech.',
+            'Usage: Attach いる to the て-form of verbs. い can be dropped in speech.\n' +
+            'Attach でいる after ない negative form of verbs.\n' +
+            '(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech.',
             i18n: [
                 {
                     language: 'ja',
-                    name: '～ている',
+                    name: '～いる',
                 },
             ],
             rules: [
-                suffixInflection('ている', 'て', ['v1'], ['-te']),
-                suffixInflection('ておる', 'て', ['v5'], ['-te']),
-                suffixInflection('てる', 'て', ['v1p'], ['-te']),
-                suffixInflection('でいる', 'で', ['v1'], ['-te']),
-                suffixInflection('でおる', 'で', ['v5'], ['-te']),
-                suffixInflection('でる', 'で', ['v1p'], ['-te']),
-                suffixInflection('とる', 'て', ['v5'], ['-te']),
+                suffixInflection('ている', 'て', ['v1'], ['-て']),
+                suffixInflection('ておる', 'て', ['v5'], ['-て']),
+                suffixInflection('てる', 'て', ['v1p'], ['-て']),
+                suffixInflection('でいる', 'で', ['v1'], ['-て']),
+                suffixInflection('でおる', 'で', ['v5'], ['-て']),
+                suffixInflection('でる', 'で', ['v1p'], ['-て']),
+                suffixInflection('とる', 'て', ['v5'], ['-て']),
                 suffixInflection('ないでいる', 'ない', ['v1'], ['adj-i']),
             ],
         },
-        '-ki': {
-            name: '-ki',
-            description: 'Attributive form (rentaikei) of i-adjectives. An archaic form that remains in modern Japanese.',
+        '-き': {
+            name: '-き',
+            description: 'Attributive form (連体形) of i-adjectives. An archaic form that remains in modern Japanese.',
             i18n: [
                 {
                     language: 'ja',
@@ -1418,8 +1425,8 @@ export const japaneseTransforms = {
                 suffixInflection('き', 'い', [], ['adj-i']),
             ],
         },
-        '-ge': {
-            name: '-ge',
+        '-げ': {
+            name: '-げ',
             description: 'Describes a person\'s appearance. Shows feelings of the person.\n' +
             'Usage: Attach げ or 気 to the stem of i-adjectives',
             i18n: [
@@ -1434,8 +1441,8 @@ export const japaneseTransforms = {
                 suffixInflection('気', 'い', [], ['adj-i']),
             ],
         },
-        '-garu': {
-            name: '-garu',
+        '-がる': {
+            name: '-がる',
             description: '1. Shows subject’s feelings contrast with what is thought/known about them.\n' +
             '2. Indicates subject\'s behavior (stands out).\n' +
             'Usage: Attach がる to the stem of i-adjectives. It itself conjugates as a godan verb.',
@@ -1450,8 +1457,8 @@ export const japaneseTransforms = {
                 suffixInflection('がる', 'い', ['v5'], ['adj-i']),
             ],
         },
-        '-e': {
-            name: '-e',
+        '-え': {
+            name: '-え',
             description: 'Slang. A sound change of i-adjectives.\n' +
             'ai：やばい → やべぇ\n' +
             'ui：さむい → さみぃ/さめぇ\n' +
@@ -1460,7 +1467,6 @@ export const japaneseTransforms = {
                 {
                     language: 'ja',
                     name: '～え',
-                    description: '方言。例、「ない→ねえ」',
                 },
             ],
             rules: [
@@ -1508,91 +1514,120 @@ export const japaneseTransforms = {
                 suffixInflection('てぇ', 'たい', [], ['adj-i']),
             ],
         },
-        'slang': {
-            name: 'slang',
-            rules: [
-                suffixInflection('てぇてぇ', 'とうとい', [], ['adj-i']),
-                suffixInflection('てぇてぇ', '尊い', [], ['adj-i']),
-                suffixInflection('おなしゃす', 'おねがいします', [], ['v5']),
-                suffixInflection('おなしゃす', 'お願いします', [], ['v5']),
-                suffixInflection('あざす', 'ありがとうございます', [], ['v5']),
-                suffixInflection('さーせん', 'すみません', [], ['v5']),
-                suffixInflection('神ってる', '神がかっている', [], ['v1p']),
-                suffixInflection('じわる', 'じわじわ来る', [], ['vk']),
-                suffixInflection('おさしみ', 'おやすみ', [], []),
-                suffixInflection('おやさい', 'おやすみ', [], []),
-
-            ],
-        },
         'n-slang': {
             name: 'n-slang',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '～んな',
+                },
+            ],
             description: 'Slang sound change of r-column syllables to n (when before an n-sound, usually の or な)',
             rules: [
-                suffixInflection('んな', 'るな', [], ['-na']),
-                suffixInflection('んなさい', 'りなさい', [], ['-nasai']),
+                suffixInflection('んなさい', 'りなさい', [], ['-なさい']),
                 suffixInflection('らんない', 'られない', ['adj-i'], ['adj-i']),
                 suffixInflection('んない', 'らない', ['adj-i'], ['adj-i']),
-                suffixInflection('んなきゃ', 'らなきゃ', [], ['-ya']),
-                suffixInflection('んなきゃ', 'れなきゃ', [], ['-ya']),
+                suffixInflection('んなきゃ', 'らなきゃ', [], ['-ゃ']),
+                suffixInflection('んなきゃ', 'れなきゃ', [], ['-ゃ']),
+            ],
+        },
+        'imperative negative slang': {
+            name: 'imperative negative slang',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '～んな',
+                },
+            ],
+            rules: [
+                suffixInflection('んな', 'る', [], ['v']),
             ],
         },
         'kansai-ben negative': {
             name: 'kansai-ben',
             description: 'Negative form of kansai-ben verbs',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～ない (関西弁)',
+                },
+            ],
             rules: [
                 suffixInflection('へん', 'ない', [], ['adj-i']),
                 suffixInflection('ひん', 'ない', [], ['adj-i']),
                 suffixInflection('せえへん', 'しない', [], ['adj-i']),
-                suffixInflection('へんかった', 'なかった', ['past'], ['past']),
-                suffixInflection('ひんかった', 'なかった', ['past'], ['past']),
+                suffixInflection('へんかった', 'なかった', ['-た'], ['-た']),
+                suffixInflection('ひんかった', 'なかった', ['-た'], ['-た']),
                 suffixInflection('うてへん', 'ってない', [], ['adj-i']),
             ],
         },
-        'kansai-ben -te': {
+        'kansai-ben -て': {
             name: 'kansai-ben',
-            description: '-te form of kansai-ben verbs',
+            description: '-て form of kansai-ben verbs',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～て (関西弁)',
+                },
+            ],
             rules: [
-                suffixInflection('うて', 'って', ['-te'], ['-te']),
-                suffixInflection('おうて', 'あって', ['-te'], ['-te']),
-                suffixInflection('こうて', 'かって', ['-te'], ['-te']),
-                suffixInflection('ごうて', 'がって', ['-te'], ['-te']),
-                suffixInflection('そうて', 'さって', ['-te'], ['-te']),
-                suffixInflection('ぞうて', 'ざって', ['-te'], ['-te']),
-                suffixInflection('とうて', 'たって', ['-te'], ['-te']),
-                suffixInflection('どうて', 'だって', ['-te'], ['-te']),
-                suffixInflection('のうて', 'なって', ['-te'], ['-te']),
-                suffixInflection('ほうて', 'はって', ['-te'], ['-te']),
-                suffixInflection('ぼうて', 'ばって', ['-te'], ['-te']),
-                suffixInflection('もうて', 'まって', ['-te'], ['-te']),
-                suffixInflection('ろうて', 'らって', ['-te'], ['-te']),
-                suffixInflection('ようて', 'やって', ['-te'], ['-te']),
-                suffixInflection('ゆうて', 'いって', ['-te'], ['-te']),
+                suffixInflection('うて', 'って', ['-て'], ['-て']),
+                suffixInflection('おうて', 'あって', ['-て'], ['-て']),
+                suffixInflection('こうて', 'かって', ['-て'], ['-て']),
+                suffixInflection('ごうて', 'がって', ['-て'], ['-て']),
+                suffixInflection('そうて', 'さって', ['-て'], ['-て']),
+                suffixInflection('ぞうて', 'ざって', ['-て'], ['-て']),
+                suffixInflection('とうて', 'たって', ['-て'], ['-て']),
+                suffixInflection('どうて', 'だって', ['-て'], ['-て']),
+                suffixInflection('のうて', 'なって', ['-て'], ['-て']),
+                suffixInflection('ほうて', 'はって', ['-て'], ['-て']),
+                suffixInflection('ぼうて', 'ばって', ['-て'], ['-て']),
+                suffixInflection('もうて', 'まって', ['-て'], ['-て']),
+                suffixInflection('ろうて', 'らって', ['-て'], ['-て']),
+                suffixInflection('ようて', 'やって', ['-て'], ['-て']),
+                suffixInflection('ゆうて', 'いって', ['-て'], ['-て']),
             ],
         },
-        'kansai-ben past': {
+        'kansai-ben -た': {
             name: 'kansai-ben',
-            description: 'past form of kansai-ben terms',
+            description: '-た form of kansai-ben terms',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～た (関西弁)',
+                },
+            ],
             rules: [
-                suffixInflection('うた', 'った', ['past'], ['past']),
-                suffixInflection('おうた', 'あった', ['past'], ['past']),
-                suffixInflection('こうた', 'かった', ['past'], ['past']),
-                suffixInflection('ごうた', 'がった', ['past'], ['past']),
-                suffixInflection('そうた', 'さった', ['past'], ['past']),
-                suffixInflection('ぞうた', 'ざった', ['past'], ['past']),
-                suffixInflection('とうた', 'たった', ['past'], ['past']),
-                suffixInflection('どうた', 'だった', ['past'], ['past']),
-                suffixInflection('のうた', 'なった', ['past'], ['past']),
-                suffixInflection('ほうた', 'はった', ['past'], ['past']),
-                suffixInflection('ぼうた', 'ばった', ['past'], ['past']),
-                suffixInflection('もうた', 'まった', ['past'], ['past']),
-                suffixInflection('ろうた', 'らった', ['past'], ['past']),
-                suffixInflection('ようた', 'やった', ['past'], ['past']),
-                suffixInflection('ゆうた', 'いった', ['past'], ['past']),
+                suffixInflection('うた', 'った', ['-た'], ['-た']),
+                suffixInflection('おうた', 'あった', ['-た'], ['-た']),
+                suffixInflection('こうた', 'かった', ['-た'], ['-た']),
+                suffixInflection('ごうた', 'がった', ['-た'], ['-た']),
+                suffixInflection('そうた', 'さった', ['-た'], ['-た']),
+                suffixInflection('ぞうた', 'ざった', ['-た'], ['-た']),
+                suffixInflection('とうた', 'たった', ['-た'], ['-た']),
+                suffixInflection('どうた', 'だった', ['-た'], ['-た']),
+                suffixInflection('のうた', 'なった', ['-た'], ['-た']),
+                suffixInflection('ほうた', 'はった', ['-た'], ['-た']),
+                suffixInflection('ぼうた', 'ばった', ['-た'], ['-た']),
+                suffixInflection('もうた', 'まった', ['-た'], ['-た']),
+                suffixInflection('ろうた', 'らった', ['-た'], ['-た']),
+                suffixInflection('ようた', 'やった', ['-た'], ['-た']),
+                suffixInflection('ゆうた', 'いった', ['-た'], ['-た']),
             ],
         },
-        'kansai-ben -tara': {
+        'kansai-ben -たら': {
             name: 'kansai-ben',
-            description: '-tara form of kansai-ben terms',
+            description: '-たら form of kansai-ben terms',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～たら (関西弁)',
+                },
+            ],
             rules: [
                 suffixInflection('うたら', 'ったら', [], []),
                 suffixInflection('おうたら', 'あったら', [], []),
@@ -1611,9 +1646,16 @@ export const japaneseTransforms = {
                 suffixInflection('ゆうたら', 'いったら', [], []),
             ],
         },
-        'kansai-ben -tari': {
+        'kansai-ben -たり': {
             name: 'kansai-ben',
-            description: '-tari form of kansai-ben terms',
+            description: '-たり form of kansai-ben terms',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～たり (関西弁)',
+                },
+            ],
             rules: [
                 suffixInflection('うたり', 'ったり', [], []),
                 suffixInflection('おうたり', 'あったり', [], []),
@@ -1632,43 +1674,64 @@ export const japaneseTransforms = {
                 suffixInflection('ゆうたり', 'いったり', [], []),
             ],
         },
-        'kansai-ben -ku': {
+        'kansai-ben -く': {
             name: 'kansai-ben',
-            description: '-ku stem of kansai-ben adjectives',
+            description: '-く stem of kansai-ben adjectives',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '連用形 (関西弁)',
+                },
+            ],
             rules: [
-                suffixInflection('う', 'く', [], ['adv']),
-                suffixInflection('こう', 'かく', [], ['adv']),
-                suffixInflection('ごう', 'がく', [], ['adv']),
-                suffixInflection('そう', 'さく', [], ['adv']),
-                suffixInflection('とう', 'たく', [], ['adv']),
-                suffixInflection('のう', 'なく', [], ['adv']),
-                suffixInflection('ぼう', 'ばく', [], ['adv']),
-                suffixInflection('もう', 'まく', [], ['adv']),
-                suffixInflection('ろう', 'らく', [], ['adv']),
-                suffixInflection('よう', 'よく', [], ['adv']),
-                suffixInflection('しゅう', 'しく', [], ['adv']),
+                suffixInflection('う', 'く', [], ['-く']),
+                suffixInflection('こう', 'かく', [], ['-く']),
+                suffixInflection('ごう', 'がく', [], ['-く']),
+                suffixInflection('そう', 'さく', [], ['-く']),
+                suffixInflection('とう', 'たく', [], ['-く']),
+                suffixInflection('のう', 'なく', [], ['-く']),
+                suffixInflection('ぼう', 'ばく', [], ['-く']),
+                suffixInflection('もう', 'まく', [], ['-く']),
+                suffixInflection('ろう', 'らく', [], ['-く']),
+                suffixInflection('よう', 'よく', [], ['-く']),
+                suffixInflection('しゅう', 'しく', [], ['-く']),
             ],
         },
-        'kansai-ben adjective -te': {
+        'kansai-ben adjective -て': {
             name: 'kansai-ben',
-            description: '-te form of kansai-ben adjectives',
+            description: '-て form of kansai-ben adjectives',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～て (関西弁)',
+                },
+            ],
             rules: [
-                suffixInflection('うて', 'くて', ['-te'], ['-te']),
-                suffixInflection('こうて', 'かくて', ['-te'], ['-te']),
-                suffixInflection('ごうて', 'がくて', ['-te'], ['-te']),
-                suffixInflection('そうて', 'さくて', ['-te'], ['-te']),
-                suffixInflection('とうて', 'たくて', ['-te'], ['-te']),
-                suffixInflection('のうて', 'なくて', ['-te'], ['-te']),
-                suffixInflection('ぼうて', 'ばくて', ['-te'], ['-te']),
-                suffixInflection('もうて', 'まくて', ['-te'], ['-te']),
-                suffixInflection('ろうて', 'らくて', ['-te'], ['-te']),
-                suffixInflection('ようて', 'よくて', ['-te'], ['-te']),
-                suffixInflection('しゅうて', 'しくて', ['-te'], ['-te']),
+                suffixInflection('うて', 'くて', ['-て'], ['-て']),
+                suffixInflection('こうて', 'かくて', ['-て'], ['-て']),
+                suffixInflection('ごうて', 'がくて', ['-て'], ['-て']),
+                suffixInflection('そうて', 'さくて', ['-て'], ['-て']),
+                suffixInflection('とうて', 'たくて', ['-て'], ['-て']),
+                suffixInflection('のうて', 'なくて', ['-て'], ['-て']),
+                suffixInflection('ぼうて', 'ばくて', ['-て'], ['-て']),
+                suffixInflection('もうて', 'まくて', ['-て'], ['-て']),
+                suffixInflection('ろうて', 'らくて', ['-て'], ['-て']),
+                suffixInflection('ようて', 'よくて', ['-て'], ['-て']),
+                suffixInflection('しゅうて', 'しくて', ['-て'], ['-て']),
             ],
         },
         'kansai-ben adjective negative': {
             name: 'kansai-ben',
             description: 'Negative form of kansai-ben adjectives',
+            i18n: [
+                {
+                    language: 'ja',
+                    name: '関西弁',
+                    description: '～ない (関西弁)',
+                },
+            ],
             rules: [
                 suffixInflection('うない', 'くない', ['adj-i'], ['adj-i']),
                 suffixInflection('こうない', 'かくない', ['adj-i'], ['adj-i']),
diff --git a/test/data/anki-note-builder-test-results.json b/test/data/anki-note-builder-test-results.json
index a75cf923db..428b878a90 100644
--- a/test/data/anki-note-builder-test-results.json
+++ b/test/data/anki-note-builder-test-results.json
@@ -2047,7 +2047,7 @@
         "cloze-body-kana": "うちこんでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « -teiru « -masu « negative « -ta",
+        "conjugation": "-て « -いる « -ます « negative « -た",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -2089,7 +2089,7 @@
         "cloze-body-kana": "ぶちこんでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « -teiru « -masu « negative « -ta",
+        "conjugation": "-て « -いる « -ます « negative « -た",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -2131,7 +2131,7 @@
         "cloze-body-kana": "うちこんでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « -teiru « -masu « negative « -ta",
+        "conjugation": "-て « -いる « -ます « negative « -た",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -2173,7 +2173,7 @@
         "cloze-body-kana": "ぶちこんでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « -teiru « -masu « negative « -ta",
+        "conjugation": "-て « -いる « -ます « negative « -た",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -3416,7 +3416,7 @@
         "cloze-body-kana": "testました",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-masu « -ta",
+        "conjugation": "-ます « -た",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -3881,7 +3881,7 @@
         "cloze-body-kana": "のたもうた",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "<ul><li>-ta</li><li>-ta « kansai-ben</li><li>past</li></ul>",
+        "conjugation": "<ul><li>-た</li><li>-た « kansai-ben</li><li>past</li></ul>",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
@@ -4383,7 +4383,7 @@
         "cloze-body-kana": "すっっごーーい",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "<ul><li>-ku « kansai-ben</li></ul>",
+        "conjugation": "<ul><li>-く « kansai-ben</li></ul>",
         "dictionary": "Test Dictionary 2",
         "dictionary-alias": "termsDictAlias",
         "document-title": "title",
diff --git a/test/data/translator-test-results-note-data1.json b/test/data/translator-test-results-note-data1.json
index e8eb7f8da1..e43042a0a8 100644
--- a/test/data/translator-test-results-note-data1.json
+++ b/test/data/translator-test-results-note-data1.json
@@ -4789,7 +4789,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -5123,7 +5123,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -5457,7 +5457,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -5791,7 +5791,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -10184,7 +10184,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -10518,7 +10518,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -11737,7 +11737,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -12071,7 +12071,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -13520,7 +13520,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -13889,7 +13889,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -15747,7 +15747,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -17028,24 +17028,24 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-te",
-                  "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                  "name": "-て",
+                  "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
                 },
                 {
-                  "name": "-teiru",
-                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                  "name": "-いる",
+                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
                 },
                 {
-                  "name": "-masu",
-                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                  "name": "-ます",
+                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
                 },
                 {
                   "name": "negative",
-                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
                 },
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             }
@@ -17489,24 +17489,24 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-te",
-                  "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                  "name": "-て",
+                  "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
                 },
                 {
-                  "name": "-teiru",
-                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                  "name": "-いる",
+                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
                 },
                 {
-                  "name": "-masu",
-                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                  "name": "-ます",
+                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
                 },
                 {
                   "name": "negative",
-                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
                 },
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             }
@@ -17950,24 +17950,24 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-te",
-                  "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                  "name": "-て",
+                  "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
                 },
                 {
-                  "name": "-teiru",
-                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                  "name": "-いる",
+                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
                 },
                 {
-                  "name": "-masu",
-                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                  "name": "-ます",
+                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
                 },
                 {
                   "name": "negative",
-                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
                 },
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             }
@@ -18411,24 +18411,24 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-te",
-                  "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                  "name": "-て",
+                  "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
                 },
                 {
-                  "name": "-teiru",
-                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                  "name": "-いる",
+                  "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
                 },
                 {
-                  "name": "-masu",
-                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                  "name": "-ます",
+                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
                 },
                 {
                   "name": "negative",
-                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                  "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
                 },
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             }
@@ -18873,7 +18873,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -19207,7 +19207,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -19541,7 +19541,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -19875,7 +19875,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -22645,7 +22645,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -22979,7 +22979,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -23313,7 +23313,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -23647,7 +23647,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -26417,7 +26417,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -26751,7 +26751,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -27085,7 +27085,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -27419,7 +27419,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -28429,7 +28429,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -28759,12 +28759,12 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-masu",
-                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                  "name": "-ます",
+                  "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
                 },
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             }
@@ -29746,7 +29746,7 @@
               "inflectionRules": [
                 {
                   "name": "continuative",
-                  "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                  "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
                 }
               ]
             }
@@ -31875,8 +31875,8 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 }
               ]
             },
@@ -31884,12 +31884,12 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-ta",
-                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                  "name": "-た",
+                  "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
                 },
                 {
                   "name": "kansai-ben",
-                  "description": "past form of kansai-ben terms"
+                  "description": "-た form of kansai-ben terms"
                 }
               ]
             },
@@ -34506,12 +34506,12 @@
               "source": "algorithm",
               "inflectionRules": [
                 {
-                  "name": "-ku",
+                  "name": "-く",
                   "description": "Adverbial form of i-adjectives.\n"
                 },
                 {
                   "name": "kansai-ben",
-                  "description": "-ku stem of kansai-ben adjectives"
+                  "description": "-く stem of kansai-ben adjectives"
                 }
               ]
             }
diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json
index 88f94b8f0f..1cd5b4ba9d 100644
--- a/test/data/translator-test-results.json
+++ b/test/data/translator-test-results.json
@@ -2614,7 +2614,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -2800,7 +2800,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -2986,7 +2986,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -3172,7 +3172,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -5575,7 +5575,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -5761,7 +5761,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -6365,7 +6365,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -6551,7 +6551,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -7144,7 +7144,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -7216,7 +7216,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -7288,7 +7288,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -7360,7 +7360,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -8082,7 +8082,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -8317,7 +8317,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -9413,7 +9413,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -10229,24 +10229,24 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-te",
-                "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                "name": "-て",
+                "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
               },
               {
-                "name": "-teiru",
-                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                "name": "-いる",
+                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
               },
               {
-                "name": "-masu",
-                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                "name": "-ます",
+                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
               },
               {
                 "name": "negative",
-                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
               },
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           }
@@ -10456,24 +10456,24 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-te",
-                "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                "name": "-て",
+                "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
               },
               {
-                "name": "-teiru",
-                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                "name": "-いる",
+                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
               },
               {
-                "name": "-masu",
-                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                "name": "-ます",
+                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
               },
               {
                 "name": "negative",
-                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
               },
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           }
@@ -10683,24 +10683,24 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-te",
-                "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                "name": "-て",
+                "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
               },
               {
-                "name": "-teiru",
-                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                "name": "-いる",
+                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
               },
               {
-                "name": "-masu",
-                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                "name": "-ます",
+                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
               },
               {
                 "name": "negative",
-                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
               },
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           }
@@ -10910,24 +10910,24 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-te",
-                "description": "te-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (renyoukei) of verbs after euphonic change form, くて to the stem of i-adjectives."
+                "name": "-て",
+                "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives."
               },
               {
-                "name": "-teiru",
-                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the te-form of verbs. い can be dropped in speech.\n(Slang) Attach おる to the te-form of verbs. Contracts to とる・でる in speech."
+                "name": "-いる",
+                "description": "1. Indicates an action continues or progresses to a point in time.\n2. Indicates an action is completed and remains as is.\n3. Indicates a state or condition that can be taken to be the result of undergoing some change.\nUsage: Attach いる to the て-form of verbs. い can be dropped in speech.\nAttach でいる after ない negative form of verbs.\n(Slang) Attach おる to the て-form of verbs. Contracts to とる・でる in speech."
               },
               {
-                "name": "-masu",
-                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                "name": "-ます",
+                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
               },
               {
                 "name": "negative",
-                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (mizenkei) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
+                "description": "1. Negative form of verbs.\n2. Expresses a feeling of solicitation to the other party.\nUsage: Attach ない to the irrealis form (未然形) of verbs, くない to the stem of i-adjectives. ない itself conjugates as i-adjective. ます becomes ません."
               },
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           }
@@ -11138,7 +11138,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -11324,7 +11324,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -11510,7 +11510,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -11696,7 +11696,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -13095,7 +13095,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -13283,7 +13283,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -13471,7 +13471,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -13659,7 +13659,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -15062,7 +15062,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -15250,7 +15250,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -15438,7 +15438,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -15626,7 +15626,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -16197,7 +16197,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -16431,12 +16431,12 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-masu",
-                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (renyoukei) of verbs."
+                "name": "-ます",
+                "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs."
               },
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           }
@@ -17036,7 +17036,7 @@
             "inflectionRules": [
               {
                 "name": "continuative",
-                "description": "Used to indicate actions that are (being) carried out.\nRefers to the renyoukei, the part of the verb after conjugating with -masu and dropping masu."
+                "description": "Used to indicate actions that are (being) carried out.\nRefers to 連用形, the part of the verb after conjugating with -ます and dropping ます."
               }
             ]
           }
@@ -18307,8 +18307,8 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               }
             ]
           },
@@ -18316,12 +18316,12 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-ta",
-                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (renyoukei) of verbs after euphonic change form, かった to the stem of i-adjectives."
+                "name": "-た",
+                "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives."
               },
               {
                 "name": "kansai-ben",
-                "description": "past form of kansai-ben terms"
+                "description": "-た form of kansai-ben terms"
               }
             ]
           },
@@ -19909,12 +19909,12 @@
             "source": "algorithm",
             "inflectionRules": [
               {
-                "name": "-ku",
+                "name": "-く",
                 "description": "Adverbial form of i-adjectives.\n"
               },
               {
                 "name": "kansai-ben",
-                "description": "-ku stem of kansai-ben adjectives"
+                "description": "-く stem of kansai-ben adjectives"
               }
             ]
           }
diff --git a/test/language/japanese-transforms.test.js b/test/language/japanese-transforms.test.js
index f4a7a334e4..ab1504f1a7 100644
--- a/test/language/japanese-transforms.test.js
+++ b/test/language/japanese-transforms.test.js
@@ -27,23 +27,23 @@ const tests = [
         valid: true,
         tests: [
             {term: '愛しい', source: '愛しい',                 rule: 'adj-i', reasons: []},
-            {term: '愛しい', source: '愛しそう',               rule: 'adj-i', reasons: ['-sou']},
-            {term: '愛しい', source: '愛しすぎる',             rule: 'adj-i', reasons: ['-sugiru']},
-            {term: '愛しい', source: '愛し過ぎる',             rule: 'adj-i', reasons: ['-sugiru-kanji']},
-            {term: '愛しい', source: '愛しかったら',           rule: 'adj-i', reasons: ['-tara']},
-            {term: '愛しい', source: '愛しかったり',           rule: 'adj-i', reasons: ['-tari']},
-            {term: '愛しい', source: '愛しくて',               rule: 'adj-i', reasons: ['-te']},
-            {term: '愛しい', source: '愛しく',                 rule: 'adj-i', reasons: ['-ku']},
+            {term: '愛しい', source: '愛しそう',               rule: 'adj-i', reasons: ['-そう']},
+            {term: '愛しい', source: '愛しすぎる',             rule: 'adj-i', reasons: ['-すぎる']},
+            {term: '愛しい', source: '愛し過ぎる',             rule: 'adj-i', reasons: ['-過ぎる']},
+            {term: '愛しい', source: '愛しかったら',           rule: 'adj-i', reasons: ['-たら']},
+            {term: '愛しい', source: '愛しかったり',           rule: 'adj-i', reasons: ['-たり']},
+            {term: '愛しい', source: '愛しくて',               rule: 'adj-i', reasons: ['-て']},
+            {term: '愛しい', source: '愛しく',                 rule: 'adj-i', reasons: ['-く']},
             {term: '愛しい', source: '愛しくない',             rule: 'adj-i', reasons: ['negative']},
-            {term: '愛しい', source: '愛しさ',                 rule: 'adj-i', reasons: ['-sa']},
-            {term: '愛しい', source: '愛しかった',             rule: 'adj-i', reasons: ['-ta']},
-            {term: '愛しい', source: '愛しくありません',      rule: 'adj-i', reasons: ['-masu', 'negative']},
-            {term: '愛しい', source: '愛しくありませんでした', rule: 'adj-i', reasons: ['-masu', 'negative', '-ta']},
-            {term: '愛しい', source: '愛しくありませんかった',      rule: 'adj-i', reasons: ['-masu', 'negative', '-ta']},
-            {term: '愛しい', source: '愛しき',                 rule: 'adj-i', reasons: ['-ki']},
-            {term: '愛しい', source: '愛しげ',                 rule: 'adj-i', reasons: ['-ge']},
-            {term: '愛しい', source: '愛し気',                 rule: 'adj-i', reasons: ['-ge']},
-            {term: '愛しい', source: '愛しがる',                 rule: 'adj-i', reasons: ['-garu']},
+            {term: '愛しい', source: '愛しさ',                 rule: 'adj-i', reasons: ['-さ']},
+            {term: '愛しい', source: '愛しかった',             rule: 'adj-i', reasons: ['-た']},
+            {term: '愛しい', source: '愛しくありません',      rule: 'adj-i', reasons: ['-ます', 'negative']},
+            {term: '愛しい', source: '愛しくありませんでした', rule: 'adj-i', reasons: ['-ます', 'negative', '-た']},
+            {term: '愛しい', source: '愛しくありませんかった',      rule: 'adj-i', reasons: ['-ます', 'negative', '-た']},
+            {term: '愛しい', source: '愛しき',                 rule: 'adj-i', reasons: ['-き']},
+            {term: '愛しい', source: '愛しげ',                 rule: 'adj-i', reasons: ['-げ']},
+            {term: '愛しい', source: '愛し気',                 rule: 'adj-i', reasons: ['-げ']},
+            {term: '愛しい', source: '愛しがる',                 rule: 'adj-i', reasons: ['-がる']},
         ],
     },
     {
@@ -51,672 +51,670 @@ const tests = [
         valid: true,
         tests: [
             {term: '食べる', source: '食べる',           rule: 'v1', reasons: []},
-            {term: '食べる', source: '食べます',         rule: 'v1', reasons: ['-masu']},
-            {term: '食べる', source: '食べた',           rule: 'v1', reasons: ['-ta']},
-            {term: '食べる', source: '食べました',       rule: 'v1', reasons: ['-masu', '-ta']},
-            {term: '食べる', source: '食べて',           rule: 'v1', reasons: ['-te']},
+            {term: '食べる', source: '食べます',         rule: 'v1', reasons: ['-ます']},
+            {term: '食べる', source: '食べた',           rule: 'v1', reasons: ['-た']},
+            {term: '食べる', source: '食べました',       rule: 'v1', reasons: ['-ます', '-た']},
+            {term: '食べる', source: '食べて',           rule: 'v1', reasons: ['-て']},
             {term: '食べる', source: '食べられる',       rule: 'v1', reasons: ['potential or passive']},
             {term: '食べる', source: '食べられる',       rule: 'v1', reasons: ['potential or passive']},
             {term: '食べる', source: '食べさせる',       rule: 'v1', reasons: ['causative']},
             {term: '食べる', source: '食べさす',        rule: 'v1', reasons: ['short causative']},
-            {term: '食べる', source: '食べさします',   rule: 'v1', reasons: ['short causative', '-masu']},
+            {term: '食べる', source: '食べさします',   rule: 'v1', reasons: ['short causative', '-ます']},
             {term: '食べる', source: '食べさせられる',   rule: 'v1', reasons: ['causative', 'potential or passive']},
             {term: '食べる', source: '食べろ',           rule: 'v1', reasons: ['imperative']},
             {term: '食べる', source: '食べない',         rule: 'v1', reasons: ['negative']},
-            {term: '食べる', source: '食べません',       rule: 'v1', reasons: ['-masu', 'negative']},
-            {term: '食べる', source: '食べなかった',     rule: 'v1', reasons: ['negative', '-ta']},
-            {term: '食べる', source: '食べませんでした', rule: 'v1', reasons: ['-masu', 'negative', '-ta']},
-            {term: '食べる', source: '食べなくて',       rule: 'v1', reasons: ['negative', '-te']},
+            {term: '食べる', source: '食べません',       rule: 'v1', reasons: ['-ます', 'negative']},
+            {term: '食べる', source: '食べなかった',     rule: 'v1', reasons: ['negative', '-た']},
+            {term: '食べる', source: '食べませんでした', rule: 'v1', reasons: ['-ます', 'negative', '-た']},
+            {term: '食べる', source: '食べなくて',       rule: 'v1', reasons: ['negative', '-て']},
             {term: '食べる', source: '食べられない',     rule: 'v1', reasons: ['potential or passive', 'negative']},
             {term: '食べる', source: '食べられない',     rule: 'v1', reasons: ['potential or passive', 'negative']},
             {term: '食べる', source: '食べさせない',     rule: 'v1', reasons: ['causative', 'negative']},
             {term: '食べる', source: '食べささない',     rule: 'v1', reasons: ['short causative', 'negative']},
             {term: '食べる', source: '食べさせられない', rule: 'v1', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '食べる', source: '食べるな',         rule: 'v1', reasons: ['imperative negative']},
-            {term: '食べる', source: '食べまして',        rule: 'v1', reasons: ['-masu', '-te']},
-
-            {term: '食べる', source: '食べれば',         rule: 'v1', reasons: ['-ba']},
-            {term: '食べる', source: '食べりゃ',         rule: 'v1', reasons: ['-ba', '-ya']},
-            {term: '食べる', source: '食べちゃ',         rule: 'v1', reasons: ['-cha']},
-            {term: '食べる', source: '食べちゃう',       rule: 'v1', reasons: ['-chau']},
-            {term: '食べる', source: '食べちまう',       rule: 'v1', reasons: ['-chimau']},
-            {term: '食べる', source: '食べなさい',       rule: 'v1', reasons: ['-nasai']},
-            {term: '食べる', source: '食べそう',         rule: 'v1', reasons: ['-sou']},
-            {term: '食べる', source: '食べすぎる',       rule: 'v1', reasons: ['-sugiru']},
-            {term: '食べる', source: '食べ過ぎる',       rule: 'v1', reasons: ['-sugiru-kanji']},
-            {term: '食べる', source: '食べたい',         rule: 'v1', reasons: ['-tai']},
-            {term: '食べる', source: '食べたがる',         rule: 'v1', reasons: ['-tai', '-garu']},
-            {term: '食べる', source: '食べたら',         rule: 'v1', reasons: ['-tara']},
-            {term: '食べる', source: '食べたり',         rule: 'v1', reasons: ['-tari']},
-            {term: '食べる', source: '食べず',           rule: 'v1', reasons: ['-zu']},
-            {term: '食べる', source: '食べぬ',           rule: 'v1', reasons: ['-nu']},
-            {term: '食べる', source: '食べん',           rule: 'v1', reasons: ['-n']},
-            {term: '食べる', source: '食べんかった',           rule: 'v1', reasons: ['-n', '-ta']},
-            {term: '食べる', source: '食べんばかり',           rule: 'v1', reasons: ['-nbakari']},
-            {term: '食べる', source: '食べんとする',           rule: 'v1', reasons: ['-ntosuru']},
-            {term: '食べる', source: '食べざる',           rule: 'v1', reasons: ['-zaru']},
-            {term: '食べる', source: '食べねば',           rule: 'v1', reasons: ['-neba']},
-            {term: '食べる', source: '食べにゃ',         rule: 'v1', reasons: ['-neba', '-ya']},
+            {term: '食べる', source: '食べまして',        rule: 'v1', reasons: ['-ます', '-て']},
+
+            {term: '食べる', source: '食べれば',         rule: 'v1', reasons: ['-ば']},
+            {term: '食べる', source: '食べりゃ',         rule: 'v1', reasons: ['-ば', '-ゃ']},
+            {term: '食べる', source: '食べちゃ',         rule: 'v1', reasons: ['-ちゃ']},
+            {term: '食べる', source: '食べちゃう',       rule: 'v1', reasons: ['-ちゃう']},
+            {term: '食べる', source: '食べちまう',       rule: 'v1', reasons: ['-ちまう']},
+            {term: '食べる', source: '食べなさい',       rule: 'v1', reasons: ['-なさい']},
+            {term: '食べる', source: '食べそう',         rule: 'v1', reasons: ['-そう']},
+            {term: '食べる', source: '食べすぎる',       rule: 'v1', reasons: ['-すぎる']},
+            {term: '食べる', source: '食べ過ぎる',       rule: 'v1', reasons: ['-過ぎる']},
+            {term: '食べる', source: '食べたい',         rule: 'v1', reasons: ['-たい']},
+            {term: '食べる', source: '食べたがる',         rule: 'v1', reasons: ['-たい', '-がる']},
+            {term: '食べる', source: '食べたら',         rule: 'v1', reasons: ['-たら']},
+            {term: '食べる', source: '食べたり',         rule: 'v1', reasons: ['-たり']},
+            {term: '食べる', source: '食べず',           rule: 'v1', reasons: ['-ず']},
+            {term: '食べる', source: '食べぬ',           rule: 'v1', reasons: ['-ぬ']},
+            {term: '食べる', source: '食べん',           rule: 'v1', reasons: ['-ん']},
+            {term: '食べる', source: '食べんかった',           rule: 'v1', reasons: ['-ん', '-た']},
+            {term: '食べる', source: '食べんばかり',           rule: 'v1', reasons: ['-んばかり']},
+            {term: '食べる', source: '食べんとする',           rule: 'v1', reasons: ['-んとする']},
+            {term: '食べる', source: '食べざる',           rule: 'v1', reasons: ['-ざる']},
+            {term: '食べる', source: '食べねば',           rule: 'v1', reasons: ['-ねば']},
+            {term: '食べる', source: '食べにゃ',         rule: 'v1', reasons: ['-ねば', '-ゃ']},
             {term: '食べる', source: '食べ',             rule: 'v1d', reasons: ['continuative']},
-            {term: '食べる', source: '食べましょう',     rule: 'v1', reasons: ['-masu', 'volitional']},
-            {term: '食べる', source: '食べましょっか',         rule: 'v1', reasons: ['-masu', 'volitional slang']},
+            {term: '食べる', source: '食べましょう',     rule: 'v1', reasons: ['-ます', 'volitional']},
+            {term: '食べる', source: '食べましょっか',         rule: 'v1', reasons: ['-ます', 'volitional slang']},
             {term: '食べる', source: '食べよう',         rule: 'v1', reasons: ['volitional']},
             {term: '食べる', source: '食べよっか',       rule: 'v1', reasons: ['volitional slang']},
-            {term: '食べる', source: '食べるまい',      rule: 'v1', reasons: ['-mai']},
-            {term: '食べる', source: '食べまい',      rule: 'v1', reasons: ['-mai']},
-
-            {term: '食べる', source: '食べておく',       rule: 'v1', reasons: ['-te', '-teoku']},
-            {term: '食べる', source: '食べとく',         rule: 'v1', reasons: ['-te', '-teoku']},
-            {term: '食べる', source: '食べないでおく',  rule: 'v1', reasons: ['negative', '-teoku']},
-            {term: '食べる', source: '食べないどく', rule: 'v1', reasons: ['negative', '-teoku']},
-            {term: '食べる', source: '食べている',       rule: 'v1', reasons: ['-te', '-teiru']},
-            {term: '食べる', source: '食べておる',       rule: 'v1', reasons: ['-te', '-teiru']},
-            {term: '食べる', source: '食べてる',         rule: 'v1', reasons: ['-te', '-teiru']},
-            {term: '食べる', source: '食べとる',         rule: 'v1', reasons: ['-te', '-teiru']},
-            {term: '食べる', source: '食べてしまう',     rule: 'v1', reasons: ['-te', '-shimau']},
+            {term: '食べる', source: '食べるまい',      rule: 'v1', reasons: ['-まい']},
+            {term: '食べる', source: '食べまい',      rule: 'v1', reasons: ['-まい']},
+
+            {term: '食べる', source: '食べておく',       rule: 'v1', reasons: ['-て', '-おく']},
+            {term: '食べる', source: '食べとく',         rule: 'v1', reasons: ['-て', '-おく']},
+            {term: '食べる', source: '食べないでおく',  rule: 'v1', reasons: ['negative', '-おく']},
+            {term: '食べる', source: '食べないどく', rule: 'v1', reasons: ['negative', '-おく']},
+            {term: '食べる', source: '食べている',       rule: 'v1', reasons: ['-て', '-いる']},
+            {term: '食べる', source: '食べておる',       rule: 'v1', reasons: ['-て', '-いる']},
+            {term: '食べる', source: '食べてる',         rule: 'v1', reasons: ['-て', '-いる']},
+            {term: '食べる', source: '食べとる',         rule: 'v1', reasons: ['-て', '-いる']},
+            {term: '食べる', source: '食べてしまう',     rule: 'v1', reasons: ['-て', '-しまう']},
         ],
     },
     {
-        category: '-u verbs',
+        category: '-う verbs',
         valid: true,
         tests: [
             {term: '買う', source: '買う',             rule: 'v5', reasons: []},
-            {term: '買う', source: '買います',         rule: 'v5', reasons: ['-masu']},
-            {term: '買う', source: '買った',           rule: 'v5', reasons: ['-ta']},
-            {term: '買う', source: '買いました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '買う', source: '買って',           rule: 'v5', reasons: ['-te']},
+            {term: '買う', source: '買います',         rule: 'v5', reasons: ['-ます']},
+            {term: '買う', source: '買った',           rule: 'v5', reasons: ['-た']},
+            {term: '買う', source: '買いました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '買う', source: '買って',           rule: 'v5', reasons: ['-て']},
             {term: '買う', source: '買える',           rule: 'v5', reasons: ['potential']},
             {term: '買う', source: '買われる',         rule: 'v5', reasons: ['passive']},
             {term: '買う', source: '買わせる',         rule: 'v5', reasons: ['causative']},
             {term: '買う', source: '買わす',         rule: 'v5', reasons: ['short causative']},
-            {term: '買う', source: '買わします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '買う', source: '買わします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '買う', source: '買わせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '買う', source: '買え',             rule: 'v5', reasons: ['imperative']},
             {term: '買う', source: '買わない',         rule: 'v5', reasons: ['negative']},
-            {term: '買う', source: '買いません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '買う', source: '買わなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '買う', source: '買いませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '買う', source: '買わなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '買う', source: '買いません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '買う', source: '買わなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '買う', source: '買いませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '買う', source: '買わなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '買う', source: '買えない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '買う', source: '買われない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '買う', source: '買わせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '買う', source: '買わさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '買う', source: '買わせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '買う', source: '買うな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '買う', source: '買いまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '買う', source: '買えば',           rule: 'v5', reasons: ['-ba']},
-            {term: '買う', source: '買や',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '買う', source: '買っちゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '買う', source: '買っちゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '買う', source: '買っちまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '買う', source: '買いなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '買う', source: '買いそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '買う', source: '買いすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '買う', source: '買い過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '買う', source: '買いたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '買う', source: '買いたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '買う', source: '買ったら',         rule: 'v5', reasons: ['-tara']},
-            {term: '買う', source: '買ったり',         rule: 'v5', reasons: ['-tari']},
-            {term: '買う', source: '買わず',           rule: 'v5', reasons: ['-zu']},
-            {term: '買う', source: '買わぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '買う', source: '買わん',           rule: 'v5', reasons: ['-n']},
-            {term: '買う', source: '買わんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '買う', source: '買わんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '買う', source: '買わんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '買う', source: '買わざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '買う', source: '買わねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '買う', source: '買わにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '買う', source: '買いまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '買う', source: '買えば',           rule: 'v5', reasons: ['-ば']},
+            {term: '買う', source: '買や',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '買う', source: '買っちゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '買う', source: '買っちゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '買う', source: '買っちまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '買う', source: '買いなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '買う', source: '買いそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '買う', source: '買いすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '買う', source: '買い過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '買う', source: '買いたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '買う', source: '買いたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '買う', source: '買ったら',         rule: 'v5', reasons: ['-たら']},
+            {term: '買う', source: '買ったり',         rule: 'v5', reasons: ['-たり']},
+            {term: '買う', source: '買わず',           rule: 'v5', reasons: ['-ず']},
+            {term: '買う', source: '買わぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '買う', source: '買わん',           rule: 'v5', reasons: ['-ん']},
+            {term: '買う', source: '買わんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '買う', source: '買わんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '買う', source: '買わんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '買う', source: '買わざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '買う', source: '買わねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '買う', source: '買わにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '買う', source: '買い',             rule: 'v5', reasons: ['continuative']},
-            {term: '買う', source: '買いましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '買う', source: '買いましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '買う', source: '買いましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '買う', source: '買いましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '買う', source: '買おう',           rule: 'v5', reasons: ['volitional']},
             {term: '買う', source: '買おっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '買う', source: '買うまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '買う', source: '買うまい',       rule: 'v5', reasons: ['-まい']},
             {term: '買う', source: '買わされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '買う', source: '買っておく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '買う', source: '買っとく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '買う', source: '買わないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '買う', source: '買わないどく', rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '買う', source: '買っている',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '買う', source: '買っておる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '買う', source: '買ってる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '買う', source: '買っとる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '買う', source: '買ってしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '買う', source: '買いますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '買う', source: '買いましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '買う', source: '買いますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '買う', source: '買いませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '買う', source: '買わされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '買う', source: '買っておく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '買う', source: '買っとく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '買う', source: '買わないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '買う', source: '買わないどく', rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '買う', source: '買っている',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '買う', source: '買っておる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '買う', source: '買ってる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '買う', source: '買っとる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '買う', source: '買ってしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '買う', source: '買いますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '買う', source: '買いましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '買う', source: '買いますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '買う', source: '買いませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-ku verbs',
+        category: '-く verbs',
         valid: true,
         tests: [
             {term: '行く', source: '行く',             rule: 'v5', reasons: []},
-            {term: '行く', source: '行きます',         rule: 'v5', reasons: ['-masu']},
-            {term: '行く', source: '行った',           rule: 'v5', reasons: ['-ta']},
-            {term: '行く', source: '行きました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '行く', source: '行って',           rule: 'v5', reasons: ['-te']},
+            {term: '行く', source: '行きます',         rule: 'v5', reasons: ['-ます']},
+            {term: '行く', source: '行った',           rule: 'v5', reasons: ['-た']},
+            {term: '行く', source: '行きました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '行く', source: '行って',           rule: 'v5', reasons: ['-て']},
             {term: '行く', source: '行ける',           rule: 'v5', reasons: ['potential']},
             {term: '行く', source: '行かれる',         rule: 'v5', reasons: ['passive']},
             {term: '行く', source: '行かせる',         rule: 'v5', reasons: ['causative']},
             {term: '行く', source: '行かす',         rule: 'v5', reasons: ['short causative']},
-            {term: '行く', source: '行かします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '行く', source: '行かします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '行く', source: '行かせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '行く', source: '行け',             rule: 'v5', reasons: ['imperative']},
             {term: '行く', source: '行かない',         rule: 'v5', reasons: ['negative']},
-            {term: '行く', source: '行きません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '行く', source: '行かなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '行く', source: '行きませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '行く', source: '行かなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '行く', source: '行きません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '行く', source: '行かなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '行く', source: '行きませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '行く', source: '行かなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '行く', source: '行けない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '行く', source: '行かれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '行く', source: '行かせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '行く', source: '行かさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '行く', source: '行かせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '行く', source: '行くな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '行く', source: '行きまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '行く', source: '行けば',           rule: 'v5', reasons: ['-ba']},
-            {term: '行く', source: '行きゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '行く', source: '行っちゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '行く', source: '行っちゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '行く', source: '行っちまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '行く', source: '行きなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '行く', source: '行きそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '行く', source: '行きすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '行く', source: '行き過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '行く', source: '行きたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '行く', source: '行きたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '行く', source: '行いたら',         rule: 'v5', reasons: ['-tara']},
-            {term: '行く', source: '行いたり',         rule: 'v5', reasons: ['-tari']},
-            {term: '行く', source: '行かず',           rule: 'v5', reasons: ['-zu']},
-            {term: '行く', source: '行かぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '行く', source: '行かん',           rule: 'v5', reasons: ['-n']},
-            {term: '行く', source: '行かんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '行く', source: '行かんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '行く', source: '行かんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '行く', source: '行かざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '行く', source: '行かねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '行く', source: '行かにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '行く', source: '行きまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '行く', source: '行けば',           rule: 'v5', reasons: ['-ば']},
+            {term: '行く', source: '行きゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '行く', source: '行っちゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '行く', source: '行っちゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '行く', source: '行っちまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '行く', source: '行きなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '行く', source: '行きそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '行く', source: '行きすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '行く', source: '行き過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '行く', source: '行きたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '行く', source: '行きたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '行く', source: '行いたら',         rule: 'v5', reasons: ['-たら']},
+            {term: '行く', source: '行いたり',         rule: 'v5', reasons: ['-たり']},
+            {term: '行く', source: '行かず',           rule: 'v5', reasons: ['-ず']},
+            {term: '行く', source: '行かぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '行く', source: '行かん',           rule: 'v5', reasons: ['-ん']},
+            {term: '行く', source: '行かんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '行く', source: '行かんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '行く', source: '行かんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '行く', source: '行かざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '行く', source: '行かねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '行く', source: '行かにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '行く', source: '行き',             rule: 'v5', reasons: ['continuative']},
-            {term: '行く', source: '行きましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '行く', source: '行きましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '行く', source: '行きましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '行く', source: '行きましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '行く', source: '行こう',           rule: 'v5', reasons: ['volitional']},
             {term: '行く', source: '行こっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '行く', source: '行くまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '行く', source: '行くまい',       rule: 'v5', reasons: ['-まい']},
             {term: '行く', source: '行かされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '行く', source: '行っておく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '行く', source: '行いとく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '行く', source: '行かないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '行く', source: '行かないどく', rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '行く', source: '行っている',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '行く', source: '行っておる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '行く', source: '行ってる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '行く', source: '行っとる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '行く', source: '行ってしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '行く', source: '行きますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '行く', source: '行きましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '行く', source: '行きますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '行く', source: '行きませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '行く', source: '行かされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '行く', source: '行っておく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '行く', source: '行いとく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '行く', source: '行かないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '行く', source: '行かないどく', rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '行く', source: '行っている',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '行く', source: '行っておる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '行く', source: '行ってる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '行く', source: '行っとる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '行く', source: '行ってしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '行く', source: '行きますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '行く', source: '行きましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '行く', source: '行きますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '行く', source: '行きませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-gu verbs',
+        category: '-ぐ verbs',
         valid: true,
         tests: [
             {term: '泳ぐ', source: '泳ぐ',             rule: 'v5', reasons: []},
-            {term: '泳ぐ', source: '泳ぎます',         rule: 'v5', reasons: ['-masu']},
-            {term: '泳ぐ', source: '泳いだ',           rule: 'v5', reasons: ['-ta']},
-            {term: '泳ぐ', source: '泳ぎました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '泳ぐ', source: '泳いで',           rule: 'v5', reasons: ['-te']},
+            {term: '泳ぐ', source: '泳ぎます',         rule: 'v5', reasons: ['-ます']},
+            {term: '泳ぐ', source: '泳いだ',           rule: 'v5', reasons: ['-た']},
+            {term: '泳ぐ', source: '泳ぎました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '泳ぐ', source: '泳いで',           rule: 'v5', reasons: ['-て']},
             {term: '泳ぐ', source: '泳げる',           rule: 'v5', reasons: ['potential']},
             {term: '泳ぐ', source: '泳がれる',         rule: 'v5', reasons: ['passive']},
             {term: '泳ぐ', source: '泳がせる',         rule: 'v5', reasons: ['causative']},
             {term: '泳ぐ', source: '泳がす',         rule: 'v5', reasons: ['short causative']},
-            {term: '泳ぐ', source: '泳がします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '泳ぐ', source: '泳がします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '泳ぐ', source: '泳がせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '泳ぐ', source: '泳げ',             rule: 'v5', reasons: ['imperative']},
             {term: '泳ぐ', source: '泳がない',         rule: 'v5', reasons: ['negative']},
-            {term: '泳ぐ', source: '泳ぎません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '泳ぐ', source: '泳がなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '泳ぐ', source: '泳ぎませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '泳ぐ', source: '泳がなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '泳ぐ', source: '泳ぎません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '泳ぐ', source: '泳がなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '泳ぐ', source: '泳ぎませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '泳ぐ', source: '泳がなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '泳ぐ', source: '泳げない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '泳ぐ', source: '泳がれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '泳ぐ', source: '泳がせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '泳ぐ', source: '泳がさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '泳ぐ', source: '泳がせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '泳ぐ', source: '泳ぐな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '泳ぐ', source: '泳ぎまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '泳ぐ', source: '泳げば',           rule: 'v5', reasons: ['-ba']},
-            {term: '泳ぐ', source: '泳ぎゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '泳ぐ', source: '泳いじゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '泳ぐ', source: '泳いじゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '泳ぐ', source: '泳いじまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '泳ぐ', source: '泳ぎなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '泳ぐ', source: '泳ぎそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '泳ぐ', source: '泳ぎすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '泳ぐ', source: '泳ぎ過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '泳ぐ', source: '泳ぎたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '泳ぐ', source: '泳ぎたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '泳ぐ', source: '泳いだら',         rule: 'v5', reasons: ['-tara']},
-            {term: '泳ぐ', source: '泳いだり',         rule: 'v5', reasons: ['-tari']},
-            {term: '泳ぐ', source: '泳がず',           rule: 'v5', reasons: ['-zu']},
-            {term: '泳ぐ', source: '泳がぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '泳ぐ', source: '泳がん',           rule: 'v5', reasons: ['-n']},
-            {term: '泳ぐ', source: '泳がんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '泳ぐ', source: '泳がんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '泳ぐ', source: '泳がんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '泳ぐ', source: '泳がざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '泳ぐ', source: '泳がねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '泳ぐ', source: '泳がにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '泳ぐ', source: '泳ぎまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '泳ぐ', source: '泳げば',           rule: 'v5', reasons: ['-ば']},
+            {term: '泳ぐ', source: '泳ぎゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '泳ぐ', source: '泳いじゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '泳ぐ', source: '泳いじゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '泳ぐ', source: '泳いじまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '泳ぐ', source: '泳ぎなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '泳ぐ', source: '泳ぎそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '泳ぐ', source: '泳ぎすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '泳ぐ', source: '泳ぎ過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '泳ぐ', source: '泳ぎたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '泳ぐ', source: '泳ぎたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '泳ぐ', source: '泳いだら',         rule: 'v5', reasons: ['-たら']},
+            {term: '泳ぐ', source: '泳いだり',         rule: 'v5', reasons: ['-たり']},
+            {term: '泳ぐ', source: '泳がず',           rule: 'v5', reasons: ['-ず']},
+            {term: '泳ぐ', source: '泳がぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '泳ぐ', source: '泳がん',           rule: 'v5', reasons: ['-ん']},
+            {term: '泳ぐ', source: '泳がんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '泳ぐ', source: '泳がんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '泳ぐ', source: '泳がんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '泳ぐ', source: '泳がざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '泳ぐ', source: '泳がねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '泳ぐ', source: '泳がにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '泳ぐ', source: '泳ぎ',             rule: 'v5', reasons: ['continuative']},
-            {term: '泳ぐ', source: '泳ぎましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '泳ぐ', source: '泳ぎましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '泳ぐ', source: '泳ぎましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '泳ぐ', source: '泳ぎましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '泳ぐ', source: '泳ごう',           rule: 'v5', reasons: ['volitional']},
             {term: '泳ぐ', source: '泳ごっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '泳ぐ', source: '泳ぐまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '泳ぐ', source: '泳ぐまい',       rule: 'v5', reasons: ['-まい']},
             {term: '泳ぐ', source: '泳がされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '泳ぐ', source: '泳いでおく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '泳ぐ', source: '泳いどく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '泳ぐ', source: '泳がないでおく',       rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '泳ぐ', source: '泳がないどく',       rule: 'v5', reasons: ['negative', '-teoku']},
-
-            {term: '泳ぐ', source: '泳いでいる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '泳ぐ', source: '泳いでおる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '泳ぐ', source: '泳いでる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '泳ぐ', source: '泳いでしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '泳ぐ', source: '泳ぎますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '泳ぐ', source: '泳ぎましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '泳ぐ', source: '泳ぎますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '泳ぐ', source: '泳ぎませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '泳ぐ', source: '泳がされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '泳ぐ', source: '泳いでおく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '泳ぐ', source: '泳いどく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '泳ぐ', source: '泳がないでおく',       rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '泳ぐ', source: '泳がないどく',       rule: 'v5', reasons: ['negative', '-おく']},
+
+            {term: '泳ぐ', source: '泳いでいる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '泳ぐ', source: '泳いでおる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '泳ぐ', source: '泳いでる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '泳ぐ', source: '泳いでしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '泳ぐ', source: '泳ぎますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '泳ぐ', source: '泳ぎましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '泳ぐ', source: '泳ぎますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '泳ぐ', source: '泳ぎませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-su verbs',
+        category: '-す verbs',
         valid: true,
         tests: [
             {term: '話す', source: '話す',             rule: 'v5', reasons: []},
-            {term: '話す', source: '話します',         rule: 'v5', reasons: ['-masu']},
-            {term: '話す', source: '話した',           rule: 'v5', reasons: ['-ta']},
-            {term: '話す', source: '話しました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '話す', source: '話して',           rule: 'v5', reasons: ['-te']},
+            {term: '話す', source: '話します',         rule: 'v5', reasons: ['-ます']},
+            {term: '話す', source: '話した',           rule: 'v5', reasons: ['-た']},
+            {term: '話す', source: '話しました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '話す', source: '話して',           rule: 'v5', reasons: ['-て']},
             {term: '話す', source: '話せる',           rule: 'v5', reasons: ['potential']},
             {term: '話す', source: '話される',         rule: 'v5', reasons: ['passive']},
             {term: '話す', source: '話させる',         rule: 'v5', reasons: ['causative']},
             {term: '話す', source: '話さす',         rule: 'v5', reasons: ['short causative']},
-            {term: '話す', source: '話さします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '話す', source: '話さします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '話す', source: '話させられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '話す', source: '話せ',             rule: 'v5', reasons: ['imperative']},
             {term: '話す', source: '話さない',         rule: 'v5', reasons: ['negative']},
-            {term: '話す', source: '話しません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '話す', source: '話さなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '話す', source: '話しませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '話す', source: '話さなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '話す', source: '話しません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '話す', source: '話さなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '話す', source: '話しませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '話す', source: '話さなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '話す', source: '話せない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '話す', source: '話されない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '話す', source: '話させない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '話す', source: '話ささない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '話す', source: '話させられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '話す', source: '話すな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '話す', source: '話しまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '話す', source: '話せば',           rule: 'v5', reasons: ['-ba']},
-            {term: '話す', source: '話しゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '話す', source: '話しちゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '話す', source: '話しちゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '話す', source: '話しちまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '話す', source: '話しなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '話す', source: '話しそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '話す', source: '話しすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '話す', source: '話し過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '話す', source: '話したい',         rule: 'v5', reasons: ['-tai']},
-            {term: '話す', source: '話したがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '話す', source: '話したら',         rule: 'v5', reasons: ['-tara']},
-            {term: '話す', source: '話したり',         rule: 'v5', reasons: ['-tari']},
-            {term: '話す', source: '話さず',           rule: 'v5', reasons: ['-zu']},
-            {term: '話す', source: '話さぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '話す', source: '話さん',           rule: 'v5', reasons: ['-n']},
-            {term: '話す', source: '話さんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '話す', source: '話さんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '話す', source: '話さんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '話す', source: '話さざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '話す', source: '話さねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '話す', source: '話さにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '話す', source: '話しまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '話す', source: '話せば',           rule: 'v5', reasons: ['-ば']},
+            {term: '話す', source: '話しゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '話す', source: '話しちゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '話す', source: '話しちゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '話す', source: '話しちまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '話す', source: '話しなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '話す', source: '話しそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '話す', source: '話しすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '話す', source: '話し過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '話す', source: '話したい',         rule: 'v5', reasons: ['-たい']},
+            {term: '話す', source: '話したがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '話す', source: '話したら',         rule: 'v5', reasons: ['-たら']},
+            {term: '話す', source: '話したり',         rule: 'v5', reasons: ['-たり']},
+            {term: '話す', source: '話さず',           rule: 'v5', reasons: ['-ず']},
+            {term: '話す', source: '話さぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '話す', source: '話さん',           rule: 'v5', reasons: ['-ん']},
+            {term: '話す', source: '話さんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '話す', source: '話さんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '話す', source: '話さんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '話す', source: '話さざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '話す', source: '話さねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '話す', source: '話さにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '話す', source: '話し',             rule: 'v5', reasons: ['continuative']},
-            {term: '話す', source: '話しましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '話す', source: '話しましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '話す', source: '話しましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '話す', source: '話しましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '話す', source: '話そう',           rule: 'v5', reasons: ['volitional']},
             {term: '話す', source: '話そっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '話す', source: '話すまい',       rule: 'v5', reasons: ['-mai']},
-
-            {term: '話す', source: '話しておく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '話す', source: '話しとく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '話す', source: '話さないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '話す', source: '話さないどく', rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '話す', source: '話している',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '話す', source: '話しておる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '話す', source: '話してる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '話す', source: '話しとる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '話す', source: '話してしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '増す', source: '増せん',             rule: 'v5', reasons: ['potential', '-n']},
-            {term: '増す', source: '増せんかった',             rule: 'v5', reasons: ['potential', '-n', '-ta']},
-            {term: '増す', source: '増せんばかり',             rule: 'v5', reasons: ['potential', '-nbakari']},
-            {term: '増す', source: '増せんとする',             rule: 'v5', reasons: ['potential', '-ntosuru']},
-
-            {term: '話す', source: '話しますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '話す', source: '話しましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '話す', source: '話しますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '話す', source: '話しませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '話す', source: '話すまい',       rule: 'v5', reasons: ['-まい']},
+
+            {term: '話す', source: '話しておく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '話す', source: '話しとく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '話す', source: '話さないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '話す', source: '話さないどく', rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '話す', source: '話している',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '話す', source: '話しておる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '話す', source: '話してる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '話す', source: '話しとる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '話す', source: '話してしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '増す', source: '増せん',             rule: 'v5', reasons: ['potential', '-ん']},
+            {term: '増す', source: '増せんかった',             rule: 'v5', reasons: ['potential', '-ん', '-た']},
+            {term: '増す', source: '増せんばかり',             rule: 'v5', reasons: ['potential', '-んばかり']},
+            {term: '増す', source: '増せんとする',             rule: 'v5', reasons: ['potential', '-んとする']},
+
+            {term: '話す', source: '話しますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '話す', source: '話しましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '話す', source: '話しますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '話す', source: '話しませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-tsu verbs',
+        category: '-つ verbs',
         valid: true,
         tests: [
             {term: '待つ', source: '待つ',             rule: 'v5', reasons: []},
-            {term: '待つ', source: '待ちます',         rule: 'v5', reasons: ['-masu']},
-            {term: '待つ', source: '待った',           rule: 'v5', reasons: ['-ta']},
-            {term: '待つ', source: '待ちました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '待つ', source: '待って',           rule: 'v5', reasons: ['-te']},
+            {term: '待つ', source: '待ちます',         rule: 'v5', reasons: ['-ます']},
+            {term: '待つ', source: '待った',           rule: 'v5', reasons: ['-た']},
+            {term: '待つ', source: '待ちました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '待つ', source: '待って',           rule: 'v5', reasons: ['-て']},
             {term: '待つ', source: '待てる',           rule: 'v5', reasons: ['potential']},
             {term: '待つ', source: '待たれる',         rule: 'v5', reasons: ['passive']},
             {term: '待つ', source: '待たせる',         rule: 'v5', reasons: ['causative']},
             {term: '待つ', source: '待たす',         rule: 'v5', reasons: ['short causative']},
-            {term: '待つ', source: '待たします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '待つ', source: '待たします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '待つ', source: '待たせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '待つ', source: '待て',             rule: 'v5', reasons: ['imperative']},
             {term: '待つ', source: '待たない',         rule: 'v5', reasons: ['negative']},
-            {term: '待つ', source: '待ちません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '待つ', source: '待たなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '待つ', source: '待ちませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '待つ', source: '待たなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '待つ', source: '待ちません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '待つ', source: '待たなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '待つ', source: '待ちませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '待つ', source: '待たなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '待つ', source: '待てない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '待つ', source: '待たれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '待つ', source: '待たせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '待つ', source: '待たさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '待つ', source: '待たせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '待つ', source: '待つな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '待つ', source: '待ちまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '待つ', source: '待てば',           rule: 'v5', reasons: ['-ba']},
-            {term: '待つ', source: '待ちゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '待つ', source: '待っちゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '待つ', source: '待っちゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '待つ', source: '待っちまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '待つ', source: '待ちなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '待つ', source: '待ちそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '待つ', source: '待ちすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '待つ', source: '待ち過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '待つ', source: '待ちたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '待つ', source: '待ちたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '待つ', source: '待ったら',         rule: 'v5', reasons: ['-tara']},
-            {term: '待つ', source: '待ったり',         rule: 'v5', reasons: ['-tari']},
-            {term: '待つ', source: '待たず',           rule: 'v5', reasons: ['-zu']},
-            {term: '待つ', source: '待たぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '待つ', source: '待たん',           rule: 'v5', reasons: ['-n']},
-            {term: '待つ', source: '待たんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '待つ', source: '待たんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '待つ', source: '待たんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '待つ', source: '待たざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '待つ', source: '待たねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '待つ', source: '待たにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '待つ', source: '待ちまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '待つ', source: '待てば',           rule: 'v5', reasons: ['-ば']},
+            {term: '待つ', source: '待ちゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '待つ', source: '待っちゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '待つ', source: '待っちゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '待つ', source: '待っちまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '待つ', source: '待ちなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '待つ', source: '待ちそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '待つ', source: '待ちすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '待つ', source: '待ち過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '待つ', source: '待ちたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '待つ', source: '待ちたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '待つ', source: '待ったら',         rule: 'v5', reasons: ['-たら']},
+            {term: '待つ', source: '待ったり',         rule: 'v5', reasons: ['-たり']},
+            {term: '待つ', source: '待たず',           rule: 'v5', reasons: ['-ず']},
+            {term: '待つ', source: '待たぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '待つ', source: '待たん',           rule: 'v5', reasons: ['-ん']},
+            {term: '待つ', source: '待たんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '待つ', source: '待たんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '待つ', source: '待たんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '待つ', source: '待たざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '待つ', source: '待たねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '待つ', source: '待たにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '待つ', source: '待ち',             rule: 'v5', reasons: ['continuative']},
-            {term: '待つ', source: '待ちましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '待つ', source: '待ちましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '待つ', source: '待ちましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '待つ', source: '待ちましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '待つ', source: '待とう',           rule: 'v5', reasons: ['volitional']},
             {term: '待つ', source: '待とっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '待つ', source: '待つまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '待つ', source: '待つまい',       rule: 'v5', reasons: ['-まい']},
             {term: '待つ', source: '待たされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '待つ', source: '待っておく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '待つ', source: '待っとく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '待つ', source: '待たないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '待つ', source: '待たないどく', rule: 'v5', reasons: ['negative', '-teoku']},
-
-            {term: '待つ', source: '待っている',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '待つ', source: '待っておる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '待つ', source: '待ってる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '待つ', source: '待っとる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '待つ', source: '待ってしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '待つ', source: '待ちますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '待つ', source: '待ちましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '待つ', source: '待ちますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '待つ', source: '待ちませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '待つ', source: '待たされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '待つ', source: '待っておく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '待つ', source: '待っとく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '待つ', source: '待たないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '待つ', source: '待たないどく', rule: 'v5', reasons: ['negative', '-おく']},
+
+            {term: '待つ', source: '待っている',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '待つ', source: '待っておる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '待つ', source: '待ってる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '待つ', source: '待っとる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '待つ', source: '待ってしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '待つ', source: '待ちますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '待つ', source: '待ちましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '待つ', source: '待ちますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '待つ', source: '待ちませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-nu verbs',
+        category: '-ぬ verbs',
         valid: true,
         tests: [
             {term: '死ぬ', source: '死ぬ',             rule: 'v5', reasons: []},
-            {term: '死ぬ', source: '死にます',         rule: 'v5', reasons: ['-masu']},
-            {term: '死ぬ', source: '死んだ',           rule: 'v5', reasons: ['-ta']},
-            {term: '死ぬ', source: '死にました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '死ぬ', source: '死んで',           rule: 'v5', reasons: ['-te']},
+            {term: '死ぬ', source: '死にます',         rule: 'v5', reasons: ['-ます']},
+            {term: '死ぬ', source: '死んだ',           rule: 'v5', reasons: ['-た']},
+            {term: '死ぬ', source: '死にました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '死ぬ', source: '死んで',           rule: 'v5', reasons: ['-て']},
             {term: '死ぬ', source: '死ねる',           rule: 'v5', reasons: ['potential']},
             {term: '死ぬ', source: '死なれる',         rule: 'v5', reasons: ['passive']},
             {term: '死ぬ', source: '死なせる',         rule: 'v5', reasons: ['causative']},
             {term: '死ぬ', source: '死なす',         rule: 'v5', reasons: ['short causative']},
-            {term: '死ぬ', source: '死なします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '死ぬ', source: '死なします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '死ぬ', source: '死なせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '死ぬ', source: '死ね',             rule: 'v5', reasons: ['imperative']},
             {term: '死ぬ', source: '死なない',         rule: 'v5', reasons: ['negative']},
-            {term: '死ぬ', source: '死にません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '死ぬ', source: '死ななかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '死ぬ', source: '死にませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '死ぬ', source: '死ななくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '死ぬ', source: '死にません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '死ぬ', source: '死ななかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '死ぬ', source: '死にませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '死ぬ', source: '死ななくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '死ぬ', source: '死ねない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '死ぬ', source: '死なれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '死ぬ', source: '死なせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '死ぬ', source: '死なさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '死ぬ', source: '死なせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '死ぬ', source: '死ぬな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '死ぬ', source: '死にまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '死ぬ', source: '死ねば',           rule: 'v5', reasons: ['-ba']},
-            {term: '死ぬ', source: '死にゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '死ぬ', source: '死んじゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '死ぬ', source: '死んじゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '死ぬ', source: '死んじまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '死ぬ', source: '死になさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '死ぬ', source: '死にそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '死ぬ', source: '死にすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '死ぬ', source: '死に過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '死ぬ', source: '死にたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '死ぬ', source: '死にたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '死ぬ', source: '死んだら',         rule: 'v5', reasons: ['-tara']},
-            {term: '死ぬ', source: '死んだり',         rule: 'v5', reasons: ['-tari']},
-            {term: '死ぬ', source: '死なず',           rule: 'v5', reasons: ['-zu']},
-            {term: '死ぬ', source: '死なぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '死ぬ', source: '死なん',           rule: 'v5', reasons: ['-n']},
-            {term: '死ぬ', source: '死なんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '死ぬ', source: '死なんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '死ぬ', source: '死なんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '死ぬ', source: '死なざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '死ぬ', source: '死なねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '死ぬ', source: '死なにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '死ぬ', source: '死にまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '死ぬ', source: '死ねば',           rule: 'v5', reasons: ['-ば']},
+            {term: '死ぬ', source: '死にゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '死ぬ', source: '死んじゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '死ぬ', source: '死んじゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '死ぬ', source: '死んじまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '死ぬ', source: '死になさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '死ぬ', source: '死にそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '死ぬ', source: '死にすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '死ぬ', source: '死に過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '死ぬ', source: '死にたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '死ぬ', source: '死にたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '死ぬ', source: '死んだら',         rule: 'v5', reasons: ['-たら']},
+            {term: '死ぬ', source: '死んだり',         rule: 'v5', reasons: ['-たり']},
+            {term: '死ぬ', source: '死なず',           rule: 'v5', reasons: ['-ず']},
+            {term: '死ぬ', source: '死なぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '死ぬ', source: '死なん',           rule: 'v5', reasons: ['-ん']},
+            {term: '死ぬ', source: '死なんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '死ぬ', source: '死なんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '死ぬ', source: '死なんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '死ぬ', source: '死なざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '死ぬ', source: '死なねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '死ぬ', source: '死なにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '死ぬ', source: '死に',             rule: 'v5', reasons: ['continuative']},
-            {term: '死ぬ', source: '死にましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '死ぬ', source: '死にましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '死ぬ', source: '死にましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '死ぬ', source: '死にましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '死ぬ', source: '死のう',           rule: 'v5', reasons: ['volitional']},
             {term: '死ぬ', source: '死のっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '死ぬ', source: '死ぬまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '死ぬ', source: '死ぬまい',       rule: 'v5', reasons: ['-まい']},
             {term: '死ぬ', source: '死なされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '死ぬ', source: '死んでおく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '死ぬ', source: '死んどく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '死ぬ', source: '死なないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '死ぬ', source: '死なないどく', rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '死ぬ', source: '死んでいる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '死ぬ', source: '死んでおる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '死ぬ', source: '死んでる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '死ぬ', source: '死んでしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '死ぬ', source: '死にますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '死ぬ', source: '死にましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '死ぬ', source: '死にますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '死ぬ', source: '死にませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '死ぬ', source: '死なされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '死ぬ', source: '死んでおく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '死ぬ', source: '死んどく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '死ぬ', source: '死なないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '死ぬ', source: '死なないどく', rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '死ぬ', source: '死んでいる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '死ぬ', source: '死んでおる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '死ぬ', source: '死んでる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '死ぬ', source: '死んでしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '死ぬ', source: '死にますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '死ぬ', source: '死にましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '死ぬ', source: '死にますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '死ぬ', source: '死にませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-bu verbs',
+        category: '-ぶ verbs',
         valid: true,
         tests: [
             {term: '遊ぶ', source: '遊ぶ',             rule: 'v5', reasons: []},
-            {term: '遊ぶ', source: '遊びます',         rule: 'v5', reasons: ['-masu']},
-            {term: '遊ぶ', source: '遊んだ',           rule: 'v5', reasons: ['-ta']},
-            {term: '遊ぶ', source: '遊びました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '遊ぶ', source: '遊んで',           rule: 'v5', reasons: ['-te']},
+            {term: '遊ぶ', source: '遊びます',         rule: 'v5', reasons: ['-ます']},
+            {term: '遊ぶ', source: '遊んだ',           rule: 'v5', reasons: ['-た']},
+            {term: '遊ぶ', source: '遊びました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '遊ぶ', source: '遊んで',           rule: 'v5', reasons: ['-て']},
             {term: '遊ぶ', source: '遊べる',           rule: 'v5', reasons: ['potential']},
             {term: '遊ぶ', source: '遊ばれる',         rule: 'v5', reasons: ['passive']},
             {term: '遊ぶ', source: '遊ばせる',         rule: 'v5', reasons: ['causative']},
             {term: '遊ぶ', source: '遊ばす',         rule: 'v5', reasons: ['short causative']},
-            {term: '遊ぶ', source: '遊ばします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '遊ぶ', source: '遊ばします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '遊ぶ', source: '遊ばせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '遊ぶ', source: '遊べ',             rule: 'v5', reasons: ['imperative']},
             {term: '遊ぶ', source: '遊ばない',         rule: 'v5', reasons: ['negative']},
-            {term: '遊ぶ', source: '遊びません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '遊ぶ', source: '遊ばなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '遊ぶ', source: '遊びませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '遊ぶ', source: '遊ばなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '遊ぶ', source: '遊びません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '遊ぶ', source: '遊ばなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '遊ぶ', source: '遊びませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '遊ぶ', source: '遊ばなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '遊ぶ', source: '遊べない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '遊ぶ', source: '遊ばれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '遊ぶ', source: '遊ばせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '遊ぶ', source: '遊ばさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '遊ぶ', source: '遊ばせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '遊ぶ', source: '遊ぶな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '遊ぶ', source: '遊びまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '遊ぶ', source: '遊べば',           rule: 'v5', reasons: ['-ba']},
-            {term: '遊ぶ', source: '遊びゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '遊ぶ', source: '遊んじゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '遊ぶ', source: '遊んじゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '遊ぶ', source: '遊んじまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '遊ぶ', source: '遊びなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '遊ぶ', source: '遊びそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '遊ぶ', source: '遊びすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '遊ぶ', source: '遊び過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '遊ぶ', source: '遊びたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '遊ぶ', source: '遊びたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '遊ぶ', source: '遊んだら',         rule: 'v5', reasons: ['-tara']},
-            {term: '遊ぶ', source: '遊んだり',         rule: 'v5', reasons: ['-tari']},
-            {term: '遊ぶ', source: '遊ばず',           rule: 'v5', reasons: ['-zu']},
-            {term: '遊ぶ', source: '遊ばぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '遊ぶ', source: '遊ばん',           rule: 'v5', reasons: ['-n']},
-            {term: '遊ぶ', source: '遊ばんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '遊ぶ', source: '遊ばんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '遊ぶ', source: '遊ばんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '遊ぶ', source: '遊ばざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '遊ぶ', source: '遊ばねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '遊ぶ', source: '遊ばにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '遊ぶ', source: '遊びまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '遊ぶ', source: '遊べば',           rule: 'v5', reasons: ['-ば']},
+            {term: '遊ぶ', source: '遊びゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '遊ぶ', source: '遊んじゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '遊ぶ', source: '遊んじゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '遊ぶ', source: '遊んじまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '遊ぶ', source: '遊びなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '遊ぶ', source: '遊びそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '遊ぶ', source: '遊びすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '遊ぶ', source: '遊び過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '遊ぶ', source: '遊びたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '遊ぶ', source: '遊びたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '遊ぶ', source: '遊んだら',         rule: 'v5', reasons: ['-たら']},
+            {term: '遊ぶ', source: '遊んだり',         rule: 'v5', reasons: ['-たり']},
+            {term: '遊ぶ', source: '遊ばず',           rule: 'v5', reasons: ['-ず']},
+            {term: '遊ぶ', source: '遊ばぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '遊ぶ', source: '遊ばん',           rule: 'v5', reasons: ['-ん']},
+            {term: '遊ぶ', source: '遊ばんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '遊ぶ', source: '遊ばんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '遊ぶ', source: '遊ばんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '遊ぶ', source: '遊ばざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '遊ぶ', source: '遊ばねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '遊ぶ', source: '遊ばにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '遊ぶ', source: '遊び',             rule: 'v5', reasons: ['continuative']},
-            {term: '遊ぶ', source: '遊びましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '遊ぶ', source: '遊びましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '遊ぶ', source: '遊びましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '遊ぶ', source: '遊びましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '遊ぶ', source: '遊ぼう',           rule: 'v5', reasons: ['volitional']},
             {term: '遊ぶ', source: '遊ぼっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '遊ぶ', source: '遊ぶまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '遊ぶ', source: '遊ぶまい',       rule: 'v5', reasons: ['-まい']},
             {term: '遊ぶ', source: '遊ばされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '遊ぶ', source: '遊んでおく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '遊ぶ', source: '遊んどく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '遊ぶ', source: '遊んでおく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '遊ぶ', source: '遊ばないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '遊ぶ', source: '遊んでいる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '遊ぶ', source: '遊んでおる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '遊ぶ', source: '遊んでる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '遊ぶ', source: '遊んでしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '遊ぶ', source: '遊びますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '遊ぶ', source: '遊びましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '遊ぶ', source: '遊びますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '遊ぶ', source: '遊びませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '遊ぶ', source: '遊ばされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '遊ぶ', source: '遊んでおく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '遊ぶ', source: '遊んどく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '遊ぶ', source: '遊んでおく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '遊ぶ', source: '遊ばないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '遊ぶ', source: '遊んでいる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '遊ぶ', source: '遊んでおる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '遊ぶ', source: '遊んでる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '遊ぶ', source: '遊んでしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '遊ぶ', source: '遊びますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '遊ぶ', source: '遊びましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '遊ぶ', source: '遊びますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '遊ぶ', source: '遊びませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-mu verbs',
+        category: '-む verbs',
         valid: true,
         tests: [
             {term: '飲む', source: '飲む',             rule: 'v5', reasons: []},
-            {term: '飲む', source: '飲みます',         rule: 'v5', reasons: ['-masu']},
-            {term: '飲む', source: '飲んだ',           rule: 'v5', reasons: ['-ta']},
-            {term: '飲む', source: '飲みました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '飲む', source: '飲んで',           rule: 'v5', reasons: ['-te']},
+            {term: '飲む', source: '飲みます',         rule: 'v5', reasons: ['-ます']},
+            {term: '飲む', source: '飲んだ',           rule: 'v5', reasons: ['-た']},
+            {term: '飲む', source: '飲みました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '飲む', source: '飲んで',           rule: 'v5', reasons: ['-て']},
             {term: '飲む', source: '飲める',           rule: 'v5', reasons: ['potential']},
             {term: '飲む', source: '飲まれる',         rule: 'v5', reasons: ['passive']},
             {term: '飲む', source: '飲ませる',         rule: 'v5', reasons: ['causative']},
             {term: '飲む', source: '飲ます',         rule: 'v5', reasons: ['short causative']},
-            {term: '飲む', source: '飲まします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '飲む', source: '飲まします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '飲む', source: '飲ませられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '飲む', source: '飲め',             rule: 'v5', reasons: ['imperative']},
             {term: '飲む', source: '飲まない',         rule: 'v5', reasons: ['negative']},
-            {term: '飲む', source: '飲みません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '飲む', source: '飲まなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '飲む', source: '飲みませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '飲む', source: '飲まなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '飲む', source: '飲みません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '飲む', source: '飲まなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '飲む', source: '飲みませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '飲む', source: '飲まなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '飲む', source: '飲めない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '飲む', source: '飲まれない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '飲む', source: '飲ませない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '飲む', source: '飲まさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '飲む', source: '飲ませられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '飲む', source: '飲むな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '飲む', source: '飲みまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '飲む', source: '飲めば',           rule: 'v5', reasons: ['-ba']},
-            {term: '飲む', source: '飲みゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '飲む', source: '飲んじゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '飲む', source: '飲んじゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '飲む', source: '飲んじまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '飲む', source: '飲みなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '飲む', source: '飲みそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '飲む', source: '飲みすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '飲む', source: '飲み過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '飲む', source: '飲みたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '飲む', source: '飲みたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '飲む', source: '飲んだら',         rule: 'v5', reasons: ['-tara']},
-            {term: '飲む', source: '飲んだり',         rule: 'v5', reasons: ['-tari']},
-            {term: '飲む', source: '飲まず',           rule: 'v5', reasons: ['-zu']},
-            {term: '飲む', source: '飲まぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '飲む', source: '飲まん',           rule: 'v5', reasons: ['-n']},
-            {term: '飲む', source: '飲まんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '飲む', source: '飲まんばかり',           rule: 'v5', reasons: ['-nbakari']},
-            {term: '飲む', source: '飲まんとする',           rule: 'v5', reasons: ['-ntosuru']},
-            {term: '飲む', source: '飲まざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '飲む', source: '飲まねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '飲む', source: '飲まにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '飲む', source: '飲みまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '飲む', source: '飲めば',           rule: 'v5', reasons: ['-ば']},
+            {term: '飲む', source: '飲みゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '飲む', source: '飲んじゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '飲む', source: '飲んじゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '飲む', source: '飲んじまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '飲む', source: '飲みなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '飲む', source: '飲みそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '飲む', source: '飲みすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '飲む', source: '飲み過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '飲む', source: '飲みたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '飲む', source: '飲みたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '飲む', source: '飲んだら',         rule: 'v5', reasons: ['-たら']},
+            {term: '飲む', source: '飲んだり',         rule: 'v5', reasons: ['-たり']},
+            {term: '飲む', source: '飲まず',           rule: 'v5', reasons: ['-ず']},
+            {term: '飲む', source: '飲まぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '飲む', source: '飲まん',           rule: 'v5', reasons: ['-ん']},
+            {term: '飲む', source: '飲まんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '飲む', source: '飲まんばかり',           rule: 'v5', reasons: ['-んばかり']},
+            {term: '飲む', source: '飲まんとする',           rule: 'v5', reasons: ['-んとする']},
+            {term: '飲む', source: '飲まざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '飲む', source: '飲まねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '飲む', source: '飲まにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '飲む', source: '飲み',             rule: 'v5', reasons: ['continuative']},
-            {term: '飲む', source: '飲みましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '飲む', source: '飲みましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '飲む', source: '飲みましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '飲む', source: '飲みましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '飲む', source: '飲もう',           rule: 'v5', reasons: ['volitional']},
             {term: '飲む', source: '飲もっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '飲む', source: '飲むまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '飲む', source: '飲むまい',       rule: 'v5', reasons: ['-まい']},
             {term: '飲む', source: '飲まされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '飲む', source: '飲んでおく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '飲む', source: '飲んどく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '飲む', source: '飲まないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '飲む', source: '飲まないどく',  rule: 'v5', reasons: ['negative', '-teoku']},
-
-            {term: '飲む', source: '飲んでいる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '飲む', source: '飲んでおる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '飲む', source: '飲んでる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '飲む', source: '飲んでしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '飲む', source: '飲みますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '飲む', source: '飲みましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '飲む', source: '飲みますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '飲む', source: '飲みませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '飲む', source: '飲まされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '飲む', source: '飲んでおく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '飲む', source: '飲んどく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '飲む', source: '飲まないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '飲む', source: '飲まないどく',  rule: 'v5', reasons: ['negative', '-おく']},
+
+            {term: '飲む', source: '飲んでいる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '飲む', source: '飲んでおる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '飲む', source: '飲んでる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '飲む', source: '飲んでしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '飲む', source: '飲みますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '飲む', source: '飲みましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '飲む', source: '飲みますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '飲む', source: '飲みませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
@@ -724,72 +722,72 @@ const tests = [
         valid: true,
         tests: [
             {term: '作る', source: '作る',             rule: 'v5', reasons: []},
-            {term: '作る', source: '作ります',         rule: 'v5', reasons: ['-masu']},
-            {term: '作る', source: '作った',           rule: 'v5', reasons: ['-ta']},
-            {term: '作る', source: '作りました',       rule: 'v5', reasons: ['-masu', '-ta']},
-            {term: '作る', source: '作って',           rule: 'v5', reasons: ['-te']},
+            {term: '作る', source: '作ります',         rule: 'v5', reasons: ['-ます']},
+            {term: '作る', source: '作った',           rule: 'v5', reasons: ['-た']},
+            {term: '作る', source: '作りました',       rule: 'v5', reasons: ['-ます', '-た']},
+            {term: '作る', source: '作って',           rule: 'v5', reasons: ['-て']},
             {term: '作る', source: '作れる',           rule: 'v5', reasons: ['potential']},
             {term: '作る', source: '作られる',         rule: 'v5', reasons: ['passive']},
             {term: '作る', source: '作らせる',         rule: 'v5', reasons: ['causative']},
             {term: '作る', source: '作らす',         rule: 'v5', reasons: ['short causative']},
-            {term: '作る', source: '作らします',     rule: 'v5', reasons: ['short causative', '-masu']},
+            {term: '作る', source: '作らします',     rule: 'v5', reasons: ['short causative', '-ます']},
             {term: '作る', source: '作らせられる',     rule: 'v5', reasons: ['causative', 'potential or passive']},
             {term: '作る', source: '作れ',             rule: 'v5', reasons: ['imperative']},
             {term: '作る', source: '作らない',         rule: 'v5', reasons: ['negative']},
-            {term: '作る', source: '作りません',       rule: 'v5', reasons: ['-masu', 'negative']},
-            {term: '作る', source: '作らなかった',     rule: 'v5', reasons: ['negative', '-ta']},
-            {term: '作る', source: '作りませんでした', rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
-            {term: '作る', source: '作らなくて',       rule: 'v5', reasons: ['negative', '-te']},
+            {term: '作る', source: '作りません',       rule: 'v5', reasons: ['-ます', 'negative']},
+            {term: '作る', source: '作らなかった',     rule: 'v5', reasons: ['negative', '-た']},
+            {term: '作る', source: '作りませんでした', rule: 'v5', reasons: ['-ます', 'negative', '-た']},
+            {term: '作る', source: '作らなくて',       rule: 'v5', reasons: ['negative', '-て']},
             {term: '作る', source: '作れない',         rule: 'v5', reasons: ['potential', 'negative']},
             {term: '作る', source: '作られない',       rule: 'v5', reasons: ['passive', 'negative']},
             {term: '作る', source: '作らせない',       rule: 'v5', reasons: ['causative', 'negative']},
             {term: '作る', source: '作らさない',       rule: 'v5', reasons: ['short causative', 'negative']},
             {term: '作る', source: '作らせられない',   rule: 'v5', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '作る', source: '作るな',           rule: 'v5', reasons: ['imperative negative']},
-            {term: '作る', source: '作りまして',     rule: 'v5', reasons: ['-masu', '-te']},
-
-            {term: '作る', source: '作れば',           rule: 'v5', reasons: ['-ba']},
-            {term: '作る', source: '作りゃ',           rule: 'v5', reasons: ['-ba', '-ya']},
-            {term: '作る', source: '作っちゃ',       rule: 'v5', reasons: ['-cha']},
-            {term: '作る', source: '作っちゃう',       rule: 'v5', reasons: ['-chau']},
-            {term: '作る', source: '作っちまう',       rule: 'v5', reasons: ['-chimau']},
-            {term: '作る', source: '作りなさい',       rule: 'v5', reasons: ['-nasai']},
-            {term: '作る', source: '作りそう',         rule: 'v5', reasons: ['-sou']},
-            {term: '作る', source: '作りすぎる',       rule: 'v5', reasons: ['-sugiru']},
-            {term: '作る', source: '作り過ぎる',       rule: 'v5', reasons: ['-sugiru-kanji']},
-            {term: '作る', source: '作りたい',         rule: 'v5', reasons: ['-tai']},
-            {term: '作る', source: '作りたがる',         rule: 'v5', reasons: ['-tai', '-garu']},
-            {term: '作る', source: '作ったら',         rule: 'v5', reasons: ['-tara']},
-            {term: '作る', source: '作ったり',         rule: 'v5', reasons: ['-tari']},
-            {term: '作る', source: '作らず',           rule: 'v5', reasons: ['-zu']},
-            {term: '作る', source: '作らぬ',           rule: 'v5', reasons: ['-nu']},
-            {term: '作る', source: '作らん',           rule: 'v5', reasons: ['-n']},
-            {term: '作る', source: '作らんかった',           rule: 'v5', reasons: ['-n', '-ta']},
-            {term: '作る', source: '作らざる',           rule: 'v5', reasons: ['-zaru']},
-            {term: '作る', source: '作らねば',           rule: 'v5', reasons: ['-neba']},
-            {term: '作る', source: '作らにゃ',         rule: 'v5', reasons: ['-neba', '-ya']},
+            {term: '作る', source: '作りまして',     rule: 'v5', reasons: ['-ます', '-て']},
+
+            {term: '作る', source: '作れば',           rule: 'v5', reasons: ['-ば']},
+            {term: '作る', source: '作りゃ',           rule: 'v5', reasons: ['-ば', '-ゃ']},
+            {term: '作る', source: '作っちゃ',       rule: 'v5', reasons: ['-ちゃ']},
+            {term: '作る', source: '作っちゃう',       rule: 'v5', reasons: ['-ちゃう']},
+            {term: '作る', source: '作っちまう',       rule: 'v5', reasons: ['-ちまう']},
+            {term: '作る', source: '作りなさい',       rule: 'v5', reasons: ['-なさい']},
+            {term: '作る', source: '作りそう',         rule: 'v5', reasons: ['-そう']},
+            {term: '作る', source: '作りすぎる',       rule: 'v5', reasons: ['-すぎる']},
+            {term: '作る', source: '作り過ぎる',       rule: 'v5', reasons: ['-過ぎる']},
+            {term: '作る', source: '作りたい',         rule: 'v5', reasons: ['-たい']},
+            {term: '作る', source: '作りたがる',         rule: 'v5', reasons: ['-たい', '-がる']},
+            {term: '作る', source: '作ったら',         rule: 'v5', reasons: ['-たら']},
+            {term: '作る', source: '作ったり',         rule: 'v5', reasons: ['-たり']},
+            {term: '作る', source: '作らず',           rule: 'v5', reasons: ['-ず']},
+            {term: '作る', source: '作らぬ',           rule: 'v5', reasons: ['-ぬ']},
+            {term: '作る', source: '作らん',           rule: 'v5', reasons: ['-ん']},
+            {term: '作る', source: '作らんかった',           rule: 'v5', reasons: ['-ん', '-た']},
+            {term: '作る', source: '作らざる',           rule: 'v5', reasons: ['-ざる']},
+            {term: '作る', source: '作らねば',           rule: 'v5', reasons: ['-ねば']},
+            {term: '作る', source: '作らにゃ',         rule: 'v5', reasons: ['-ねば', '-ゃ']},
             {term: '作る', source: '作り',             rule: 'v5', reasons: ['continuative']},
-            {term: '作る', source: '作りましょう',     rule: 'v5', reasons: ['-masu', 'volitional']},
-            {term: '作る', source: '作りましょっか',     rule: 'v5', reasons: ['-masu', 'volitional slang']},
+            {term: '作る', source: '作りましょう',     rule: 'v5', reasons: ['-ます', 'volitional']},
+            {term: '作る', source: '作りましょっか',     rule: 'v5', reasons: ['-ます', 'volitional slang']},
             {term: '作る', source: '作ろう',           rule: 'v5', reasons: ['volitional']},
             {term: '作る', source: '作ろっか',           rule: 'v5', reasons: ['volitional slang']},
-            {term: '作る', source: '作るまい',       rule: 'v5', reasons: ['-mai']},
+            {term: '作る', source: '作るまい',       rule: 'v5', reasons: ['-まい']},
             {term: '作る', source: '作らされる',       rule: 'v5', reasons: ['causative-passive']},
-
-            {term: '作る', source: '作っておく',       rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '作る', source: '作っとく',         rule: 'v5', reasons: ['-te', '-teoku']},
-            {term: '作る', source: '作らないでおく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '作る', source: '作らないどく',  rule: 'v5', reasons: ['negative', '-teoku']},
-            {term: '作る', source: '作っている',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '作る', source: '作っておる',       rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '作る', source: '作ってる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '作る', source: '作っとる',         rule: 'v5', reasons: ['-te', '-teiru']},
-            {term: '作る', source: '作ってしまう',     rule: 'v5', reasons: ['-te', '-shimau']},
-
-            {term: '作る', source: '作りますまい',     rule: 'v5', reasons: ['-masu', '-mai']},
-            {term: '作る', source: '作りましたら',     rule: 'v5', reasons: ['-masu', '-tara']},
-            {term: '作る', source: '作りますれば',     rule: 'v5', reasons: ['-masu', '-ba']},
-            {term: '作る', source: '作りませんかった',     rule: 'v5', reasons: ['-masu', 'negative', '-ta']},
+            {term: '作る', source: '作らされる',       rule: 'v5', reasons: ['short causative', 'passive']},
+
+            {term: '作る', source: '作っておく',       rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '作る', source: '作っとく',         rule: 'v5', reasons: ['-て', '-おく']},
+            {term: '作る', source: '作らないでおく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '作る', source: '作らないどく',  rule: 'v5', reasons: ['negative', '-おく']},
+            {term: '作る', source: '作っている',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '作る', source: '作っておる',       rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '作る', source: '作ってる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '作る', source: '作っとる',         rule: 'v5', reasons: ['-て', '-いる']},
+            {term: '作る', source: '作ってしまう',     rule: 'v5', reasons: ['-て', '-しまう']},
+
+            {term: '作る', source: '作りますまい',     rule: 'v5', reasons: ['-ます', '-まい']},
+            {term: '作る', source: '作りましたら',     rule: 'v5', reasons: ['-ます', '-たら']},
+            {term: '作る', source: '作りますれば',     rule: 'v5', reasons: ['-ます', '-ば']},
+            {term: '作る', source: '作りませんかった',     rule: 'v5', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
@@ -797,24 +795,24 @@ const tests = [
         valid: true,
         tests: [
             {term: '為る', source: '為る',           rule: 'vs', reasons: []},
-            {term: '為る', source: '為ます',         rule: 'vs', reasons: ['-masu']},
-            {term: '為る', source: '為た',           rule: 'vs', reasons: ['-ta']},
-            {term: '為る', source: '為ました',       rule: 'vs', reasons: ['-masu', '-ta']},
-            {term: '為る', source: '為て',           rule: 'vs', reasons: ['-te']},
+            {term: '為る', source: '為ます',         rule: 'vs', reasons: ['-ます']},
+            {term: '為る', source: '為た',           rule: 'vs', reasons: ['-た']},
+            {term: '為る', source: '為ました',       rule: 'vs', reasons: ['-ます', '-た']},
+            {term: '為る', source: '為て',           rule: 'vs', reasons: ['-て']},
             {term: '為る', source: '為られる',       rule: 'vs', reasons: ['potential or passive']},
             {term: '為る', source: '為れる',         rule: 'vs', reasons: ['passive']},
             {term: '為る', source: '為せる',         rule: 'vs', reasons: ['causative']},
             {term: '為る', source: '為させる',       rule: 'vs', reasons: ['causative']},
             {term: '為る', source: '為す',       rule: 'vs', reasons: ['short causative']},
-            {term: '為る', source: '為します',     rule: 'vs', reasons: ['short causative', '-masu']},
+            {term: '為る', source: '為します',     rule: 'vs', reasons: ['short causative', '-ます']},
             {term: '為る', source: '為せられる',     rule: 'vs', reasons: ['causative', 'potential or passive']},
             {term: '為る', source: '為させられる',   rule: 'vs', reasons: ['causative', 'potential or passive']},
             {term: '為る', source: '為ろ',           rule: 'vs', reasons: ['imperative']},
             {term: '為る', source: '為ない',         rule: 'vs', reasons: ['negative']},
-            {term: '為る', source: '為ません',       rule: 'vs', reasons: ['-masu', 'negative']},
-            {term: '為る', source: '為なかった',     rule: 'vs', reasons: ['negative', '-ta']},
-            {term: '為る', source: '為ませんでした', rule: 'vs', reasons: ['-masu', 'negative', '-ta']},
-            {term: '為る', source: '為なくて',       rule: 'vs', reasons: ['negative', '-te']},
+            {term: '為る', source: '為ません',       rule: 'vs', reasons: ['-ます', 'negative']},
+            {term: '為る', source: '為なかった',     rule: 'vs', reasons: ['negative', '-た']},
+            {term: '為る', source: '為ませんでした', rule: 'vs', reasons: ['-ます', 'negative', '-た']},
+            {term: '為る', source: '為なくて',       rule: 'vs', reasons: ['negative', '-て']},
             {term: '為る', source: '為られない',     rule: 'vs', reasons: ['potential or passive', 'negative']},
             {term: '為る', source: '為れない',       rule: 'vs', reasons: ['passive', 'negative']},
             {term: '為る', source: '為せない',       rule: 'vs', reasons: ['causative', 'negative']},
@@ -822,59 +820,58 @@ const tests = [
             {term: '為る', source: '為さない',       rule: 'vs', reasons: ['short causative', 'negative']},
             {term: '為る', source: '為せられない',   rule: 'vs', reasons: ['causative', 'potential or passive', 'negative']},
             {term: '為る', source: '為させられない', rule: 'vs', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '為る', source: '為るな',         rule: 'vs', reasons: ['imperative negative']},
-            {term: '為る', source: '為まして',     rule: 'vs', reasons: ['-masu', '-te']},
-
-            {term: '為る', source: '為れば',         rule: 'vs', reasons: ['-ba']},
-            {term: '為る', source: '為りゃ',         rule: 'vs', reasons: ['-ba', '-ya']},
-            {term: '為る', source: '為ちゃ',       rule: 'vs', reasons: ['-cha']},
-            {term: '為る', source: '為ちゃう',       rule: 'vs', reasons: ['-chau']},
-            {term: '為る', source: '為ちまう',       rule: 'vs', reasons: ['-chimau']},
-            {term: '為る', source: '為なさい',       rule: 'vs', reasons: ['-nasai']},
-            {term: '為る', source: '為そう',         rule: 'vs', reasons: ['-sou']},
-            {term: '為る', source: '為すぎる',       rule: 'vs', reasons: ['-sugiru']},
-            {term: '為る', source: '為過ぎる',       rule: 'vs', reasons: ['-sugiru-kanji']},
-            {term: '為る', source: '為たい',         rule: 'vs', reasons: ['-tai']},
-            {term: '為る', source: '為たがる',         rule: 'vs', reasons: ['-tai', '-garu']},
-            {term: '為る', source: '為たら',         rule: 'vs', reasons: ['-tara']},
-            {term: '為る', source: '為たり',         rule: 'vs', reasons: ['-tari']},
-            {term: '為る', source: '為ず',           rule: 'vs', reasons: ['-zu']},
-            {term: '為る', source: '為ぬ',           rule: 'vs', reasons: ['-nu']},
-            {term: '為る', source: '為ん',           rule: 'vs', reasons: ['-n']},
-            {term: '為る', source: '為んかった',           rule: 'vs', reasons: ['-n', '-ta']},
-            {term: '為る', source: '為んばかり',           rule: 'vs', reasons: ['-nbakari']},
-            {term: '為る', source: '為んとする',           rule: 'vs', reasons: ['-ntosuru']},
-            {term: '為る', source: '為ざる',           rule: 'vs', reasons: ['-zaru']},
-            {term: '為る', source: '為ねば',           rule: 'vs', reasons: ['-neba']},
-            {term: '為る', source: '為にゃ',         rule: 'vs', reasons: ['-neba', '-ya']},
-
-            {term: '為る', source: '為ましょう',     rule: 'vs', reasons: ['-masu', 'volitional']},
-            {term: '為る', source: '為ましょっか',     rule: 'vs', reasons: ['-masu', 'volitional slang']},
+            {term: '為る', source: '為まして',     rule: 'vs', reasons: ['-ます', '-て']},
+
+            {term: '為る', source: '為れば',         rule: 'vs', reasons: ['-ば']},
+            {term: '為る', source: '為りゃ',         rule: 'vs', reasons: ['-ば', '-ゃ']},
+            {term: '為る', source: '為ちゃ',       rule: 'vs', reasons: ['-ちゃ']},
+            {term: '為る', source: '為ちゃう',       rule: 'vs', reasons: ['-ちゃう']},
+            {term: '為る', source: '為ちまう',       rule: 'vs', reasons: ['-ちまう']},
+            {term: '為る', source: '為なさい',       rule: 'vs', reasons: ['-なさい']},
+            {term: '為る', source: '為そう',         rule: 'vs', reasons: ['-そう']},
+            {term: '為る', source: '為すぎる',       rule: 'vs', reasons: ['-すぎる']},
+            {term: '為る', source: '為過ぎる',       rule: 'vs', reasons: ['-過ぎる']},
+            {term: '為る', source: '為たい',         rule: 'vs', reasons: ['-たい']},
+            {term: '為る', source: '為たがる',         rule: 'vs', reasons: ['-たい', '-がる']},
+            {term: '為る', source: '為たら',         rule: 'vs', reasons: ['-たら']},
+            {term: '為る', source: '為たり',         rule: 'vs', reasons: ['-たり']},
+            {term: '為る', source: '為ず',           rule: 'vs', reasons: ['-ず']},
+            {term: '為る', source: '為ぬ',           rule: 'vs', reasons: ['-ぬ']},
+            {term: '為る', source: '為ん',           rule: 'vs', reasons: ['-ん']},
+            {term: '為る', source: '為んかった',           rule: 'vs', reasons: ['-ん', '-た']},
+            {term: '為る', source: '為んばかり',           rule: 'vs', reasons: ['-んばかり']},
+            {term: '為る', source: '為んとする',           rule: 'vs', reasons: ['-んとする']},
+            {term: '為る', source: '為ざる',           rule: 'vs', reasons: ['-ざる']},
+            {term: '為る', source: '為ねば',           rule: 'vs', reasons: ['-ねば']},
+            {term: '為る', source: '為にゃ',         rule: 'vs', reasons: ['-ねば', '-ゃ']},
+
+            {term: '為る', source: '為ましょう',     rule: 'vs', reasons: ['-ます', 'volitional']},
+            {term: '為る', source: '為ましょっか',     rule: 'vs', reasons: ['-ます', 'volitional slang']},
             {term: '為る', source: '為よう',         rule: 'vs', reasons: ['volitional']},
             {term: '為る', source: '為よっか',         rule: 'vs', reasons: ['volitional slang']},
-            {term: '為る', source: '為るまい',       rule: 'vs', reasons: ['-mai']},
-            {term: '為る', source: '為まい',       rule: 'vs', reasons: ['-mai']},
-
-            {term: '為る', source: '為ておく',       rule: 'vs', reasons: ['-te', '-teoku']},
-            {term: '為る', source: '為とく',         rule: 'vs', reasons: ['-te', '-teoku']},
-            {term: '為る', source: '為ないでおく',  rule: 'vs', reasons: ['negative', '-teoku']},
-            {term: '為る', source: '為ないどく',  rule: 'vs', reasons: ['negative', '-teoku']},
-            {term: '為る', source: '為ている',       rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: '為る', source: '為ておる',       rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: '為る', source: '為てる',         rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: '為る', source: '為とる',         rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: '為る', source: '為てしまう',     rule: 'vs', reasons: ['-te', '-shimau']},
-
-            {term: '為る', source: '為ますまい',     rule: 'vs', reasons: ['-masu', '-mai']},
-            {term: '為る', source: '為ましたら',     rule: 'vs', reasons: ['-masu', '-tara']},
-            {term: '為る', source: '為ますれば',     rule: 'vs', reasons: ['-masu', '-ba']},
-            {term: '為る', source: '為ませんかった',     rule: 'vs', reasons: ['-masu', 'negative', '-ta']},
+            {term: '為る', source: '為るまい',       rule: 'vs', reasons: ['-まい']},
+            {term: '為る', source: '為まい',       rule: 'vs', reasons: ['-まい']},
+
+            {term: '為る', source: '為ておく',       rule: 'vs', reasons: ['-て', '-おく']},
+            {term: '為る', source: '為とく',         rule: 'vs', reasons: ['-て', '-おく']},
+            {term: '為る', source: '為ないでおく',  rule: 'vs', reasons: ['negative', '-おく']},
+            {term: '為る', source: '為ないどく',  rule: 'vs', reasons: ['negative', '-おく']},
+            {term: '為る', source: '為ている',       rule: 'vs', reasons: ['-て', '-いる']},
+            {term: '為る', source: '為ておる',       rule: 'vs', reasons: ['-て', '-いる']},
+            {term: '為る', source: '為てる',         rule: 'vs', reasons: ['-て', '-いる']},
+            {term: '為る', source: '為とる',         rule: 'vs', reasons: ['-て', '-いる']},
+            {term: '為る', source: '為てしまう',     rule: 'vs', reasons: ['-て', '-しまう']},
+
+            {term: '為る', source: '為ますまい',     rule: 'vs', reasons: ['-ます', '-まい']},
+            {term: '為る', source: '為ましたら',     rule: 'vs', reasons: ['-ます', '-たら']},
+            {term: '為る', source: '為ますれば',     rule: 'vs', reasons: ['-ます', '-ば']},
+            {term: '為る', source: '為ませんかった',     rule: 'vs', reasons: ['-ます', 'negative', '-た']},
 
             {term: 'する', source: 'する',           rule: 'vs', reasons: []},
-            {term: 'する', source: 'します',         rule: 'vs', reasons: ['-masu']},
-            {term: 'する', source: 'した',           rule: 'vs', reasons: ['-ta']},
-            {term: 'する', source: 'しました',       rule: 'vs', reasons: ['-masu', '-ta']},
-            {term: 'する', source: 'して',           rule: 'vs', reasons: ['-te']},
+            {term: 'する', source: 'します',         rule: 'vs', reasons: ['-ます']},
+            {term: 'する', source: 'した',           rule: 'vs', reasons: ['-た']},
+            {term: 'する', source: 'しました',       rule: 'vs', reasons: ['-ます', '-た']},
+            {term: 'する', source: 'して',           rule: 'vs', reasons: ['-て']},
             {term: 'する', source: 'できる',         rule: 'vs', reasons: ['potential']},
             {term: 'する', source: '出来る',         rule: 'vs', reasons: ['potential']},
             {term: 'する', source: 'せられる',       rule: 'vs', reasons: ['potential or passive']},
@@ -882,15 +879,15 @@ const tests = [
             {term: 'する', source: 'させる',         rule: 'vs', reasons: ['causative']},
             {term: 'する', source: 'せさせる',       rule: 'vs', reasons: ['causative']},
             {term: 'する', source: 'さす',         rule: 'vs', reasons: ['short causative']},
-            {term: 'する', source: 'さします',     rule: 'vs', reasons: ['short causative', '-masu']},
+            {term: 'する', source: 'さします',     rule: 'vs', reasons: ['short causative', '-ます']},
             {term: 'する', source: 'させられる',     rule: 'vs', reasons: ['causative', 'potential or passive']},
             {term: 'する', source: 'せさせられる',   rule: 'vs', reasons: ['causative', 'potential or passive']},
             {term: 'する', source: 'しろ',           rule: 'vs', reasons: ['imperative']},
             {term: 'する', source: 'しない',         rule: 'vs', reasons: ['negative']},
-            {term: 'する', source: 'しません',       rule: 'vs', reasons: ['-masu', 'negative']},
-            {term: 'する', source: 'しなかった',     rule: 'vs', reasons: ['negative', '-ta']},
-            {term: 'する', source: 'しませんでした', rule: 'vs', reasons: ['-masu', 'negative', '-ta']},
-            {term: 'する', source: 'しなくて',       rule: 'vs', reasons: ['negative', '-te']},
+            {term: 'する', source: 'しません',       rule: 'vs', reasons: ['-ます', 'negative']},
+            {term: 'する', source: 'しなかった',     rule: 'vs', reasons: ['negative', '-た']},
+            {term: 'する', source: 'しませんでした', rule: 'vs', reasons: ['-ます', 'negative', '-た']},
+            {term: 'する', source: 'しなくて',       rule: 'vs', reasons: ['negative', '-て']},
             {term: 'する', source: 'せられない',     rule: 'vs', reasons: ['potential or passive', 'negative']},
             {term: 'する', source: 'されない',       rule: 'vs', reasons: ['passive', 'negative']},
             {term: 'する', source: 'させない',       rule: 'vs', reasons: ['causative', 'negative']},
@@ -898,276 +895,272 @@ const tests = [
             {term: 'する', source: 'ささない',       rule: 'vs', reasons: ['short causative', 'negative']},
             {term: 'する', source: 'させられない',   rule: 'vs', reasons: ['causative', 'potential or passive', 'negative']},
             {term: 'する', source: 'せさせられない', rule: 'vs', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: 'する', source: 'するな',         rule: 'vs', reasons: ['imperative negative']},
-            {term: 'する', source: 'しまして',     rule: 'vs', reasons: ['-masu', '-te']},
-
-            {term: 'する', source: 'すれば',         rule: 'vs', reasons: ['-ba']},
-            {term: 'する', source: 'すりゃ',         rule: 'vs', reasons: ['-ba', '-ya']},
-            {term: 'する', source: 'しちゃ',       rule: 'vs', reasons: ['-cha']},
-            {term: 'する', source: 'しちゃう',       rule: 'vs', reasons: ['-chau']},
-            {term: 'する', source: 'しちまう',       rule: 'vs', reasons: ['-chimau']},
-            {term: 'する', source: 'しなさい',       rule: 'vs', reasons: ['-nasai']},
-            {term: 'する', source: 'しそう',         rule: 'vs', reasons: ['-sou']},
-            {term: 'する', source: 'しすぎる',       rule: 'vs', reasons: ['-sugiru']},
-            {term: 'する', source: 'し過ぎる',       rule: 'vs', reasons: ['-sugiru-kanji']},
-            {term: 'する', source: 'したい',         rule: 'vs', reasons: ['-tai']},
-            {term: 'する', source: 'したがる',         rule: 'vs', reasons: ['-tai', '-garu']},
-            {term: 'する', source: 'したら',         rule: 'vs', reasons: ['-tara']},
-            {term: 'する', source: 'したり',         rule: 'vs', reasons: ['-tari']},
-            {term: 'する', source: 'せず',           rule: 'vs', reasons: ['-zu']},
-            {term: 'する', source: 'せぬ',           rule: 'vs', reasons: ['-nu']},
-            {term: 'する', source: 'せん',           rule: 'vs', reasons: ['-n']},
-            {term: 'する', source: 'せんかった',           rule: 'vs', reasons: ['-n', '-ta']},
-            {term: 'する', source: 'せんばかり',           rule: 'vs', reasons: ['-nbakari']},
-            {term: 'する', source: 'せんとする',           rule: 'vs', reasons: ['-ntosuru']},
-            {term: 'する', source: 'せざる',           rule: 'vs', reasons: ['-zaru']},
-            {term: 'する', source: 'せねば',           rule: 'vs', reasons: ['-neba']},
-            {term: 'する', source: 'せにゃ',         rule: 'vs', reasons: ['-neba', '-ya']},
+            {term: 'する', source: 'しまして',     rule: 'vs', reasons: ['-ます', '-て']},
+
+            {term: 'する', source: 'すれば',         rule: 'vs', reasons: ['-ば']},
+            {term: 'する', source: 'すりゃ',         rule: 'vs', reasons: ['-ば', '-ゃ']},
+            {term: 'する', source: 'しちゃ',       rule: 'vs', reasons: ['-ちゃ']},
+            {term: 'する', source: 'しちゃう',       rule: 'vs', reasons: ['-ちゃう']},
+            {term: 'する', source: 'しちまう',       rule: 'vs', reasons: ['-ちまう']},
+            {term: 'する', source: 'しなさい',       rule: 'vs', reasons: ['-なさい']},
+            {term: 'する', source: 'しそう',         rule: 'vs', reasons: ['-そう']},
+            {term: 'する', source: 'しすぎる',       rule: 'vs', reasons: ['-すぎる']},
+            {term: 'する', source: 'し過ぎる',       rule: 'vs', reasons: ['-過ぎる']},
+            {term: 'する', source: 'したい',         rule: 'vs', reasons: ['-たい']},
+            {term: 'する', source: 'したがる',         rule: 'vs', reasons: ['-たい', '-がる']},
+            {term: 'する', source: 'したら',         rule: 'vs', reasons: ['-たら']},
+            {term: 'する', source: 'したり',         rule: 'vs', reasons: ['-たり']},
+            {term: 'する', source: 'せず',           rule: 'vs', reasons: ['-ず']},
+            {term: 'する', source: 'せぬ',           rule: 'vs', reasons: ['-ぬ']},
+            {term: 'する', source: 'せん',           rule: 'vs', reasons: ['-ん']},
+            {term: 'する', source: 'せんかった',           rule: 'vs', reasons: ['-ん', '-た']},
+            {term: 'する', source: 'せんばかり',           rule: 'vs', reasons: ['-んばかり']},
+            {term: 'する', source: 'せんとする',           rule: 'vs', reasons: ['-んとする']},
+            {term: 'する', source: 'せざる',           rule: 'vs', reasons: ['-ざる']},
+            {term: 'する', source: 'せねば',           rule: 'vs', reasons: ['-ねば']},
+            {term: 'する', source: 'せにゃ',         rule: 'vs', reasons: ['-ねば', '-ゃ']},
             {term: 'する', source: 'し',             rule: 'vs', reasons: ['continuative']},
-            {term: 'する', source: 'しましょう',     rule: 'vs', reasons: ['-masu', 'volitional']},
-            {term: 'する', source: 'しましょっか',     rule: 'vs', reasons: ['-masu', 'volitional slang']},
+            {term: 'する', source: 'しましょう',     rule: 'vs', reasons: ['-ます', 'volitional']},
+            {term: 'する', source: 'しましょっか',     rule: 'vs', reasons: ['-ます', 'volitional slang']},
             {term: 'する', source: 'しよう',         rule: 'vs', reasons: ['volitional']},
             {term: 'する', source: 'しよっか',         rule: 'vs', reasons: ['volitional slang']},
-            {term: 'する', source: 'するまい',       rule: 'vs', reasons: ['-mai']},
-            {term: 'する', source: 'しまい',       rule: 'vs', reasons: ['-mai']},
-            {term: 'する', source: 'しなきゃ',        rule: 'vs', reasons: ['negative', '-ba', '-ya']},
-
-            {term: 'する', source: 'しておく',       rule: 'vs', reasons: ['-te', '-teoku']},
-            {term: 'する', source: 'しとく',         rule: 'vs', reasons: ['-te', '-teoku']},
-            {term: 'する', source: 'しないでおく',  rule: 'vs', reasons: ['negative', '-teoku']},
-            {term: 'する', source: 'しないどく',  rule: 'vs', reasons: ['negative', '-teoku']},
-            {term: 'する', source: 'している',       rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: 'する', source: 'しておる',       rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: 'する', source: 'してる',         rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: 'する', source: 'しとる',         rule: 'vs', reasons: ['-te', '-teiru']},
-            {term: 'する', source: 'してしまう',     rule: 'vs', reasons: ['-te', '-shimau']},
-
-            {term: 'する', source: 'しますまい',     rule: 'vs', reasons: ['-masu', '-mai']},
-            {term: 'する', source: 'しましたら',     rule: 'vs', reasons: ['-masu', '-tara']},
-            {term: 'する', source: 'しますれば',     rule: 'vs', reasons: ['-masu', '-ba']},
-            {term: 'する', source: 'しませんかった',     rule: 'vs', reasons: ['-masu', 'negative', '-ta']},
+            {term: 'する', source: 'するまい',       rule: 'vs', reasons: ['-まい']},
+            {term: 'する', source: 'しまい',       rule: 'vs', reasons: ['-まい']},
+            {term: 'する', source: 'しなきゃ',        rule: 'vs', reasons: ['negative', '-ば', '-ゃ']},
+
+            {term: 'する', source: 'しておく',       rule: 'vs', reasons: ['-て', '-おく']},
+            {term: 'する', source: 'しとく',         rule: 'vs', reasons: ['-て', '-おく']},
+            {term: 'する', source: 'しないでおく',  rule: 'vs', reasons: ['negative', '-おく']},
+            {term: 'する', source: 'しないどく',  rule: 'vs', reasons: ['negative', '-おく']},
+            {term: 'する', source: 'している',       rule: 'vs', reasons: ['-て', '-いる']},
+            {term: 'する', source: 'しておる',       rule: 'vs', reasons: ['-て', '-いる']},
+            {term: 'する', source: 'してる',         rule: 'vs', reasons: ['-て', '-いる']},
+            {term: 'する', source: 'しとる',         rule: 'vs', reasons: ['-て', '-いる']},
+            {term: 'する', source: 'してしまう',     rule: 'vs', reasons: ['-て', '-しまう']},
+
+            {term: 'する', source: 'しますまい',     rule: 'vs', reasons: ['-ます', '-まい']},
+            {term: 'する', source: 'しましたら',     rule: 'vs', reasons: ['-ます', '-たら']},
+            {term: 'する', source: 'しますれば',     rule: 'vs', reasons: ['-ます', '-ば']},
+            {term: 'する', source: 'しませんかった',     rule: 'vs', reasons: ['-ます', 'negative', '-た']},
 
             {term: '来る', source: '来る',           rule: 'vk', reasons: []},
-            {term: '来る', source: '来ます',         rule: 'vk', reasons: ['-masu']},
-            {term: '来る', source: '来た',           rule: 'vk', reasons: ['-ta']},
-            {term: '来る', source: '来ました',       rule: 'vk', reasons: ['-masu', '-ta']},
-            {term: '来る', source: '来て',           rule: 'vk', reasons: ['-te']},
+            {term: '来る', source: '来ます',         rule: 'vk', reasons: ['-ます']},
+            {term: '来る', source: '来た',           rule: 'vk', reasons: ['-た']},
+            {term: '来る', source: '来ました',       rule: 'vk', reasons: ['-ます', '-た']},
+            {term: '来る', source: '来て',           rule: 'vk', reasons: ['-て']},
             {term: '来る', source: '来られる',       rule: 'vk', reasons: ['potential or passive']},
             {term: '来る', source: '来られる',       rule: 'vk', reasons: ['potential or passive']},
             {term: '来る', source: '来させる',       rule: 'vk', reasons: ['causative']},
             {term: '来る', source: '来さす',       rule: 'vk', reasons: ['short causative']},
-            {term: '来る', source: '来さします',     rule: 'vk', reasons: ['short causative', '-masu']},
+            {term: '来る', source: '来さします',     rule: 'vk', reasons: ['short causative', '-ます']},
             {term: '来る', source: '来させられる',   rule: 'vk', reasons: ['causative', 'potential or passive']},
             {term: '来る', source: '来い',           rule: 'vk', reasons: ['imperative']},
             {term: '来る', source: '来ない',         rule: 'vk', reasons: ['negative']},
-            {term: '来る', source: '来ません',       rule: 'vk', reasons: ['-masu', 'negative']},
-            {term: '来る', source: '来なかった',     rule: 'vk', reasons: ['negative', '-ta']},
-            {term: '来る', source: '来ませんでした', rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
-            {term: '来る', source: '来なくて',       rule: 'vk', reasons: ['negative', '-te']},
+            {term: '来る', source: '来ません',       rule: 'vk', reasons: ['-ます', 'negative']},
+            {term: '来る', source: '来なかった',     rule: 'vk', reasons: ['negative', '-た']},
+            {term: '来る', source: '来ませんでした', rule: 'vk', reasons: ['-ます', 'negative', '-た']},
+            {term: '来る', source: '来なくて',       rule: 'vk', reasons: ['negative', '-て']},
             {term: '来る', source: '来られない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: '来る', source: '来られない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: '来る', source: '来させない',     rule: 'vk', reasons: ['causative', 'negative']},
             {term: '来る', source: '来ささない',     rule: 'vk', reasons: ['short causative', 'negative']},
             {term: '来る', source: '来させられない', rule: 'vk', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '来る', source: '来るな',         rule: 'vk', reasons: ['imperative negative']},
-            {term: '来る', source: '来まして',     rule: 'vk', reasons: ['-masu', '-te']},
-
-            {term: '来る', source: '来れば',         rule: 'vk', reasons: ['-ba']},
-            {term: '来る', source: '来りゃ',         rule: 'vk', reasons: ['-ba', '-ya']},
-            {term: '来る', source: '来ちゃ',       rule: 'vk', reasons: ['-cha']},
-            {term: '来る', source: '来ちゃう',       rule: 'vk', reasons: ['-chau']},
-            {term: '来る', source: '来ちまう',       rule: 'vk', reasons: ['-chimau']},
-            {term: '来る', source: '来なさい',       rule: 'vk', reasons: ['-nasai']},
-            {term: '来る', source: '来そう',         rule: 'vk', reasons: ['-sou']},
-            {term: '来る', source: '来すぎる',       rule: 'vk', reasons: ['-sugiru']},
-            {term: '来る', source: '来過ぎる',       rule: 'vk', reasons: ['-sugiru-kanji']},
-            {term: '来る', source: '来たい',         rule: 'vk', reasons: ['-tai']},
-            {term: '来る', source: '来たがる',         rule: 'vk', reasons: ['-tai', '-garu']},
-            {term: '来る', source: '来たら',         rule: 'vk', reasons: ['-tara']},
-            {term: '来る', source: '来たり',         rule: 'vk', reasons: ['-tari']},
-            {term: '来る', source: '来ず',           rule: 'vk', reasons: ['-zu']},
-            {term: '来る', source: '来ぬ',           rule: 'vk', reasons: ['-nu']},
-            {term: '来る', source: '来ん',           rule: 'vk', reasons: ['-n']},
-            {term: '来る', source: '来んかった',           rule: 'vk', reasons: ['-n', '-ta']},
-            {term: '来る', source: '来んばかり',           rule: 'vk', reasons: ['-nbakari']},
-            {term: '来る', source: '来んとする',           rule: 'vk', reasons: ['-ntosuru']},
-            {term: '来る', source: '来ざる',           rule: 'vk', reasons: ['-zaru']},
-            {term: '来る', source: '来ねば',           rule: 'vk', reasons: ['-neba']},
-            {term: '来る', source: '来にゃ',         rule: 'vk', reasons: ['-neba', '-ya']},
+            {term: '来る', source: '来まして',     rule: 'vk', reasons: ['-ます', '-て']},
+
+            {term: '来る', source: '来れば',         rule: 'vk', reasons: ['-ば']},
+            {term: '来る', source: '来りゃ',         rule: 'vk', reasons: ['-ば', '-ゃ']},
+            {term: '来る', source: '来ちゃ',       rule: 'vk', reasons: ['-ちゃ']},
+            {term: '来る', source: '来ちゃう',       rule: 'vk', reasons: ['-ちゃう']},
+            {term: '来る', source: '来ちまう',       rule: 'vk', reasons: ['-ちまう']},
+            {term: '来る', source: '来なさい',       rule: 'vk', reasons: ['-なさい']},
+            {term: '来る', source: '来そう',         rule: 'vk', reasons: ['-そう']},
+            {term: '来る', source: '来すぎる',       rule: 'vk', reasons: ['-すぎる']},
+            {term: '来る', source: '来過ぎる',       rule: 'vk', reasons: ['-過ぎる']},
+            {term: '来る', source: '来たい',         rule: 'vk', reasons: ['-たい']},
+            {term: '来る', source: '来たがる',         rule: 'vk', reasons: ['-たい', '-がる']},
+            {term: '来る', source: '来たら',         rule: 'vk', reasons: ['-たら']},
+            {term: '来る', source: '来たり',         rule: 'vk', reasons: ['-たり']},
+            {term: '来る', source: '来ず',           rule: 'vk', reasons: ['-ず']},
+            {term: '来る', source: '来ぬ',           rule: 'vk', reasons: ['-ぬ']},
+            {term: '来る', source: '来ん',           rule: 'vk', reasons: ['-ん']},
+            {term: '来る', source: '来んかった',           rule: 'vk', reasons: ['-ん', '-た']},
+            {term: '来る', source: '来んばかり',           rule: 'vk', reasons: ['-んばかり']},
+            {term: '来る', source: '来んとする',           rule: 'vk', reasons: ['-んとする']},
+            {term: '来る', source: '来ざる',           rule: 'vk', reasons: ['-ざる']},
+            {term: '来る', source: '来ねば',           rule: 'vk', reasons: ['-ねば']},
+            {term: '来る', source: '来にゃ',         rule: 'vk', reasons: ['-ねば', '-ゃ']},
             {term: '来る', source: '来',             rule: 'vk', reasons: ['continuative']},
-            {term: '来る', source: '来ましょう',     rule: 'vk', reasons: ['-masu', 'volitional']},
-            {term: '来る', source: '来ましょっか',     rule: 'vk', reasons: ['-masu', 'volitional slang']},
+            {term: '来る', source: '来ましょう',     rule: 'vk', reasons: ['-ます', 'volitional']},
+            {term: '来る', source: '来ましょっか',     rule: 'vk', reasons: ['-ます', 'volitional slang']},
             {term: '来る', source: '来よう',         rule: 'vk', reasons: ['volitional']},
             {term: '来る', source: '来よっか',         rule: 'vk', reasons: ['volitional slang']},
-            {term: '来る', source: '来るまい',       rule: 'vk', reasons: ['-mai']},
-            {term: '来る', source: '来まい',       rule: 'vk', reasons: ['-mai']},
-
-            {term: '来る', source: '来ておく',       rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: '来る', source: '来とく',         rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: '来る', source: '来ないでおく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: '来る', source: '来ないどく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: '来る', source: '来ている',       rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '来る', source: '来ておる',       rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '来る', source: '来てる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '来る', source: '来とる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '来る', source: '来てしまう',     rule: 'vk', reasons: ['-te', '-shimau']},
-
-            {term: '来る', source: '来ますまい',     rule: 'vk', reasons: ['-masu', '-mai']},
-            {term: '来る', source: '来ましたら',     rule: 'vk', reasons: ['-masu', '-tara']},
-            {term: '来る', source: '来ますれば',     rule: 'vk', reasons: ['-masu', '-ba']},
-            {term: '来る', source: '来ませんかった',     rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
+            {term: '来る', source: '来るまい',       rule: 'vk', reasons: ['-まい']},
+            {term: '来る', source: '来まい',       rule: 'vk', reasons: ['-まい']},
+
+            {term: '来る', source: '来ておく',       rule: 'vk', reasons: ['-て', '-おく']},
+            {term: '来る', source: '来とく',         rule: 'vk', reasons: ['-て', '-おく']},
+            {term: '来る', source: '来ないでおく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: '来る', source: '来ないどく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: '来る', source: '来ている',       rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '来る', source: '来ておる',       rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '来る', source: '来てる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '来る', source: '来とる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '来る', source: '来てしまう',     rule: 'vk', reasons: ['-て', '-しまう']},
+
+            {term: '来る', source: '来ますまい',     rule: 'vk', reasons: ['-ます', '-まい']},
+            {term: '来る', source: '来ましたら',     rule: 'vk', reasons: ['-ます', '-たら']},
+            {term: '来る', source: '来ますれば',     rule: 'vk', reasons: ['-ます', '-ば']},
+            {term: '来る', source: '来ませんかった',     rule: 'vk', reasons: ['-ます', 'negative', '-た']},
 
             {term: '來る', source: '來る',           rule: 'vk', reasons: []},
-            {term: '來る', source: '來ます',         rule: 'vk', reasons: ['-masu']},
-            {term: '來る', source: '來た',           rule: 'vk', reasons: ['-ta']},
-            {term: '來る', source: '來ました',       rule: 'vk', reasons: ['-masu', '-ta']},
-            {term: '來る', source: '來て',           rule: 'vk', reasons: ['-te']},
+            {term: '來る', source: '來ます',         rule: 'vk', reasons: ['-ます']},
+            {term: '來る', source: '來た',           rule: 'vk', reasons: ['-た']},
+            {term: '來る', source: '來ました',       rule: 'vk', reasons: ['-ます', '-た']},
+            {term: '來る', source: '來て',           rule: 'vk', reasons: ['-て']},
             {term: '來る', source: '來られる',       rule: 'vk', reasons: ['potential or passive']},
             {term: '來る', source: '來られる',       rule: 'vk', reasons: ['potential or passive']},
             {term: '來る', source: '來させる',       rule: 'vk', reasons: ['causative']},
             {term: '來る', source: '來さす',       rule: 'vk', reasons: ['short causative']},
-            {term: '來る', source: '來さします',     rule: 'vk', reasons: ['short causative', '-masu']},
+            {term: '來る', source: '來さします',     rule: 'vk', reasons: ['short causative', '-ます']},
             {term: '來る', source: '來させられる',   rule: 'vk', reasons: ['causative', 'potential or passive']},
             {term: '來る', source: '來い',           rule: 'vk', reasons: ['imperative']},
             {term: '來る', source: '來ない',         rule: 'vk', reasons: ['negative']},
-            {term: '來る', source: '來ません',       rule: 'vk', reasons: ['-masu', 'negative']},
-            {term: '來る', source: '來なかった',     rule: 'vk', reasons: ['negative', '-ta']},
-            {term: '來る', source: '來ませんでした', rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
-            {term: '來る', source: '來なくて',       rule: 'vk', reasons: ['negative', '-te']},
+            {term: '來る', source: '來ません',       rule: 'vk', reasons: ['-ます', 'negative']},
+            {term: '來る', source: '來なかった',     rule: 'vk', reasons: ['negative', '-た']},
+            {term: '來る', source: '來ませんでした', rule: 'vk', reasons: ['-ます', 'negative', '-た']},
+            {term: '來る', source: '來なくて',       rule: 'vk', reasons: ['negative', '-て']},
             {term: '來る', source: '來られない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: '來る', source: '來られない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: '來る', source: '來させない',     rule: 'vk', reasons: ['causative', 'negative']},
             {term: '來る', source: '來ささない',     rule: 'vk', reasons: ['short causative', 'negative']},
             {term: '來る', source: '來させられない', rule: 'vk', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '來る', source: '來るな',         rule: 'vk', reasons: ['imperative negative']},
-            {term: '來る', source: '來まして',     rule: 'vk', reasons: ['-masu', '-te']},
-
-            {term: '來る', source: '來れば',         rule: 'vk', reasons: ['-ba']},
-            {term: '來る', source: '來りゃ',         rule: 'vk', reasons: ['-ba', '-ya']},
-            {term: '來る', source: '來ちゃ',       rule: 'vk', reasons: ['-cha']},
-            {term: '來る', source: '來ちゃう',       rule: 'vk', reasons: ['-chau']},
-            {term: '來る', source: '來ちまう',       rule: 'vk', reasons: ['-chimau']},
-            {term: '來る', source: '來なさい',       rule: 'vk', reasons: ['-nasai']},
-            {term: '來る', source: '來そう',         rule: 'vk', reasons: ['-sou']},
-            {term: '來る', source: '來すぎる',       rule: 'vk', reasons: ['-sugiru']},
-            {term: '來る', source: '來過ぎる',       rule: 'vk', reasons: ['-sugiru-kanji']},
-            {term: '來る', source: '來たい',         rule: 'vk', reasons: ['-tai']},
-            {term: '來る', source: '來たがる',         rule: 'vk', reasons: ['-tai', '-garu']},
-            {term: '來る', source: '來たら',         rule: 'vk', reasons: ['-tara']},
-            {term: '來る', source: '來たり',         rule: 'vk', reasons: ['-tari']},
-            {term: '來る', source: '來ず',           rule: 'vk', reasons: ['-zu']},
-            {term: '來る', source: '來ぬ',           rule: 'vk', reasons: ['-nu']},
-            {term: '來る', source: '來ん',           rule: 'vk', reasons: ['-n']},
-            {term: '來る', source: '來んかった',           rule: 'vk', reasons: ['-n', '-ta']},
-            {term: '來る', source: '來んばかり',           rule: 'vk', reasons: ['-nbakari']},
-            {term: '來る', source: '來んとする',           rule: 'vk', reasons: ['-ntosuru']},
-            {term: '來る', source: '來ざる',           rule: 'vk', reasons: ['-zaru']},
-            {term: '來る', source: '來ねば',           rule: 'vk', reasons: ['-neba']},
-            {term: '來る', source: '來にゃ',         rule: 'vk', reasons: ['-neba', '-ya']},
+            {term: '來る', source: '來まして',     rule: 'vk', reasons: ['-ます', '-て']},
+
+            {term: '來る', source: '來れば',         rule: 'vk', reasons: ['-ば']},
+            {term: '來る', source: '來りゃ',         rule: 'vk', reasons: ['-ば', '-ゃ']},
+            {term: '來る', source: '來ちゃ',       rule: 'vk', reasons: ['-ちゃ']},
+            {term: '來る', source: '來ちゃう',       rule: 'vk', reasons: ['-ちゃう']},
+            {term: '來る', source: '來ちまう',       rule: 'vk', reasons: ['-ちまう']},
+            {term: '來る', source: '來なさい',       rule: 'vk', reasons: ['-なさい']},
+            {term: '來る', source: '來そう',         rule: 'vk', reasons: ['-そう']},
+            {term: '來る', source: '來すぎる',       rule: 'vk', reasons: ['-すぎる']},
+            {term: '來る', source: '來過ぎる',       rule: 'vk', reasons: ['-過ぎる']},
+            {term: '來る', source: '來たい',         rule: 'vk', reasons: ['-たい']},
+            {term: '來る', source: '來たがる',         rule: 'vk', reasons: ['-たい', '-がる']},
+            {term: '來る', source: '來たら',         rule: 'vk', reasons: ['-たら']},
+            {term: '來る', source: '來たり',         rule: 'vk', reasons: ['-たり']},
+            {term: '來る', source: '來ず',           rule: 'vk', reasons: ['-ず']},
+            {term: '來る', source: '來ぬ',           rule: 'vk', reasons: ['-ぬ']},
+            {term: '來る', source: '來ん',           rule: 'vk', reasons: ['-ん']},
+            {term: '來る', source: '來んかった',           rule: 'vk', reasons: ['-ん', '-た']},
+            {term: '來る', source: '來んばかり',           rule: 'vk', reasons: ['-んばかり']},
+            {term: '來る', source: '來んとする',           rule: 'vk', reasons: ['-んとする']},
+            {term: '來る', source: '來ざる',           rule: 'vk', reasons: ['-ざる']},
+            {term: '來る', source: '來ねば',           rule: 'vk', reasons: ['-ねば']},
+            {term: '來る', source: '來にゃ',         rule: 'vk', reasons: ['-ねば', '-ゃ']},
             {term: '來る', source: '來',             rule: 'vk', reasons: ['continuative']},
-            {term: '來る', source: '來ましょう',     rule: 'vk', reasons: ['-masu', 'volitional']},
-            {term: '來る', source: '來ましょっか',     rule: 'vk', reasons: ['-masu', 'volitional slang']},
+            {term: '來る', source: '來ましょう',     rule: 'vk', reasons: ['-ます', 'volitional']},
+            {term: '來る', source: '來ましょっか',     rule: 'vk', reasons: ['-ます', 'volitional slang']},
             {term: '來る', source: '來よう',         rule: 'vk', reasons: ['volitional']},
             {term: '來る', source: '來よっか',         rule: 'vk', reasons: ['volitional slang']},
-            {term: '來る', source: '來るまい',       rule: 'vk', reasons: ['-mai']},
-            {term: '來る', source: '來とく',         rule: 'vk', reasons: ['-te', '-teoku']},
+            {term: '來る', source: '來るまい',       rule: 'vk', reasons: ['-まい']},
+            {term: '來る', source: '來とく',         rule: 'vk', reasons: ['-て', '-おく']},
 
-            {term: '來る', source: '來ておく',       rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: '來る', source: '來とく',         rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: '來る', source: '來ないでおく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: '來る', source: '來ないどく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: '來る', source: '來ている',       rule: 'vk', reasons: ['-te', '-teiru']},
+            {term: '來る', source: '來ておく',       rule: 'vk', reasons: ['-て', '-おく']},
+            {term: '來る', source: '來とく',         rule: 'vk', reasons: ['-て', '-おく']},
+            {term: '來る', source: '來ないでおく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: '來る', source: '來ないどく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: '來る', source: '來ている',       rule: 'vk', reasons: ['-て', '-いる']},
 
-            {term: '來る', source: '來ておる',       rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '來る', source: '來てる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '來る', source: '來とる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: '來る', source: '來てしまう',     rule: 'vk', reasons: ['-te', '-shimau']},
+            {term: '來る', source: '來ておる',       rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '來る', source: '來てる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '來る', source: '來とる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: '來る', source: '來てしまう',     rule: 'vk', reasons: ['-て', '-しまう']},
 
-            {term: '來る', source: '來ますまい',     rule: 'vk', reasons: ['-masu', '-mai']},
-            {term: '來る', source: '來ましたら',     rule: 'vk', reasons: ['-masu', '-tara']},
-            {term: '來る', source: '來ますれば',     rule: 'vk', reasons: ['-masu', '-ba']},
-            {term: '來る', source: '來ませんかった',     rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
+            {term: '來る', source: '來ますまい',     rule: 'vk', reasons: ['-ます', '-まい']},
+            {term: '來る', source: '來ましたら',     rule: 'vk', reasons: ['-ます', '-たら']},
+            {term: '來る', source: '來ますれば',     rule: 'vk', reasons: ['-ます', '-ば']},
+            {term: '來る', source: '來ませんかった',     rule: 'vk', reasons: ['-ます', 'negative', '-た']},
 
             {term: 'くる', source: 'くる',           rule: 'vk', reasons: []},
-            {term: 'くる', source: 'きます',         rule: 'vk', reasons: ['-masu']},
-            {term: 'くる', source: 'きた',           rule: 'vk', reasons: ['-ta']},
-            {term: 'くる', source: 'きました',       rule: 'vk', reasons: ['-masu', '-ta']},
-            {term: 'くる', source: 'きて',           rule: 'vk', reasons: ['-te']},
+            {term: 'くる', source: 'きます',         rule: 'vk', reasons: ['-ます']},
+            {term: 'くる', source: 'きた',           rule: 'vk', reasons: ['-た']},
+            {term: 'くる', source: 'きました',       rule: 'vk', reasons: ['-ます', '-た']},
+            {term: 'くる', source: 'きて',           rule: 'vk', reasons: ['-て']},
             {term: 'くる', source: 'こられる',       rule: 'vk', reasons: ['potential or passive']},
             {term: 'くる', source: 'こられる',       rule: 'vk', reasons: ['potential or passive']},
             {term: 'くる', source: 'こさせる',       rule: 'vk', reasons: ['causative']},
             {term: 'くる', source: 'こさす',       rule: 'vk', reasons: ['short causative']},
-            {term: 'くる', source: 'こさします',     rule: 'vk', reasons: ['short causative', '-masu']},
+            {term: 'くる', source: 'こさします',     rule: 'vk', reasons: ['short causative', '-ます']},
             {term: 'くる', source: 'こさせられる',   rule: 'vk', reasons: ['causative', 'potential or passive']},
             {term: 'くる', source: 'こい',           rule: 'vk', reasons: ['imperative']},
             {term: 'くる', source: 'こない',         rule: 'vk', reasons: ['negative']},
-            {term: 'くる', source: 'きません',       rule: 'vk', reasons: ['-masu', 'negative']},
-            {term: 'くる', source: 'こなかった',     rule: 'vk', reasons: ['negative', '-ta']},
-            {term: 'くる', source: 'きませんでした', rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
-            {term: 'くる', source: 'こなくて',       rule: 'vk', reasons: ['negative', '-te']},
+            {term: 'くる', source: 'きません',       rule: 'vk', reasons: ['-ます', 'negative']},
+            {term: 'くる', source: 'こなかった',     rule: 'vk', reasons: ['negative', '-た']},
+            {term: 'くる', source: 'きませんでした', rule: 'vk', reasons: ['-ます', 'negative', '-た']},
+            {term: 'くる', source: 'こなくて',       rule: 'vk', reasons: ['negative', '-て']},
             {term: 'くる', source: 'こられない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: 'くる', source: 'こられない',     rule: 'vk', reasons: ['potential or passive', 'negative']},
             {term: 'くる', source: 'こさせない',     rule: 'vk', reasons: ['causative', 'negative']},
             {term: 'くる', source: 'こささない',     rule: 'vk', reasons: ['short causative', 'negative']},
             {term: 'くる', source: 'こさせられない', rule: 'vk', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: 'くる', source: 'くるな',         rule: 'vk', reasons: ['imperative negative']},
-            {term: 'くる', source: 'きまして',     rule: 'vk', reasons: ['-masu', '-te']},
-
-            {term: 'くる', source: 'くれば',         rule: 'vk', reasons: ['-ba']},
-            {term: 'くる', source: 'くりゃ',         rule: 'vk', reasons: ['-ba', '-ya']},
-            {term: 'くる', source: 'きちゃ',       rule: 'vk', reasons: ['-cha']},
-            {term: 'くる', source: 'きちゃう',       rule: 'vk', reasons: ['-chau']},
-            {term: 'くる', source: 'きちまう',       rule: 'vk', reasons: ['-chimau']},
-            {term: 'くる', source: 'きなさい',       rule: 'vk', reasons: ['-nasai']},
-            {term: 'くる', source: 'きそう',         rule: 'vk', reasons: ['-sou']},
-            {term: 'くる', source: 'きすぎる',       rule: 'vk', reasons: ['-sugiru']},
-            {term: 'くる', source: 'き過ぎる',       rule: 'vk', reasons: ['-sugiru-kanji']},
-            {term: 'くる', source: 'きたい',         rule: 'vk', reasons: ['-tai']},
-            {term: 'くる', source: 'きたがる',         rule: 'vk', reasons: ['-tai', '-garu']},
-            {term: 'くる', source: 'きたら',         rule: 'vk', reasons: ['-tara']},
-            {term: 'くる', source: 'きたり',         rule: 'vk', reasons: ['-tari']},
-            {term: 'くる', source: 'こず',           rule: 'vk', reasons: ['-zu']},
-            {term: 'くる', source: 'こぬ',           rule: 'vk', reasons: ['-nu']},
-            {term: 'くる', source: 'こん',           rule: 'vk', reasons: ['-n']},
-            {term: 'くる', source: 'こんかった',           rule: 'vk', reasons: ['-n', '-ta']},
-            {term: 'くる', source: 'こんばかり',           rule: 'vk', reasons: ['-nbakari']},
-            {term: 'くる', source: 'こんとする',           rule: 'vk', reasons: ['-ntosuru']},
-            {term: 'くる', source: 'こざる',           rule: 'vk', reasons: ['-zaru']},
-            {term: 'くる', source: 'こねば',           rule: 'vk', reasons: ['-neba']},
-            {term: 'くる', source: 'こにゃ',         rule: 'vk', reasons: ['-neba', '-ya']},
+            {term: 'くる', source: 'きまして',     rule: 'vk', reasons: ['-ます', '-て']},
+
+            {term: 'くる', source: 'くれば',         rule: 'vk', reasons: ['-ば']},
+            {term: 'くる', source: 'くりゃ',         rule: 'vk', reasons: ['-ば', '-ゃ']},
+            {term: 'くる', source: 'きちゃ',       rule: 'vk', reasons: ['-ちゃ']},
+            {term: 'くる', source: 'きちゃう',       rule: 'vk', reasons: ['-ちゃう']},
+            {term: 'くる', source: 'きちまう',       rule: 'vk', reasons: ['-ちまう']},
+            {term: 'くる', source: 'きなさい',       rule: 'vk', reasons: ['-なさい']},
+            {term: 'くる', source: 'きそう',         rule: 'vk', reasons: ['-そう']},
+            {term: 'くる', source: 'きすぎる',       rule: 'vk', reasons: ['-すぎる']},
+            {term: 'くる', source: 'き過ぎる',       rule: 'vk', reasons: ['-過ぎる']},
+            {term: 'くる', source: 'きたい',         rule: 'vk', reasons: ['-たい']},
+            {term: 'くる', source: 'きたがる',         rule: 'vk', reasons: ['-たい', '-がる']},
+            {term: 'くる', source: 'きたら',         rule: 'vk', reasons: ['-たら']},
+            {term: 'くる', source: 'きたり',         rule: 'vk', reasons: ['-たり']},
+            {term: 'くる', source: 'こず',           rule: 'vk', reasons: ['-ず']},
+            {term: 'くる', source: 'こぬ',           rule: 'vk', reasons: ['-ぬ']},
+            {term: 'くる', source: 'こん',           rule: 'vk', reasons: ['-ん']},
+            {term: 'くる', source: 'こんかった',           rule: 'vk', reasons: ['-ん', '-た']},
+            {term: 'くる', source: 'こんばかり',           rule: 'vk', reasons: ['-んばかり']},
+            {term: 'くる', source: 'こんとする',           rule: 'vk', reasons: ['-んとする']},
+            {term: 'くる', source: 'こざる',           rule: 'vk', reasons: ['-ざる']},
+            {term: 'くる', source: 'こねば',           rule: 'vk', reasons: ['-ねば']},
+            {term: 'くる', source: 'こにゃ',         rule: 'vk', reasons: ['-ねば', '-ゃ']},
             {term: 'くる', source: 'き',             rule: 'vk', reasons: ['continuative']},
-            {term: 'くる', source: 'きましょう',     rule: 'vk', reasons: ['-masu', 'volitional']},
-            {term: 'くる', source: 'きましょっか',     rule: 'vk', reasons: ['-masu', 'volitional slang']},
+            {term: 'くる', source: 'きましょう',     rule: 'vk', reasons: ['-ます', 'volitional']},
+            {term: 'くる', source: 'きましょっか',     rule: 'vk', reasons: ['-ます', 'volitional slang']},
             {term: 'くる', source: 'こよう',         rule: 'vk', reasons: ['volitional']},
             {term: 'くる', source: 'こよっか',         rule: 'vk', reasons: ['volitional slang']},
-            {term: 'くる', source: 'くるまい',       rule: 'vk', reasons: ['-mai']},
-            {term: 'くる', source: 'こまい',       rule: 'vk', reasons: ['-mai']},
-
-            {term: 'くる', source: 'きておく',       rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: 'くる', source: 'きとく',         rule: 'vk', reasons: ['-te', '-teoku']},
-            {term: 'くる', source: 'こないでおく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: 'くる', source: 'こないどく',  rule: 'vk', reasons: ['negative', '-teoku']},
-            {term: 'くる', source: 'きている',       rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: 'くる', source: 'きておる',       rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: 'くる', source: 'きてる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: 'くる', source: 'きとる',         rule: 'vk', reasons: ['-te', '-teiru']},
-            {term: 'くる', source: 'きてしまう',     rule: 'vk', reasons: ['-te', '-shimau']},
-
-            {term: 'くる', source: 'きますまい',     rule: 'vk', reasons: ['-masu', '-mai']},
-            {term: 'くる', source: 'きましたら',     rule: 'vk', reasons: ['-masu', '-tara']},
-            {term: 'くる', source: 'きますれば',     rule: 'vk', reasons: ['-masu', '-ba']},
-            {term: 'くる', source: 'きませんかった',     rule: 'vk', reasons: ['-masu', 'negative', '-ta']},
+            {term: 'くる', source: 'くるまい',       rule: 'vk', reasons: ['-まい']},
+            {term: 'くる', source: 'こまい',       rule: 'vk', reasons: ['-まい']},
+
+            {term: 'くる', source: 'きておく',       rule: 'vk', reasons: ['-て', '-おく']},
+            {term: 'くる', source: 'きとく',         rule: 'vk', reasons: ['-て', '-おく']},
+            {term: 'くる', source: 'こないでおく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: 'くる', source: 'こないどく',  rule: 'vk', reasons: ['negative', '-おく']},
+            {term: 'くる', source: 'きている',       rule: 'vk', reasons: ['-て', '-いる']},
+            {term: 'くる', source: 'きておる',       rule: 'vk', reasons: ['-て', '-いる']},
+            {term: 'くる', source: 'きてる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: 'くる', source: 'きとる',         rule: 'vk', reasons: ['-て', '-いる']},
+            {term: 'くる', source: 'きてしまう',     rule: 'vk', reasons: ['-て', '-しまう']},
+
+            {term: 'くる', source: 'きますまい',     rule: 'vk', reasons: ['-ます', '-まい']},
+            {term: 'くる', source: 'きましたら',     rule: 'vk', reasons: ['-ます', '-たら']},
+            {term: 'くる', source: 'きますれば',     rule: 'vk', reasons: ['-ます', '-ば']},
+            {term: 'くる', source: 'きませんかった',     rule: 'vk', reasons: ['-ます', 'negative', '-た']},
         ],
     },
     {
-        category: '-zuru verbs',
+        category: '-ずる verbs',
         valid: true,
         tests: [
             {term: '論ずる', source: '論ずる',           rule: 'vz', reasons: []},
-            {term: '論ずる', source: '論じます',         rule: 'vz', reasons: ['-masu']},
-            {term: '論ずる', source: '論じた',           rule: 'vz', reasons: ['-ta']},
-            {term: '論ずる', source: '論じました',       rule: 'vz', reasons: ['-masu', '-ta']},
-            {term: '論ずる', source: '論じて',           rule: 'vz', reasons: ['-te']},
+            {term: '論ずる', source: '論じます',         rule: 'vz', reasons: ['-ます']},
+            {term: '論ずる', source: '論じた',           rule: 'vz', reasons: ['-た']},
+            {term: '論ずる', source: '論じました',       rule: 'vz', reasons: ['-ます', '-た']},
+            {term: '論ずる', source: '論じて',           rule: 'vz', reasons: ['-て']},
             {term: '論ずる', source: '論ぜられる',       rule: 'vz', reasons: ['potential or passive']},
             {term: '論ずる', source: '論ざれる',         rule: 'vz', reasons: ['potential or passive']},
             {term: '論ずる', source: '論じされる',       rule: 'vz', reasons: ['passive']},
@@ -1176,16 +1169,16 @@ const tests = [
             {term: '論ずる', source: '論ぜさせる',       rule: 'vz', reasons: ['causative']},
             {term: '論ずる', source: '論じさす',       rule: 'vz', reasons: ['short causative']},
             {term: '論ずる', source: '論ぜさす',       rule: 'vz', reasons: ['short causative']},
-            {term: '論ずる', source: '論じさします',       rule: 'vz', reasons: ['short causative', '-masu']},
-            {term: '論ずる', source: '論ぜさします',       rule: 'vz', reasons: ['short causative', '-masu']},
+            {term: '論ずる', source: '論じさします',       rule: 'vz', reasons: ['short causative', '-ます']},
+            {term: '論ずる', source: '論ぜさします',       rule: 'vz', reasons: ['short causative', '-ます']},
             {term: '論ずる', source: '論じさせられる',   rule: 'vz', reasons: ['causative', 'potential or passive']},
             {term: '論ずる', source: '論ぜさせられる',   rule: 'vz', reasons: ['causative', 'potential or passive']},
             {term: '論ずる', source: '論じろ',           rule: 'vz', reasons: ['imperative']},
             {term: '論ずる', source: '論じない',         rule: 'vz', reasons: ['negative']},
-            {term: '論ずる', source: '論じません',       rule: 'vz', reasons: ['-masu', 'negative']},
-            {term: '論ずる', source: '論じなかった',     rule: 'vz', reasons: ['negative', '-ta']},
-            {term: '論ずる', source: '論じませんでした', rule: 'vz', reasons: ['-masu', 'negative', '-ta']},
-            {term: '論ずる', source: '論じなくて',       rule: 'vz', reasons: ['negative', '-te']},
+            {term: '論ずる', source: '論じません',       rule: 'vz', reasons: ['-ます', 'negative']},
+            {term: '論ずる', source: '論じなかった',     rule: 'vz', reasons: ['negative', '-た']},
+            {term: '論ずる', source: '論じませんでした', rule: 'vz', reasons: ['-ます', 'negative', '-た']},
+            {term: '論ずる', source: '論じなくて',       rule: 'vz', reasons: ['negative', '-て']},
             {term: '論ずる', source: '論ぜられない',     rule: 'vz', reasons: ['potential or passive', 'negative']},
             {term: '論ずる', source: '論じされない',     rule: 'vz', reasons: ['passive', 'negative']},
             {term: '論ずる', source: '論ぜされない',     rule: 'vz', reasons: ['passive', 'negative']},
@@ -1195,107 +1188,106 @@ const tests = [
             {term: '論ずる', source: '論ぜささない',     rule: 'vz', reasons: ['short causative', 'negative']},
             {term: '論ずる', source: '論じさせられない', rule: 'vz', reasons: ['causative', 'potential or passive', 'negative']},
             {term: '論ずる', source: '論ぜさせられない', rule: 'vz', reasons: ['causative', 'potential or passive', 'negative']},
-            {term: '論ずる', source: '論ずるな',         rule: 'vz', reasons: ['imperative negative']},
-            {term: '論ずる', source: '論じまして',     rule: 'vz', reasons: ['-masu', '-te']},
-
-            {term: '論ずる', source: '論ずれば',         rule: 'vz', reasons: ['-ba']},
-            {term: '論ずる', source: '論ずりゃ',         rule: 'vz', reasons: ['-ba', '-ya']},
-            {term: '論ずる', source: '論じちゃ',       rule: 'vz', reasons: ['-cha']},
-            {term: '論ずる', source: '論じちゃう',       rule: 'vz', reasons: ['-chau']},
-            {term: '論ずる', source: '論じちまう',       rule: 'vz', reasons: ['-chimau']},
-            {term: '論ずる', source: '論じなさい',       rule: 'vz', reasons: ['-nasai']},
-            {term: '論ずる', source: '論じそう',         rule: 'vz', reasons: ['-sou']},
-            {term: '論ずる', source: '論じすぎる',       rule: 'vz', reasons: ['-sugiru']},
-            {term: '論ずる', source: '論じ過ぎる',       rule: 'vz', reasons: ['-sugiru-kanji']},
-            {term: '論ずる', source: '論じたい',         rule: 'vz', reasons: ['-tai']},
-            {term: '論ずる', source: '論じたがる',         rule: 'vz', reasons: ['-tai', '-garu']},
-            {term: '論ずる', source: '論じたら',         rule: 'vz', reasons: ['-tara']},
-            {term: '論ずる', source: '論じたり',         rule: 'vz', reasons: ['-tari']},
-            {term: '論ずる', source: '論ぜず',           rule: 'vz', reasons: ['-zu']},
-            {term: '論ずる', source: '論ぜぬ',           rule: 'vz', reasons: ['-nu']},
-            {term: '論ずる', source: '論ぜん',           rule: 'vz', reasons: ['-n']},
-            {term: '論ずる', source: '論ぜんかった',           rule: 'vz', reasons: ['-n', '-ta']},
-            {term: '論ずる', source: '論ぜんばかり',           rule: 'vz', reasons: ['-nbakari']},
-            {term: '論ずる', source: '論ぜんとする',           rule: 'vz', reasons: ['-ntosuru']},
-            {term: '論ずる', source: '論ぜざる',           rule: 'vz', reasons: ['-zaru']},
-            {term: '論ずる', source: '論ぜねば',           rule: 'vz', reasons: ['-neba']},
-            {term: '論ずる', source: '論ぜにゃ',         rule: 'vz', reasons: ['-neba', '-ya']},
-
-            {term: '論ずる', source: '論じましょう',     rule: 'vz', reasons: ['-masu', 'volitional']},
+            {term: '論ずる', source: '論じまして',     rule: 'vz', reasons: ['-ます', '-て']},
+
+            {term: '論ずる', source: '論ずれば',         rule: 'vz', reasons: ['-ば']},
+            {term: '論ずる', source: '論ずりゃ',         rule: 'vz', reasons: ['-ば', '-ゃ']},
+            {term: '論ずる', source: '論じちゃ',       rule: 'vz', reasons: ['-ちゃ']},
+            {term: '論ずる', source: '論じちゃう',       rule: 'vz', reasons: ['-ちゃう']},
+            {term: '論ずる', source: '論じちまう',       rule: 'vz', reasons: ['-ちまう']},
+            {term: '論ずる', source: '論じなさい',       rule: 'vz', reasons: ['-なさい']},
+            {term: '論ずる', source: '論じそう',         rule: 'vz', reasons: ['-そう']},
+            {term: '論ずる', source: '論じすぎる',       rule: 'vz', reasons: ['-すぎる']},
+            {term: '論ずる', source: '論じ過ぎる',       rule: 'vz', reasons: ['-過ぎる']},
+            {term: '論ずる', source: '論じたい',         rule: 'vz', reasons: ['-たい']},
+            {term: '論ずる', source: '論じたがる',         rule: 'vz', reasons: ['-たい', '-がる']},
+            {term: '論ずる', source: '論じたら',         rule: 'vz', reasons: ['-たら']},
+            {term: '論ずる', source: '論じたり',         rule: 'vz', reasons: ['-たり']},
+            {term: '論ずる', source: '論ぜず',           rule: 'vz', reasons: ['-ず']},
+            {term: '論ずる', source: '論ぜぬ',           rule: 'vz', reasons: ['-ぬ']},
+            {term: '論ずる', source: '論ぜん',           rule: 'vz', reasons: ['-ん']},
+            {term: '論ずる', source: '論ぜんかった',           rule: 'vz', reasons: ['-ん', '-た']},
+            {term: '論ずる', source: '論ぜんばかり',           rule: 'vz', reasons: ['-んばかり']},
+            {term: '論ずる', source: '論ぜんとする',           rule: 'vz', reasons: ['-んとする']},
+            {term: '論ずる', source: '論ぜざる',           rule: 'vz', reasons: ['-ざる']},
+            {term: '論ずる', source: '論ぜねば',           rule: 'vz', reasons: ['-ねば']},
+            {term: '論ずる', source: '論ぜにゃ',         rule: 'vz', reasons: ['-ねば', '-ゃ']},
+
+            {term: '論ずる', source: '論じましょう',     rule: 'vz', reasons: ['-ます', 'volitional']},
             {term: '論ずる', source: '論じよう',         rule: 'vz', reasons: ['volitional']},
-            {term: '論ずる', source: '論ずるまい',       rule: 'vz', reasons: ['-mai']},
-            {term: '論ずる', source: '論じまい',       rule: 'vz', reasons: ['-mai']},
-
-            {term: '論ずる', source: '論じとく',         rule: 'vz', reasons: ['-te', '-teoku']},
-            {term: '論ずる', source: '論じている',       rule: 'vz', reasons: ['-te', '-teiru']},
-            {term: '論ずる', source: '論じておる',       rule: 'vz', reasons: ['-te', '-teiru']},
-            {term: '論ずる', source: '論じてる',         rule: 'vz', reasons: ['-te', '-teiru']},
-            {term: '論ずる', source: '論じとる',         rule: 'vz', reasons: ['-te', '-teiru']},
-            {term: '論ずる', source: '論じてしまう',     rule: 'vz', reasons: ['-te', '-shimau']},
+            {term: '論ずる', source: '論ずるまい',       rule: 'vz', reasons: ['-まい']},
+            {term: '論ずる', source: '論じまい',       rule: 'vz', reasons: ['-まい']},
+
+            {term: '論ずる', source: '論じとく',         rule: 'vz', reasons: ['-て', '-おく']},
+            {term: '論ずる', source: '論じている',       rule: 'vz', reasons: ['-て', '-いる']},
+            {term: '論ずる', source: '論じておる',       rule: 'vz', reasons: ['-て', '-いる']},
+            {term: '論ずる', source: '論じてる',         rule: 'vz', reasons: ['-て', '-いる']},
+            {term: '論ずる', source: '論じとる',         rule: 'vz', reasons: ['-て', '-いる']},
+            {term: '論ずる', source: '論じてしまう',     rule: 'vz', reasons: ['-て', '-しまう']},
         ],
     },
     {
-        category: '-e verbs and adjectives',
+        category: '-え verbs and adjectives',
         valid: true,
         tests: [
-            {term: 'すごい',     source: 'すげえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'やばい',     source: 'やべえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'うるさい',   source: 'うるせえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'ひどい',     source: 'ひでえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'ない',       source: 'ねえ',       rule: 'adj-i', reasons: ['-e']},
-            {term: 'できる',     source: 'できねえ',   rule: 'v1',    reasons: ['negative', '-e']},
-            {term: 'しんじる',   source: 'しんじねえ', rule: 'v1',    reasons: ['negative', '-e']},
-            {term: 'さむい',     source: 'さめえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'さむい',     source: 'さみい',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'あつい',     source: 'あちぇえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'あつい',     source: 'あちい',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'やすい',     source: 'やせえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'たかい',     source: 'たけえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'かわいい',   source: 'かわええ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'つよい',     source: 'ついぇえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'こわい',     source: 'こうぇえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'みじかい',   source: 'みじけえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'ながい',     source: 'なげえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'くさい',     source: 'くせえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'うまい',     source: 'うめえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'でかい',     source: 'でけえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'まずい',     source: 'まっぜえ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'ちっちゃい', source: 'ちっちぇえ', rule: 'adj-i', reasons: ['-e']},
-            {term: 'あかい',     source: 'あけえ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'こわい',     source: 'こええ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'つよい',     source: 'つええ',     rule: 'adj-i', reasons: ['-e']},
-            // Small -e
-            {term: 'すごい',     source: 'すげぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'やばい',     source: 'やべぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'うるさい',   source: 'うるせぇ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'ひどい',     source: 'ひでぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'ない',       source: 'ねぇ',       rule: 'adj-i', reasons: ['-e']},
-            {term: 'できる',     source: 'できねぇ',   rule: 'v1',    reasons: ['negative', '-e']},
-            {term: 'しんじる',   source: 'しんじねぇ', rule: 'v1',    reasons: ['negative', '-e']},
-            {term: 'さむい',     source: 'さめぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'さむい',     source: 'さみぃ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'あつい',     source: 'あちぃ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'やすい',     source: 'やせぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'たかい',     source: 'たけぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'みじかい',   source: 'みじけぇ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'ながい',     source: 'なげぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'くさい',     source: 'くせぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'うまい',     source: 'うめぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'でかい',     source: 'でけぇ',     rule: 'adj-i', reasons: ['-e']},
-            {term: 'まずい',     source: 'まっぜぇ',   rule: 'adj-i', reasons: ['-e']},
-            {term: 'あかい',     source: 'あけぇ',     rule: 'adj-i', reasons: ['-e']},
+            {term: 'すごい',     source: 'すげえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'やばい',     source: 'やべえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'うるさい',   source: 'うるせえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'ひどい',     source: 'ひでえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'ない',       source: 'ねえ',       rule: 'adj-i', reasons: ['-え']},
+            {term: 'できる',     source: 'できねえ',   rule: 'v1',    reasons: ['negative', '-え']},
+            {term: 'しんじる',   source: 'しんじねえ', rule: 'v1',    reasons: ['negative', '-え']},
+            {term: 'さむい',     source: 'さめえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'さむい',     source: 'さみい',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'あつい',     source: 'あちぇえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'あつい',     source: 'あちい',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'やすい',     source: 'やせえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'たかい',     source: 'たけえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'かわいい',   source: 'かわええ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'つよい',     source: 'ついぇえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'こわい',     source: 'こうぇえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'みじかい',   source: 'みじけえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'ながい',     source: 'なげえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'くさい',     source: 'くせえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'うまい',     source: 'うめえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'でかい',     source: 'でけえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'まずい',     source: 'まっぜえ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'ちっちゃい', source: 'ちっちぇえ', rule: 'adj-i', reasons: ['-え']},
+            {term: 'あかい',     source: 'あけえ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'こわい',     source: 'こええ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'つよい',     source: 'つええ',     rule: 'adj-i', reasons: ['-え']},
+            // Small -え
+            {term: 'すごい',     source: 'すげぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'やばい',     source: 'やべぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'うるさい',   source: 'うるせぇ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'ひどい',     source: 'ひでぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'ない',       source: 'ねぇ',       rule: 'adj-i', reasons: ['-え']},
+            {term: 'できる',     source: 'できねぇ',   rule: 'v1',    reasons: ['negative', '-え']},
+            {term: 'しんじる',   source: 'しんじねぇ', rule: 'v1',    reasons: ['negative', '-え']},
+            {term: 'さむい',     source: 'さめぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'さむい',     source: 'さみぃ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'あつい',     source: 'あちぃ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'やすい',     source: 'やせぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'たかい',     source: 'たけぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'みじかい',   source: 'みじけぇ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'ながい',     source: 'なげぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'くさい',     source: 'くせぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'うまい',     source: 'うめぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'でかい',     source: 'でけぇ',     rule: 'adj-i', reasons: ['-え']},
+            {term: 'まずい',     source: 'まっぜぇ',   rule: 'adj-i', reasons: ['-え']},
+            {term: 'あかい',     source: 'あけぇ',     rule: 'adj-i', reasons: ['-え']},
         ],
     },
     {
         category: 'n-slang',
         valid: true,
         tests: [
-            {term: 'わかる', source: 'わかんねえ', rule: 'v5', reasons: ['negative', 'n-slang', '-e']},
-            {term: 'する', source: 'すんな', rule: 'vs', reasons: ['imperative negative', 'n-slang']},
-            {term: 'やる', source: 'やんなさい', rule: 'v5', reasons: ['-nasai', 'n-slang']},
+            {term: 'わかる', source: 'わかんねえ', rule: 'v5', reasons: ['negative', 'n-slang', '-え']},
+            {term: 'する', source: 'すんな', rule: 'vs', reasons: ['imperative negative slang']},
+            {term: 'やる', source: 'やんなさい', rule: 'v5', reasons: ['-なさい', 'n-slang']},
             {term: '食べる', source: '食べらんない', rule: 'v1', reasons: ['potential or passive', 'negative', 'n-slang']},
-            {term: 'やる', source: 'やんなきゃ', rule: 'v5', reasons: ['negative', 'n-slang', '-ba', '-ya']},
-            {term: 'くれる', source: 'くんなきゃ', rule: 'v1', reasons: ['negative', '-ba', '-ya', 'n-slang']},
+            {term: 'やる', source: 'やんなきゃ', rule: 'v5', reasons: ['negative', 'n-slang', '-ば', '-ゃ']},
+            {term: 'くれる', source: 'くんなきゃ', rule: 'v1', reasons: ['negative', '-ば', '-ゃ', 'n-slang']},
         ],
     },
     {
@@ -1343,124 +1335,123 @@ const tests = [
         category: 'uncommon irregular verbs',
         valid: true,
         tests: [
-            {term: 'のたまう', source: 'のたもうて',   rule: 'v5', reasons: ['-te']},
-            {term: 'のたまう', source: 'のたもうた',   rule: 'v5', reasons: ['-ta']},
-            {term: 'のたまう', source: 'のたもうたら', rule: 'v5', reasons: ['-tara']},
-            {term: 'のたまう', source: 'のたもうたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: '宣う', source: '宣うて',   rule: 'v5', reasons: ['-te']},
-            {term: '宣う', source: '宣うた',   rule: 'v5', reasons: ['-ta']},
-            {term: '宣う', source: '宣うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '宣う', source: '宣うたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: '曰う', source: '曰うて',   rule: 'v5', reasons: ['-te']},
-            {term: '曰う', source: '曰うた',   rule: 'v5', reasons: ['-ta']},
-            {term: '曰う', source: '曰うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '曰う', source: '曰うたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: 'たまう', source: 'たもうて',   rule: 'v5', reasons: ['-te']},
-            {term: 'たまう', source: 'たもうた',   rule: 'v5', reasons: ['-ta']},
-            {term: 'たまう', source: 'たもうたら', rule: 'v5', reasons: ['-tara']},
-            {term: 'たまう', source: 'たもうたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: '給う', source: '給うて',   rule: 'v5', reasons: ['-te']},
-            {term: '給う', source: '給うた',   rule: 'v5', reasons: ['-ta']},
-            {term: '給う', source: '給うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '給う', source: '給うたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: '賜う', source: '賜うて',   rule: 'v5', reasons: ['-te']},
-            {term: '賜う', source: '賜うた',   rule: 'v5', reasons: ['-ta']},
-            {term: '賜う', source: '賜うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '賜う', source: '賜うたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: 'たゆたう', source: 'たゆとうて',   rule: 'v5', reasons: ['-te']},
-            {term: 'たゆたう', source: 'たゆとうた',   rule: 'v5', reasons: ['-ta']},
-            {term: 'たゆたう', source: 'たゆとうたら', rule: 'v5', reasons: ['-tara']},
-            {term: 'たゆたう', source: 'たゆとうたり', rule: 'v5', reasons: ['-tari']},
-
-            {term: 'こう', source: 'こうて', rule: 'v5', reasons: ['-te']},
-            {term: 'とう', source: 'とうて', rule: 'v5', reasons: ['-te']},
-            {term: '請う', source: '請うて', rule: 'v5', reasons: ['-te']},
-            {term: '乞う', source: '乞うて', rule: 'v5', reasons: ['-te']},
-            {term: '問う', source: '問うて', rule: 'v5', reasons: ['-te']},
-            {term: '訪う', source: '訪うて', rule: 'v5', reasons: ['-te']},
-
-            {term: 'こう', source: 'こうた', rule: 'v5', reasons: ['-ta']},
-            {term: 'とう', source: 'とうた', rule: 'v5', reasons: ['-ta']},
-            {term: '請う', source: '請うた', rule: 'v5', reasons: ['-ta']},
-            {term: '乞う', source: '乞うた', rule: 'v5', reasons: ['-ta']},
-            {term: '問う', source: '問うた', rule: 'v5', reasons: ['-ta']},
-            {term: '訪う', source: '訪うた', rule: 'v5', reasons: ['-ta']},
-
-            {term: 'こう', source: 'こうたら', rule: 'v5', reasons: ['-tara']},
-            {term: 'とう', source: 'とうたら', rule: 'v5', reasons: ['-tara']},
-            {term: '請う', source: '請うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '乞う', source: '乞うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '問う', source: '問うたら', rule: 'v5', reasons: ['-tara']},
-            {term: '訪う', source: '訪うたら', rule: 'v5', reasons: ['-tara']},
-
-            {term: 'こう', source: 'こうたり', rule: 'v5', reasons: ['-tari']},
-            {term: 'とう', source: 'とうたり', rule: 'v5', reasons: ['-tari']},
-            {term: '請う', source: '請うたり', rule: 'v5', reasons: ['-tari']},
-            {term: '乞う', source: '乞うたり', rule: 'v5', reasons: ['-tari']},
-            {term: '問う', source: '問うたり', rule: 'v5', reasons: ['-tari']},
-            {term: '訪う', source: '訪うたり', rule: 'v5', reasons: ['-tari']},
+            {term: 'のたまう', source: 'のたもうて',   rule: 'v5', reasons: ['-て']},
+            {term: 'のたまう', source: 'のたもうた',   rule: 'v5', reasons: ['-た']},
+            {term: 'のたまう', source: 'のたもうたら', rule: 'v5', reasons: ['-たら']},
+            {term: 'のたまう', source: 'のたもうたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: '宣う', source: '宣うて',   rule: 'v5', reasons: ['-て']},
+            {term: '宣う', source: '宣うた',   rule: 'v5', reasons: ['-た']},
+            {term: '宣う', source: '宣うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '宣う', source: '宣うたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: '曰う', source: '曰うて',   rule: 'v5', reasons: ['-て']},
+            {term: '曰う', source: '曰うた',   rule: 'v5', reasons: ['-た']},
+            {term: '曰う', source: '曰うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '曰う', source: '曰うたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: 'たまう', source: 'たもうて',   rule: 'v5', reasons: ['-て']},
+            {term: 'たまう', source: 'たもうた',   rule: 'v5', reasons: ['-た']},
+            {term: 'たまう', source: 'たもうたら', rule: 'v5', reasons: ['-たら']},
+            {term: 'たまう', source: 'たもうたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: '給う', source: '給うて',   rule: 'v5', reasons: ['-て']},
+            {term: '給う', source: '給うた',   rule: 'v5', reasons: ['-た']},
+            {term: '給う', source: '給うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '給う', source: '給うたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: '賜う', source: '賜うて',   rule: 'v5', reasons: ['-て']},
+            {term: '賜う', source: '賜うた',   rule: 'v5', reasons: ['-た']},
+            {term: '賜う', source: '賜うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '賜う', source: '賜うたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: 'たゆたう', source: 'たゆとうて',   rule: 'v5', reasons: ['-て']},
+            {term: 'たゆたう', source: 'たゆとうた',   rule: 'v5', reasons: ['-た']},
+            {term: 'たゆたう', source: 'たゆとうたら', rule: 'v5', reasons: ['-たら']},
+            {term: 'たゆたう', source: 'たゆとうたり', rule: 'v5', reasons: ['-たり']},
+
+            {term: 'こう', source: 'こうて', rule: 'v5', reasons: ['-て']},
+            {term: 'とう', source: 'とうて', rule: 'v5', reasons: ['-て']},
+            {term: '請う', source: '請うて', rule: 'v5', reasons: ['-て']},
+            {term: '乞う', source: '乞うて', rule: 'v5', reasons: ['-て']},
+            {term: '問う', source: '問うて', rule: 'v5', reasons: ['-て']},
+            {term: '訪う', source: '訪うて', rule: 'v5', reasons: ['-て']},
+
+            {term: 'こう', source: 'こうた', rule: 'v5', reasons: ['-た']},
+            {term: 'とう', source: 'とうた', rule: 'v5', reasons: ['-た']},
+            {term: '請う', source: '請うた', rule: 'v5', reasons: ['-た']},
+            {term: '乞う', source: '乞うた', rule: 'v5', reasons: ['-た']},
+            {term: '問う', source: '問うた', rule: 'v5', reasons: ['-た']},
+            {term: '訪う', source: '訪うた', rule: 'v5', reasons: ['-た']},
+
+            {term: 'こう', source: 'こうたら', rule: 'v5', reasons: ['-たら']},
+            {term: 'とう', source: 'とうたら', rule: 'v5', reasons: ['-たら']},
+            {term: '請う', source: '請うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '乞う', source: '乞うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '問う', source: '問うたら', rule: 'v5', reasons: ['-たら']},
+            {term: '訪う', source: '訪うたら', rule: 'v5', reasons: ['-たら']},
+
+            {term: 'こう', source: 'こうたり', rule: 'v5', reasons: ['-たり']},
+            {term: 'とう', source: 'とうたり', rule: 'v5', reasons: ['-たり']},
+            {term: '請う', source: '請うたり', rule: 'v5', reasons: ['-たり']},
+            {term: '乞う', source: '乞うたり', rule: 'v5', reasons: ['-たり']},
+            {term: '問う', source: '問うたり', rule: 'v5', reasons: ['-たり']},
+            {term: '訪う', source: '訪うたり', rule: 'v5', reasons: ['-たり']},
         ],
     },
     {
         category: 'combinations',
         valid: true,
         tests: [
-            {term: '抱き抱える', source: '抱き抱えていなければ', rule: 'v1', reasons: ['-te', '-teiru', 'negative', '-ba']},
-            {term: '抱きかかえる', source: '抱きかかえていなければ', rule: 'v1', reasons: ['-te', '-teiru', 'negative', '-ba']},
-            {term: '打ち込む', source: '打ち込んでいませんでした', rule: 'v5', reasons: ['-te', '-teiru', '-masu', 'negative', '-ta']},
-            {term: '食べる', source: '食べさせられたくなかった', rule: 'v1', reasons: ['causative', 'potential or passive', '-tai', 'negative', '-ta']},
-            {term: '食べる', source: '食べんとしませんかった', rule: 'v1', reasons: ['-ntosuru', '-masu', 'negative', '-ta']},
-            {term: '食べる', source: '食べないどきたくありません', rule: 'v1', reasons: ['negative', '-teoku', '-tai', '-masu', 'negative']},
+            {term: '抱き抱える', source: '抱き抱えていなければ', rule: 'v1', reasons: ['-て', '-いる', 'negative', '-ば']},
+            {term: '抱きかかえる', source: '抱きかかえていなければ', rule: 'v1', reasons: ['-て', '-いる', 'negative', '-ば']},
+            {term: '打ち込む', source: '打ち込んでいませんでした', rule: 'v5', reasons: ['-て', '-いる', '-ます', 'negative', '-た']},
+            {term: '食べる', source: '食べさせられたくなかった', rule: 'v1', reasons: ['causative', 'potential or passive', '-たい', 'negative', '-た']},
+            {term: '食べる', source: '食べんとしませんかった', rule: 'v1', reasons: ['-んとする', '-ます', 'negative', '-た']},
+            {term: '食べる', source: '食べないどきたくありません', rule: 'v1', reasons: ['negative', '-おく', '-たい', '-ます', 'negative']},
         ],
     },
     {
         category: 'kawaii',
         valid: true,
         tests: [
-            {term: 'かわいい', source: 'かわいげ',   rule: 'adj-i', reasons: ['-ge']},
-            {term: '可愛い',   source: '可愛げ',   rule: 'adj-i', reasons: ['-ge']},
-            {term: '可愛い',   source: '可愛気',   rule: 'adj-i', reasons: ['-ge']},
+            {term: 'かわいい', source: 'かわいげ',   rule: 'adj-i', reasons: ['-げ']},
+            {term: '可愛い',   source: '可愛げ',   rule: 'adj-i', reasons: ['-げ']},
+            {term: '可愛い',   source: '可愛気',   rule: 'adj-i', reasons: ['-げ']},
         ],
     },
     {
         category: 'incorrect chains',
         valid: false,
         tests: [
-            {term: '食べる', source: '食べて', rule: null, reasons: ['-te', '-teiru', 'continuative']},
-            {term: 'なる', source: 'なりません', rule: null, reasons: ['-masu', 'potential', '-n']},
+            {term: '食べる', source: '食べて', rule: null, reasons: ['-て', '-いる', 'continuative']},
+            {term: 'なる', source: 'なりません', rule: null, reasons: ['-ます', 'potential', '-ん']},
             {term: '食べる', source: '食べさせられる', rule: null, reasons: ['short causative', 'potential', 'potential or passive']},
-            {term: '食べる', source: '食べまさない', rule: null, reasons: ['-masu', 'negative']},
-            {term: '食べる', source: '食べますな', rule: null, reasons: ['-masu', 'imperative negative']},
-            {term: '食べる', source: '食べましたい', rule: null, reasons: ['-masu', '-tai']},
-            {term: '済ます', source: '済ません', rule: null, reasons: ['-masu', 'negative']},
-            {term: '済ます', source: '済ましょう', rule: null, reasons: ['-masu', 'volitional']},
+            {term: '食べる', source: '食べまさない', rule: null, reasons: ['-ます', 'negative']},
+            {term: '食べる', source: '食べましたい', rule: null, reasons: ['-ます', '-たい']},
+            {term: '済ます', source: '済ません', rule: null, reasons: ['-ます', 'negative']},
+            {term: '済ます', source: '済ましょう', rule: null, reasons: ['-ます', 'volitional']},
         ],
     },
     // Kansai-ben
     {
-        category: '-ku stem of kansai-ben adjectives',
+        category: '-く stem of kansai-ben adjectives',
         valid: true,
         tests: [
-            {term: '宜しい', source: '宜しゅう', rule: null, reasons: ['-ku', 'kansai-ben -ku']},
-            {term: 'よろしい', source: 'よろしゅう', rule: null, reasons: ['-ku', 'kansai-ben -ku']},
-            {term: '良い', source: '良う', rule: null, reasons: ['-ku', 'kansai-ben -ku']},
-            {term: 'よい', source: 'よう', rule: null, reasons: ['-ku', 'kansai-ben -ku']},
+            {term: '宜しい', source: '宜しゅう', rule: null, reasons: ['-く', 'kansai-ben -く']},
+            {term: 'よろしい', source: 'よろしゅう', rule: null, reasons: ['-く', 'kansai-ben -く']},
+            {term: '良い', source: '良う', rule: null, reasons: ['-く', 'kansai-ben -く']},
+            {term: 'よい', source: 'よう', rule: null, reasons: ['-く', 'kansai-ben -く']},
         ],
     },
     {
-        category: '-te form of kansai-ben adjectives',
+        category: '-て form of kansai-ben adjectives',
         valid: true,
         tests: [
-            {term: 'よろしい', source: 'よろしゅうて', rule: null, reasons: ['-te', 'kansai-ben adjective -te']},
-            {term: '宜しい', source: '宜しゅうて', rule: null, reasons: ['-te', 'kansai-ben adjective -te']},
-            {term: 'よい', source: 'ようて', rule: null, reasons: ['-te', 'kansai-ben adjective -te']},
-            {term: '良い', source: '良うて', rule: null, reasons: ['-te', 'kansai-ben adjective -te']},
+            {term: 'よろしい', source: 'よろしゅうて', rule: null, reasons: ['-て', 'kansai-ben adjective -て']},
+            {term: '宜しい', source: '宜しゅうて', rule: null, reasons: ['-て', 'kansai-ben adjective -て']},
+            {term: 'よい', source: 'ようて', rule: null, reasons: ['-て', 'kansai-ben adjective -て']},
+            {term: '良い', source: '良うて', rule: null, reasons: ['-て', 'kansai-ben adjective -て']},
         ],
     },
     {
@@ -1478,43 +1469,43 @@ const tests = [
         valid: true,
         tests: [
             {term: '食べる', source: '食べへん', rule: null, reasons: ['negative', 'kansai-ben negative']},
-            {term: '食べる', source: '食べへんかった', rule: null, reasons: ['negative', '-ta', 'kansai-ben negative']},
+            {term: '食べる', source: '食べへんかった', rule: null, reasons: ['negative', '-た', 'kansai-ben negative']},
         ],
     },
     {
-        category: '-te form of kansai-ben verbs',
+        category: '-て form of kansai-ben verbs',
         valid: true,
         tests: [
-            {term: '買う', source: '買うて', rule: null, reasons: ['-te', 'kansai-ben -te']},
-            {term: 'かう', source: 'こうて', rule: null, reasons: ['-te', 'kansai-ben -te']},
-            {term: 'はう', source: 'ほうて', rule: null, reasons: ['-te', 'kansai-ben -te']},
+            {term: '買う', source: '買うて', rule: null, reasons: ['-て', 'kansai-ben -て']},
+            {term: 'かう', source: 'こうて', rule: null, reasons: ['-て', 'kansai-ben -て']},
+            {term: 'はう', source: 'ほうて', rule: null, reasons: ['-て', 'kansai-ben -て']},
         ],
     },
     {
-        category: 'past form of kansai-ben terms',
+        category: '-た form of kansai-ben terms',
         valid: true,
         tests: [
-            {term: '買う', source: '買うた', rule: null, reasons: ['-ta', 'kansai-ben past']},
-            {term: 'かう', source: 'こうた', rule: null, reasons: ['-ta', 'kansai-ben past']},
-            {term: 'はう', source: 'ほうた', rule: null, reasons: ['-ta', 'kansai-ben past']},
+            {term: '買う', source: '買うた', rule: null, reasons: ['-た', 'kansai-ben -た']},
+            {term: 'かう', source: 'こうた', rule: null, reasons: ['-た', 'kansai-ben -た']},
+            {term: 'はう', source: 'ほうた', rule: null, reasons: ['-た', 'kansai-ben -た']},
         ],
     },
     {
-        category: '-tara form of kansai-ben terms',
+        category: '-たら form of kansai-ben terms',
         valid: true,
         tests: [
-            {term: '買う', source: '買うたら', rule: null, reasons: ['-tara', 'kansai-ben -tara']},
-            {term: 'かう', source: 'こうたら', rule: null, reasons: ['-tara', 'kansai-ben -tara']},
-            {term: 'はう', source: 'ほうたら', rule: null, reasons: ['-tara', 'kansai-ben -tara']},
+            {term: '買う', source: '買うたら', rule: null, reasons: ['-たら', 'kansai-ben -たら']},
+            {term: 'かう', source: 'こうたら', rule: null, reasons: ['-たら', 'kansai-ben -たら']},
+            {term: 'はう', source: 'ほうたら', rule: null, reasons: ['-たら', 'kansai-ben -たら']},
         ],
     },
     {
-        category: '-tari form of kansai-ben terms',
+        category: '-たり form of kansai-ben terms',
         valid: true,
         tests: [
-            {term: '買う', source: '買うたり', rule: null, reasons: ['-tari', 'kansai-ben -tari']},
-            {term: 'かう', source: 'こうたり', rule: null, reasons: ['-tari', 'kansai-ben -tari']},
-            {term: 'はう', source: 'ほうたり', rule: null, reasons: ['-tari', 'kansai-ben -tari']},
+            {term: '買う', source: '買うたり', rule: null, reasons: ['-たり', 'kansai-ben -たり']},
+            {term: 'かう', source: 'こうたり', rule: null, reasons: ['-たり', 'kansai-ben -たり']},
+            {term: 'はう', source: 'ほうたり', rule: null, reasons: ['-たり', 'kansai-ben -たり']},
         ],
     },
 ];