diff --git a/.config/typedoc.json b/.config/typedoc.json
index 7c97d4b06..ae6df8d04 100644
--- a/.config/typedoc.json
+++ b/.config/typedoc.json
@@ -11,7 +11,7 @@
         "MarkedPlugin"
     ],
     "entryPoints": ["../src"],
-    "entryPointStrategy": "Resolve",
+    "entryPointStrategy": "resolve",
     "excludeExternals": true,
     "excludeInternal": false,
     "excludePrivate": true,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a256b48..9dce18577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,36 @@
 
 # Unreleased
 
+## v0.23.9 (2022-07-24)
+
+### Bug Fixes
+
+-   TypeDoc will no longer skip entry points which have no exports, #2007.
+    If using `"entryPointStrategy": "expand"`, this change may result in new pages being added to your documentation.
+    If this is not desired, you can use the `exclude` option to filter them out.
+-   Fixed missing comments on callable variable-functions constructed indirectly, #2008.
+-   Packages mode will now respect the `--includeVersion` flag, #2010.
+-   Fixed multiple reflections mapping to the same file name on case insensitive file systems, #2012.
+
+## v0.23.8 (2022-07-17)
+
+### Features
+
+-   Added defined in links for classes, enums, #180.
+-   Added support for `*.ghe.com` and `*.github.us` GitHub enterprise domains for source links, #2001.
+-   Expose `Converter.parseRawComment` for plugins to parse additional markdown files, #2004.
+
+### Bug Fixes
+
+-   TypeDoc will no longer emit a warning for `{@link}` containing a URL, #1980.
+-   `excludeNotDocumented` will no longer remove functions/methods/accessors which are documented, #1994.
+-   Fixed missing `sources` property on signature reflections #1996.
+
+### Thanks!
+
+-   @cary-hu
+-   @chadhietala
+
 ## v0.23.7 (2022-07-09)
 
 ### Bug Fixes
@@ -103,6 +133,7 @@
 -   `{@link}` tags in comments will now be resolved as declaration references similar to TSDoc's declaration references.
     For most cases, this will just work. See [the documentation](https://typedoc.org/guides/link-resolution/) for details on how link resolution works.
 -   TypeDoc will now produce warnings for bracketed links (`[[ target ]]`). Use `{@link target}` instead. The `{@link}` syntax will be recognized by [TypeScript 4.3](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-3.html#editor-support-for-link-tags) and later and used to provide better intellisense. TypeDoc version 0.24.0 will remove support for `[[ target ]]` style links.
+    Support for `` [[`links`]] `` with brackets + code ticks have been dropped.
 -   `extends` in typedoc.json is now resolved using NodeJS module resolution, so a local path must begin with `./`.
 -   In the JSON output for `DeclarationReflection`s, `getSignature` is no longer a one-tuple.
 -   In the JSON output for `DeclarationReflection`s, `setSignature` is no longer a one-tuple.
diff --git a/example/README.md b/example/README.md
index 5e0973902..be0f3cf83 100644
--- a/example/README.md
+++ b/example/README.md
@@ -34,39 +34,39 @@ Here are some examples we wanted to highlight:
 
 ### Rendering
 
--   Markdown showcase: [[`markdownShowcase`]]
--   Syntax highlighting showcase: [[`syntaxHighlightingShowcase`]]
+-   Markdown showcase: {@link markdownShowcase | `markdownShowcase`}
+-   Syntax highlighting showcase: {@link syntaxHighlightingShowcase | `syntaxHighlightingShowcase` }
 
 ### Functions
 
--   Simple functions: [[`sqrt`]] and [[`sqrtArrowFunction`]]
--   A generic function: [[`concat`]]
--   Functions that take an options object: [[`makeHttpCallA`]] and [[`makeHttpCallB`]]
--   An overloaded function: [[`overloadedFunction`]]
--   An external function exported under a different name: [[`lodashSortBy`]]
+-   Simple functions: {@link sqrt | `sqrt` } and {@link sqrtArrowFunction | `sqrtArrowFunction` }
+-   A generic function: {@link concat | `concat` }
+-   Functions that take an options object: {@link makeHttpCallA | `makeHttpCallA` } and {@link makeHttpCallB | `makeHttpCallB` }
+-   An overloaded function: {@link overloadedFunction | `overloadedFunction` }
+-   An external function exported under a different name: {@link lodashSortBy | `lodashSortBy` }
 
 ### Types
 
--   Type aliases: [[`SimpleTypeAlias`]] and [[`ComplexGenericTypeAlias`]]
--   Interfaces: [[`User`]] and [[`AdminUser`]]
+-   Type aliases: {@link SimpleTypeAlias | `SimpleTypeAlias` } and {@link ComplexGenericTypeAlias | `ComplexGenericTypeAlias` }
+-   Interfaces: {@link User | `User` } and {@link AdminUser | `AdminUser` }
 
 ### Classes
 
--   A basic class: [[`Customer`]]
--   A subclass: [[`DeliveryCustomer`]]
--   A complex class: [[`CancellablePromise`]]
--   A class that extends a built-in generic type: [[`StringArray`]]
+-   A basic class: {@link Customer | `Customer` }
+-   A subclass: {@link DeliveryCustomer | `DeliveryCustomer` }
+-   A complex class: {@link CancellablePromise | `CancellablePromise` }
+-   A class that extends a built-in generic type: {@link StringArray | `StringArray` }
 
 ### Enums
 
--   A basic enum: [[`SimpleEnum`]]
--   Using the `@enum` tag: [[`EnumLikeObject`]]
+-   A basic enum: {@link SimpleEnum | `SimpleEnum` }
+-   Using the `@enum` tag: {@link EnumLikeObject | `EnumLikeObject` }
 
 ### Variables
 
--   [[`PI`]], [[`STRING_CONSTANT`]], and [[`ObjectConstant`]]
+-   {@link PI | `PI` }, {@link STRING_CONSTANT | `STRING_CONSTANT` }, and {@link ObjectConstant | `ObjectConstant` }
 
 ### React Components
 
--   Basic React components: [[`CardA`]] and [[`CardB`]]
--   A complex React component: [[`EasyFormDialog`]] and [[`EasyFormDialogProps`]]
+-   Basic React components: {@link CardA | `CardA` } and {@link CardB | `CardB` }
+-   A complex React component: {@link EasyFormDialog | `EasyFormDialog` } and {@link EasyFormDialogProps | `EasyFormDialogProps` }
diff --git a/example/src/classes/CancellablePromise.ts b/example/src/classes/CancellablePromise.ts
index d551164e6..662fd14c0 100644
--- a/example/src/classes/CancellablePromise.ts
+++ b/example/src/classes/CancellablePromise.ts
@@ -3,7 +3,7 @@ const noop = () => {
 };
 
 /**
- * If canceled, a [[`CancellablePromise`]] should throw an `Cancellation` object.
+ * If canceled, a {@link CancellablePromise | `CancellablePromise`} should throw an `Cancellation` object.
  */
 class Cancellation extends Error {
     constructor(message = "Promise canceled.") {
@@ -301,7 +301,7 @@ export class CancellablePromise<T> {
      *
      * @param values an array that may contain `CancellablePromise`s, promises,
      * thenables, and resolved values
-     * @returns a [[`CancellablePromise`]], which, if canceled, will cancel each
+     * @returns a {@link CancellablePromise | `CancellablePromise`}, which, if canceled, will cancel each
      * of the promises passed in to `CancellablePromise.all`.
      */
     static all(values: readonly unknown[]): CancellablePromise<unknown> {
diff --git a/example/src/classes/Customer.ts b/example/src/classes/Customer.ts
index 1c42329e7..311ade103 100644
--- a/example/src/classes/Customer.ts
+++ b/example/src/classes/Customer.ts
@@ -78,7 +78,7 @@ export abstract class Customer {
 }
 
 /**
- * A class that extends [[`Customer`]].
+ * A class that extends {@link Customer | `Customer`}.
  */
 export class DeliveryCustomer extends Customer {
     /** A property defined on the subclass. */
diff --git a/example/src/functions.ts b/example/src/functions.ts
index 27e89bbdb..980698bab 100644
--- a/example/src/functions.ts
+++ b/example/src/functions.ts
@@ -42,7 +42,7 @@ export function concat<T>(array1: T[], array2: T[]): T[] {
 }
 
 /**
- * The options type for [[`makeHttpCallA`]].
+ * The options type for {@link makeHttpCallA}.
  */
 export interface MakeHttpCallAOptions {
     url: string;
diff --git a/example/src/reactComponents.tsx b/example/src/reactComponents.tsx
index 6df57b24e..da39c5c8a 100644
--- a/example/src/reactComponents.tsx
+++ b/example/src/reactComponents.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, PropsWithChildren } from "react";
 
 /**
- * The props type for [[`CardA`]].
+ * The props type for {@link CardA}.
  */
 export interface CardAProps {
     /** The theme of the card. Defaults to `primary`. */
@@ -81,7 +81,7 @@ export function CardB({
     return <div className={`card card-${variant}`}>{children}</div>;
 }
 
-/** The props type of [[`EasyFormDialog`]]. */
+/** The props type of {@link EasyFormDialog | `EasyFormDialog`}. */
 export interface EasyFormDialogProps {
     /** The title of the dialog. Can be a JSX element. */
     title: React.ReactNode;
diff --git a/example/src/showcase.ts b/example/src/showcase.ts
index ad384494a..c6f38a402 100644
--- a/example/src/showcase.ts
+++ b/example/src/showcase.ts
@@ -23,7 +23,7 @@
  * const x: number | string = 12
  * ```
  *
- * See [[`syntaxHighlightingShowcase`]] for more code blocks.
+ * See {@link syntaxHighlightingShowcase | `syntaxHighlightingShowcase`} for more code blocks.
  *
  * ## A List
  *
diff --git a/example/src/types.ts b/example/src/types.ts
index fa40a0f17..96b8a402a 100644
--- a/example/src/types.ts
+++ b/example/src/types.ts
@@ -32,7 +32,7 @@ export interface User {
 }
 
 /**
- * An interface that extends [[`User`]] and adds more properties.
+ * An interface that extends {@link User | `User`} and adds more properties.
  *
  * Notice how TypeDoc automatically shows the inheritance hierarchy and where
  * each property was originally defined.
diff --git a/package-lock.json b/package-lock.json
index eb67bad0c..a084a94c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "typedoc",
-  "version": "0.23.7",
+  "version": "0.23.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "typedoc",
-      "version": "0.23.7",
+      "version": "0.23.9",
       "license": "Apache-2.0",
       "dependencies": {
         "lunr": "^2.3.9",
diff --git a/package.json b/package.json
index 9719c9910..7e0fa9e84 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typedoc",
   "description": "Create api documentation for TypeScript projects.",
-  "version": "0.23.7",
+  "version": "0.23.9",
   "homepage": "https://typedoc.org",
   "main": "./dist/index.js",
   "exports": {
@@ -66,7 +66,8 @@
     "/tsdoc.json"
   ],
   "scripts": {
-    "test": "c8 mocha -r ts-node/register --config .config/mocha.fast.json",
+    "test": "mocha -r ts-node/register --config .config/mocha.fast.json",
+    "test:cov": "c8 mocha -r ts-node/register --config .config/mocha.fast.json",
     "build:c2": "node bin/typedoc --tsconfig src/test/converter2/tsconfig.json",
     "test:full": "c8 mocha -r ts-node/register --config .config/mocha.full.json",
     "test:visual": "node ./dist/test/capture-screenshots.js && reg-suit -c .config/regconfig.json compare",
diff --git a/src/lib/converter/comments/discovery.ts b/src/lib/converter/comments/discovery.ts
index 9e443848c..373ff5ad5 100644
--- a/src/lib/converter/comments/discovery.ts
+++ b/src/lib/converter/comments/discovery.ts
@@ -37,6 +37,9 @@ const wantedKinds: Record<ReflectionKind, ts.SyntaxKind[]> = {
     [ReflectionKind.Function]: [
         ts.SyntaxKind.FunctionDeclaration,
         ts.SyntaxKind.BindingElement,
+        ts.SyntaxKind.VariableDeclaration,
+        ts.SyntaxKind.ExportAssignment,
+        ts.SyntaxKind.PropertyAccessExpression,
     ],
     [ReflectionKind.Class]: [
         ts.SyntaxKind.ClassDeclaration,
@@ -106,8 +109,12 @@ export function discoverComment(
             // See the gh1770 test for an example.
             if (
                 kind & ReflectionKind.ContainsCallSignatures &&
-                !(node as ts.FunctionDeclaration).body &&
-                node.kind !== ts.SyntaxKind.BindingElement
+                [
+                    ts.SyntaxKind.FunctionDeclaration,
+                    ts.SyntaxKind.MethodDeclaration,
+                    ts.SyntaxKind.Constructor,
+                ].includes(node.kind) &&
+                !(node as ts.FunctionDeclaration).body
             ) {
                 continue;
             }
diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts
index f94444d18..adee92908 100644
--- a/src/lib/converter/converter.ts
+++ b/src/lib/converter/converter.ts
@@ -94,7 +94,8 @@ export class Converter extends ChildableComponent<
 
     /**
      * Triggered when the converter has created a signature reflection.
-     * The listener will be given {@link Context}, {@link SignatureReflection} | {@link ProjectReflection} and a `ts.Node?`
+     * The listener will be given {@link Context}, {@link SignatureReflection} | {@link ProjectReflection} and
+     * `ts.SignatureDeclaration | ts.IndexSignatureDeclaration | ts.JSDocSignature | undefined`
      * @event
      */
     static readonly EVENT_CREATE_SIGNATURE = ConverterEvents.CREATE_SIGNATURE;
@@ -183,6 +184,18 @@ export class Converter extends ChildableComponent<
         return convertType(context, node);
     }
 
+    /**
+     * Parse the given file into a comment. Intended to be used with markdown files.
+     */
+    parseRawComment(file: MinimalSourceFile) {
+        return parseComment(
+            lexCommentString(file.text),
+            this.config,
+            file,
+            this.application.logger
+        );
+    }
+
     /**
      * Compile the files within the given context and convert the compiler symbols to reflections.
      *
@@ -227,15 +240,6 @@ export class Converter extends ChildableComponent<
         const symbol = getSymbolForModuleLike(context, node);
         let moduleContext: Context;
 
-        const allExports = getExports(context, node, symbol);
-
-        if (allExports.every((exp) => this.shouldIgnore(exp))) {
-            this.owner.logger.verbose(
-                `All members of ${entryName} are excluded, ignoring entry point.`
-            );
-            return;
-        }
-
         if (singleEntryPoint) {
             // Special case for when we're giving a single entry point, we don't need to
             // create modules for each entry. Register the project as this module.
@@ -264,11 +268,8 @@ export class Converter extends ChildableComponent<
 
             if (entryPoint.readmeFile) {
                 const readme = readFile(entryPoint.readmeFile);
-                const comment = parseComment(
-                    lexCommentString(readme),
-                    context.converter.config,
-                    new MinimalSourceFile(readme, entryPoint.readmeFile),
-                    context.logger
+                const comment = this.parseRawComment(
+                    new MinimalSourceFile(readme, entryPoint.readmeFile)
                 );
 
                 if (comment.blockTags.length || comment.modifierTags.size) {
@@ -292,6 +293,7 @@ export class Converter extends ChildableComponent<
             moduleContext = context.withScope(reflection);
         }
 
+        const allExports = getExports(context, node, symbol);
         for (const exp of allExports.filter((exp) =>
             isDirectExport(context.resolveAliasedSymbol(exp), node)
         )) {
diff --git a/src/lib/converter/factories/signature.ts b/src/lib/converter/factories/signature.ts
index 513144027..00aefd594 100644
--- a/src/lib/converter/factories/signature.ts
+++ b/src/lib/converter/factories/signature.ts
@@ -98,7 +98,7 @@ export function createSignature(
             break;
     }
 
-    context.trigger(ConverterEvents.CREATE_SIGNATURE, sigRef);
+    context.trigger(ConverterEvents.CREATE_SIGNATURE, sigRef, declaration);
 }
 
 function convertParameters(
diff --git a/src/lib/converter/plugins/CommentPlugin.ts b/src/lib/converter/plugins/CommentPlugin.ts
index e8e13036f..2ce507fff 100644
--- a/src/lib/converter/plugins/CommentPlugin.ts
+++ b/src/lib/converter/plugins/CommentPlugin.ts
@@ -232,24 +232,22 @@ export class CommentPlugin extends ConverterComponent {
 
         // remove functions with empty signatures after their signatures have been removed
         const [allRemoved, someRemoved] = partition(
-            filterMap(hidden, (reflection) =>
-                reflection.parent?.kindOf(
-                    ReflectionKind.FunctionOrMethod | ReflectionKind.Constructor
-                )
-                    ? reflection.parent
-                    : void 0
-            ) as DeclarationReflection[],
-            (method) => method.signatures?.length === 0
+            unique(
+                filterMap(hidden, (reflection) =>
+                    reflection.parent?.kindOf(ReflectionKind.SignatureContainer)
+                        ? reflection.parent
+                        : void 0
+                ) as DeclarationReflection[]
+            ),
+            (method) => method.getNonIndexSignatures().length === 0
         );
         allRemoved.forEach((reflection) => {
             project.removeReflection(reflection);
         });
         someRemoved.forEach((reflection) => {
-            reflection.sources = unique(
-                reflection.signatures!.flatMap<SourceReference>(
-                    (s) => s.sources ?? []
-                )
-            );
+            reflection.sources = reflection
+                .getNonIndexSignatures()
+                .flatMap<SourceReference>((s) => s.sources ?? []);
         });
     }
 
@@ -407,19 +405,22 @@ export class CommentPlugin extends ConverterComponent {
 
         if (!comment) {
             if (this.excludeNotDocumented) {
-                // Only allow excludeNotDocumented to exclude root level reflections
-                if (!(reflection instanceof DeclarationReflection)) {
+                // Don't let excludeNotDocumented remove parameters.
+                if (
+                    !(reflection instanceof DeclarationReflection) &&
+                    !(reflection instanceof SignatureReflection)
+                ) {
                     return false;
                 }
 
                 // excludeNotDocumented should hide a module only if it has no visible children
                 if (reflection.kindOf(ReflectionKind.SomeModule)) {
-                    if (!reflection.children) {
+                    if (!(reflection as DeclarationReflection).children) {
                         return true;
                     }
-                    return reflection.children.every((child) =>
-                        this.isHidden(child)
-                    );
+                    return (
+                        reflection as DeclarationReflection
+                    ).children!.every((child) => this.isHidden(child));
                 }
 
                 // enum members should all be included if the parent enum is documented
@@ -427,17 +428,36 @@ export class CommentPlugin extends ConverterComponent {
                     return false;
                 }
 
+                // signature containers should only be hidden if all their signatures are hidden
+                if (reflection.kindOf(ReflectionKind.SignatureContainer)) {
+                    return (reflection as DeclarationReflection)
+                        .getAllSignatures()
+                        .every((child) => this.isHidden(child));
+                }
+
                 // excludeNotDocumented should never hide parts of "type" reflections
                 return inTypeLiteral(reflection) === false;
             }
             return false;
         }
 
-        return (
+        const isHidden =
             comment.hasModifier("@hidden") ||
             comment.hasModifier("@ignore") ||
-            (comment.hasModifier("@internal") && this.excludeInternal)
-        );
+            (comment.hasModifier("@internal") && this.excludeInternal);
+
+        if (
+            isHidden &&
+            reflection.kindOf(ReflectionKind.ContainsCallSignatures)
+        ) {
+            return (reflection as DeclarationReflection)
+                .getNonIndexSignatures()
+                .every((sig) => {
+                    return !sig.comment || this.isHidden(sig);
+                });
+        }
+
+        return isHidden;
     }
 }
 
diff --git a/src/lib/converter/plugins/LinkResolverPlugin.ts b/src/lib/converter/plugins/LinkResolverPlugin.ts
index a537bc8cf..d9dec5bd3 100644
--- a/src/lib/converter/plugins/LinkResolverPlugin.ts
+++ b/src/lib/converter/plugins/LinkResolverPlugin.ts
@@ -220,26 +220,37 @@ function resolveLinkTag(
 ) {
     let pos = 0;
     const end = part.text.length;
+    while (pos < end && ts.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
+        pos++;
+    }
+    const origText = part.text;
 
     // Try to parse one
     const declRef = parseDeclarationReference(part.text, pos, end);
 
-    let target: Reflection | undefined;
+    let target: Reflection | string | undefined;
     if (declRef) {
         // Got one, great! Try to resolve the link
         target = resolveDeclarationReference(reflection, declRef[0]);
         pos = declRef[1];
     }
 
+    if (!target) {
+        if (urlPrefix.test(part.text)) {
+            const wsIndex = part.text.search(/\s/);
+            target =
+                wsIndex === -1 ? part.text : part.text.substring(0, wsIndex);
+            pos = target.length;
+        }
+    }
+
     // If resolution via a declaration reference failed, revert to the legacy "split and check"
     // method... this should go away in 0.24, once people have had a chance to migrate any failing links.
     if (!target) {
         const resolved = legacyResolveLinkTag(reflection, part);
         if (resolved) {
             warn(
-                `Failed to resolve {@link ${
-                    part.text
-                }} in ${reflection.getFriendlyFullName()} with declaration references. This link will break in v0.24.`
+                `Failed to resolve {@link ${origText}} in ${reflection.getFriendlyFullName()} with declaration references. This link will break in v0.24.`
             );
         }
         return resolved;
@@ -255,7 +266,9 @@ function resolveLinkTag(
     }
 
     part.target = target;
-    part.text = part.text.substring(pos).trim() || target.name;
+    part.text =
+        part.text.substring(pos).trim() ||
+        (typeof target === "string" ? target : target.name);
 
     return part;
 }
diff --git a/src/lib/converter/plugins/PackagePlugin.ts b/src/lib/converter/plugins/PackagePlugin.ts
index f48b43a87..85c7d0770 100644
--- a/src/lib/converter/plugins/PackagePlugin.ts
+++ b/src/lib/converter/plugins/PackagePlugin.ts
@@ -7,8 +7,6 @@ import type { Context } from "../context";
 import { BindOption, EntryPointStrategy, readFile } from "../../utils";
 import { getCommonDirectory } from "../../utils/fs";
 import { nicePath } from "../../utils/paths";
-import { lexCommentString } from "../comments/rawLexer";
-import { parseComment } from "../comments/parser";
 import { MinimalSourceFile } from "../../utils/minimalSourceFile";
 
 /**
@@ -105,11 +103,8 @@ export class PackagePlugin extends ConverterComponent {
         const project = context.project;
         if (this.readmeFile) {
             const readme = readFile(this.readmeFile);
-            const comment = parseComment(
-                lexCommentString(readme),
-                context.converter.config,
-                new MinimalSourceFile(readme, this.readmeFile),
-                context.logger
+            const comment = context.converter.parseRawComment(
+                new MinimalSourceFile(readme, this.readmeFile)
             );
 
             if (comment.blockTags.length || comment.modifierTags.size) {
diff --git a/src/lib/converter/plugins/SourcePlugin.ts b/src/lib/converter/plugins/SourcePlugin.ts
index 631eaf04f..d2186cb0e 100644
--- a/src/lib/converter/plugins/SourcePlugin.ts
+++ b/src/lib/converter/plugins/SourcePlugin.ts
@@ -50,7 +50,7 @@ export class SourcePlugin extends ConverterComponent {
         this.listenTo(this.owner, {
             [Converter.EVENT_END]: this.onEnd,
             [Converter.EVENT_CREATE_DECLARATION]: this.onDeclaration,
-            [Converter.EVENT_CREATE_SIGNATURE]: this.onDeclaration,
+            [Converter.EVENT_CREATE_SIGNATURE]: this.onSignature,
             [Converter.EVENT_RESOLVE_BEGIN]: this.onBeginResolve,
         });
     }
@@ -101,6 +101,31 @@ export class SourcePlugin extends ConverterComponent {
         }
     }
 
+    private onSignature(
+        _context: Context,
+        reflection: Reflection,
+        sig?:
+            | ts.SignatureDeclaration
+            | ts.IndexSignatureDeclaration
+            | ts.JSDocSignature
+    ) {
+        if (this.disableSources || !sig) return;
+
+        const sourceFile = sig.getSourceFile();
+        const fileName = sourceFile.fileName;
+        this.fileNames.add(fileName);
+
+        const position = ts.getLineAndCharacterOfPosition(
+            sourceFile,
+            sig.getStart()
+        );
+
+        reflection.sources ||= [];
+        reflection.sources.push(
+            new SourceReference(fileName, position.line + 1, position.character)
+        );
+    }
+
     /**
      * Triggered when the converter begins resolving a project.
      *
diff --git a/src/lib/converter/utils/repository.ts b/src/lib/converter/utils/repository.ts
index 99ba4cca1..b1087d80b 100644
--- a/src/lib/converter/utils/repository.ts
+++ b/src/lib/converter/utils/repository.ts
@@ -71,7 +71,7 @@ export class Repository {
 
         for (let i = 0, c = repoLinks.length; i < c; i++) {
             let match =
-                /(github(?:\.[a-z]+)*\.[a-z]{2,})[:/]([^/]+)\/(.*)/.exec(
+                /(github(?!.us)(?:\.[a-z]+)*\.[a-z]{2,})[:/]([^/]+)\/(.*)/.exec(
                     repoLinks[i]
                 );
 
@@ -82,6 +82,16 @@ export class Repository {
                 );
             }
 
+            // Github Enterprise
+            if (!match) {
+                match = /(\w+\.ghe.com)[:/]([^/]+)\/(.*)/.exec(repoLinks[i]);
+            }
+
+            // Github Enterprise
+            if (!match) {
+                match = /(\w+\.github.us)[:/]([^/]+)\/(.*)/.exec(repoLinks[i]);
+            }
+
             if (!match) {
                 match = /(bitbucket.org)[:/]([^/]+)\/(.*)/.exec(repoLinks[i]);
             }
diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts
index 65917c4dc..a649f5a1a 100644
--- a/src/lib/models/reflections/abstract.ts
+++ b/src/lib/models/reflections/abstract.ts
@@ -376,6 +376,9 @@ export abstract class Reflection {
             if (alias === "") {
                 alias = "reflection-" + this.id;
             }
+            // NTFS/ExFAT use uppercase, so we will too. It probably won't matter
+            // in this case since names will generally be valid identifiers, but to be safe...
+            const upperAlias = alias.toUpperCase();
 
             let target = this as Reflection;
             while (target.parent && !target.hasOwnDocument) {
@@ -385,12 +388,12 @@ export abstract class Reflection {
             target._aliases ||= new Map();
 
             let suffix = "";
-            if (!target._aliases.has(alias)) {
-                target._aliases.set(alias, 1);
+            if (!target._aliases.has(upperAlias)) {
+                target._aliases.set(upperAlias, 1);
             } else {
-                const count = target._aliases.get(alias)!;
+                const count = target._aliases.get(upperAlias)!;
                 suffix = "-" + count.toString();
-                target._aliases.set(alias, count + 1);
+                target._aliases.set(upperAlias, count + 1);
             }
 
             alias += suffix;
diff --git a/src/lib/models/reflections/kind.ts b/src/lib/models/reflections/kind.ts
index cce064c95..c27b3d378 100644
--- a/src/lib/models/reflections/kind.ts
+++ b/src/lib/models/reflections/kind.ts
@@ -128,6 +128,13 @@ export namespace ReflectionKind {
         ReflectionKind.Function |
         ReflectionKind.Method;
 
+    /**
+     * Note: This does not include Class/Interface, even though they technically could contain index signatures
+     * @internal
+     */
+    export const SignatureContainer =
+        ContainsCallSignatures | ReflectionKind.Accessor;
+
     const SINGULARS = {
         [ReflectionKind.Enum]: "Enumeration",
         [ReflectionKind.EnumMember]: "Enumeration Member",
diff --git a/src/lib/output/themes/default/templates/reflection.tsx b/src/lib/output/themes/default/templates/reflection.tsx
index 26d6ac1b8..ec2cc12c2 100644
--- a/src/lib/output/themes/default/templates/reflection.tsx
+++ b/src/lib/output/themes/default/templates/reflection.tsx
@@ -71,6 +71,7 @@ export function reflectionTemplate(context: DefaultThemeRenderContext, props: Pa
                                 context.parameter(props.model.indexSignature.type.declaration)}
                         </section>
                     )}
+                    {!props.model.signatures && context.memberSources(props.model)}
                 </>
             )}
             {!!props.model.children?.length && context.index(props.model)}
diff --git a/src/lib/utils/entry-point.ts b/src/lib/utils/entry-point.ts
index 3df6c28a2..b2efcd215 100644
--- a/src/lib/utils/entry-point.ts
+++ b/src/lib/utils/entry-point.ts
@@ -407,7 +407,9 @@ function getEntryPointsForPackages(
             displayName:
                 typedocPackageConfig?.displayName ??
                 (packageJson["name"] as string),
-            version: packageJson["version"] as string | undefined,
+            version: includeVersion
+                ? (packageJson["version"] as string | undefined)
+                : void 0,
             readmeFile: typedocPackageConfig?.readmeFile
                 ? Path.resolve(
                       Path.join(
diff --git a/src/test/Repository.test.ts b/src/test/Repository.test.ts
index d1e2067dc..a2c40b774 100644
--- a/src/test/Repository.test.ts
+++ b/src/test/Repository.test.ts
@@ -46,6 +46,32 @@ describe("Repository", function () {
             equal(repository.type, RepositoryType.GitHub);
         });
 
+        it("handles a ghe.com URL", function () {
+            const mockRemotes = [
+                "ssh://org@bigcompany.ghe.com/joebloggs/foobar.git",
+            ];
+
+            const repository = new Repository("", "", mockRemotes);
+
+            equal(repository.hostname, "bigcompany.ghe.com");
+            equal(repository.user, "joebloggs");
+            equal(repository.project, "foobar");
+            equal(repository.type, RepositoryType.GitHub);
+        });
+
+        it("handles a github.us URL", function () {
+            const mockRemotes = [
+                "ssh://org@bigcompany.github.us/joebloggs/foobar.git",
+            ];
+
+            const repository = new Repository("", "", mockRemotes);
+
+            equal(repository.hostname, "bigcompany.github.us");
+            equal(repository.user, "joebloggs");
+            equal(repository.project, "foobar");
+            equal(repository.type, RepositoryType.GitHub);
+        });
+
         it("handles a Bitbucket HTTPS URL", function () {
             const mockRemotes = [
                 "https://joebloggs@bitbucket.org/joebloggs/foobar.git",
diff --git a/src/test/converter/alias/specs.json b/src/test/converter/alias/specs.json
index e088b4600..67369d841 100644
--- a/src/test/converter/alias/specs.json
+++ b/src/test/converter/alias/specs.json
@@ -2,14 +2,12 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 8,
       "name": "IsString",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "comment": {
         "summary": [
@@ -32,7 +30,6 @@
           "id": 9,
           "name": "T",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {}
         }
       ],
@@ -61,7 +58,6 @@
       "id": 10,
       "name": "PromiseType",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "comment": {
         "summary": [
@@ -84,7 +80,6 @@
           "id": 11,
           "name": "T",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {}
         }
       ],
@@ -122,7 +117,6 @@
       "id": 1,
       "name": "TCompareFunction",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "sources": [
         {
@@ -137,7 +131,6 @@
           "id": 6,
           "name": "T",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {}
         }
       ],
@@ -147,7 +140,6 @@
           "id": 2,
           "name": "__type",
           "kind": 65536,
-          "kindString": "Type literal",
           "flags": {},
           "sources": [
             {
@@ -162,7 +154,6 @@
               "id": 3,
               "name": "__type",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -177,7 +168,6 @@
                   "id": 4,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -189,7 +179,6 @@
                   "id": 5,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -211,7 +200,6 @@
       "id": 7,
       "name": "TId",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "comment": {
         "summary": [
diff --git a/src/test/converter/class/specs-with-lump-categories.json b/src/test/converter/class/specs-with-lump-categories.json
index 4c3d87441..7f17627f9 100644
--- a/src/test/converter/class/specs-with-lump-categories.json
+++ b/src/test/converter/class/specs-with-lump-categories.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "access",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 8,
           "name": "PrivateClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isPrivate": true
           },
@@ -32,7 +30,6 @@
               "id": 13,
               "name": "fakePrivateProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -61,7 +58,6 @@
               "id": 14,
               "name": "fakeProtectedProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -90,7 +86,6 @@
               "id": 9,
               "name": "privateStaticGetter",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {
                 "isPrivate": true,
                 "isStatic": true
@@ -107,7 +102,6 @@
                 "id": 10,
                 "name": "privateStaticGetter",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -119,7 +113,6 @@
               "id": 15,
               "name": "fakePrivateMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -136,7 +129,6 @@
                   "id": 16,
                   "name": "fakePrivateMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {
                     "isPrivate": true
                   },
@@ -159,7 +151,6 @@
               "id": 17,
               "name": "fakeProtectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -176,7 +167,6 @@
                   "id": 18,
                   "name": "fakeProtectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {
                     "isProtected": true
                   },
@@ -199,7 +189,6 @@
               "id": 19,
               "name": "privateArrow",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -216,7 +205,6 @@
                   "id": 20,
                   "name": "privateArrow",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -262,7 +250,6 @@
           "id": 6,
           "name": "fakePrivateVariable",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isPrivate": true,
             "isConst": true
@@ -293,7 +280,6 @@
           "id": 7,
           "name": "fakeProtectedVariable",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isProtected": true,
             "isConst": true
@@ -324,7 +310,6 @@
           "id": 2,
           "name": "fakePrivateFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {
             "isPrivate": true
           },
@@ -341,7 +326,6 @@
               "id": 3,
               "name": "fakePrivateFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {
                 "isPrivate": true
               },
@@ -364,7 +348,6 @@
           "id": 4,
           "name": "fakeProtectedFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {
             "isProtected": true
           },
@@ -381,7 +364,6 @@
               "id": 5,
               "name": "fakeProtectedFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {
                 "isProtected": true
               },
@@ -436,21 +418,18 @@
       "id": 21,
       "name": "class",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 59,
           "name": "TestSubClass",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "children": [
             {
               "id": 60,
               "name": "staticMergedMethod",
               "kind": 64,
-              "kindString": "Function",
               "flags": {},
               "sources": [
                 {
@@ -465,7 +444,6 @@
                   "id": 61,
                   "name": "staticMergedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -516,7 +494,6 @@
           "id": 85,
           "name": "Abstract",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isAbstract": true
           },
@@ -525,14 +502,12 @@
               "id": 86,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 87,
                   "name": "new Abstract",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -546,7 +521,6 @@
               "id": 88,
               "name": "needsImpl",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isAbstract": true
               },
@@ -563,7 +537,6 @@
                   "id": 89,
                   "name": "needsImpl",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -600,21 +573,18 @@
           "id": 74,
           "name": "ComputedNames",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 75,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 76,
                   "name": "new ComputedNames",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -628,7 +598,6 @@
               "id": 79,
               "name": "[toStringTag]",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -648,7 +617,6 @@
               "id": 80,
               "name": "literal",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -668,7 +636,6 @@
               "id": 77,
               "name": "literal2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -688,7 +655,6 @@
               "id": 78,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -735,7 +701,6 @@
           "id": 62,
           "name": "TestAbstractClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isAbstract": true
           },
@@ -744,14 +709,12 @@
               "id": 63,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 64,
                   "name": "new TestAbstractClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -765,7 +728,6 @@
               "id": 65,
               "name": "myAbstractProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isAbstract": true
               },
@@ -786,7 +748,6 @@
               "id": 66,
               "name": "myAbstractMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true,
                 "isAbstract": true
@@ -804,7 +765,6 @@
                   "id": 67,
                   "name": "myAbstractMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -854,21 +814,18 @@
           "id": 68,
           "name": "TestAbstractClassImplementation",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 69,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 70,
                   "name": "new TestAbstractClassImplementation",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -892,7 +849,6 @@
               "id": 71,
               "name": "myAbstractProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -916,7 +872,6 @@
               "id": 72,
               "name": "myAbstractMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -933,7 +888,6 @@
                   "id": 73,
                   "name": "myAbstractMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -993,7 +947,6 @@
           "id": 22,
           "name": "TestClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -1025,7 +978,6 @@
               "id": 26,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -1040,7 +992,6 @@
                   "id": 27,
                   "name": "new TestClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1062,7 +1013,6 @@
               "id": 29,
               "name": "privateProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -1094,7 +1044,6 @@
               "id": 28,
               "name": "publicProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1123,7 +1072,6 @@
               "id": 23,
               "name": "staticProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -1153,7 +1101,6 @@
               "id": 36,
               "name": "arrowMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1168,7 +1115,6 @@
                   "id": 37,
                   "name": "arrowMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1189,7 +1135,6 @@
               "id": 34,
               "name": "privateMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -1206,7 +1151,6 @@
                   "id": 35,
                   "name": "privateMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1227,7 +1171,6 @@
               "id": 32,
               "name": "protectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -1244,7 +1187,6 @@
                   "id": 33,
                   "name": "protectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1265,7 +1207,6 @@
               "id": 30,
               "name": "publicMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -1282,7 +1223,6 @@
                   "id": 31,
                   "name": "publicMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1303,7 +1243,6 @@
               "id": 24,
               "name": "staticMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -1320,7 +1259,6 @@
                   "id": 25,
                   "name": "staticMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1412,7 +1350,6 @@
           "id": 38,
           "name": "TestSubClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -1444,7 +1381,6 @@
               "id": 42,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -1459,7 +1395,6 @@
                   "id": 43,
                   "name": "new TestSubClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1474,7 +1409,6 @@
                       "id": 44,
                       "name": "p1",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1493,7 +1427,6 @@
                       "id": 45,
                       "name": "p2",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1512,7 +1445,6 @@
                       "id": 46,
                       "name": "p3",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1531,7 +1463,6 @@
                       "id": 47,
                       "name": "p4",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1569,7 +1500,6 @@
               "id": 52,
               "name": "p3",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1590,7 +1520,6 @@
               "id": 53,
               "name": "p4",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1611,7 +1540,6 @@
               "id": 56,
               "name": "publicProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1645,7 +1573,6 @@
               "id": 39,
               "name": "staticProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -1680,7 +1607,6 @@
               "id": 57,
               "name": "arrowMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1695,7 +1621,6 @@
                   "id": 58,
                   "name": "arrowMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1726,7 +1651,6 @@
               "id": 54,
               "name": "mergedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1741,7 +1665,6 @@
                   "id": 55,
                   "name": "mergedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1762,7 +1685,6 @@
               "id": 50,
               "name": "protectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -1779,7 +1701,6 @@
                   "id": 51,
                   "name": "protectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1810,7 +1731,6 @@
               "id": 48,
               "name": "publicMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -1827,7 +1747,6 @@
                   "id": 49,
                   "name": "publicMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1858,7 +1777,6 @@
               "id": 40,
               "name": "staticMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -1875,7 +1793,6 @@
                   "id": 41,
                   "name": "staticMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1962,21 +1879,18 @@
           "id": 81,
           "name": "Ts38PrivateFields",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 82,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 83,
                   "name": "new Ts38PrivateFields",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -1990,7 +1904,6 @@
               "id": 84,
               "name": "#foo",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -2044,7 +1957,6 @@
           "id": 90,
           "name": "AbstractMe",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -2060,7 +1972,6 @@
               "id": 91,
               "name": "__type",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2075,7 +1986,6 @@
                   "id": 92,
                   "name": "__type",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {
                     "isAbstract": true
                   },
@@ -2129,14 +2039,12 @@
       "id": 93,
       "name": "constructor-properties",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 94,
           "name": "Vector2",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2151,7 +2059,6 @@
               "id": 95,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2166,14 +2073,12 @@
                   "id": 96,
                   "name": "new Vector2",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 97,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2192,7 +2097,6 @@
                       "id": 98,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2211,7 +2115,6 @@
                       "id": 99,
                       "name": "name",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2239,7 +2142,6 @@
               "id": 102,
               "name": "name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isReadonly": true
               },
@@ -2260,7 +2162,6 @@
               "id": 100,
               "name": "x",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2281,7 +2182,6 @@
               "id": 101,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2335,7 +2235,6 @@
           "id": 103,
           "name": "Vector3",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2350,7 +2249,6 @@
               "id": 104,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2365,14 +2263,12 @@
                   "id": 105,
                   "name": "new Vector3",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 106,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2391,7 +2287,6 @@
                       "id": 107,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2410,7 +2305,6 @@
                       "id": 108,
                       "name": "z",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2429,7 +2323,6 @@
                       "id": 109,
                       "name": "name",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2467,7 +2360,6 @@
               "id": 112,
               "name": "name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isReadonly": true
               },
@@ -2493,7 +2385,6 @@
               "id": 113,
               "name": "x",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2519,7 +2410,6 @@
               "id": 110,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2545,7 +2435,6 @@
               "id": 111,
               "name": "z",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2619,14 +2508,12 @@
       "id": 114,
       "name": "decorators",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 128,
           "name": "DecoratedClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2641,14 +2528,12 @@
               "id": 129,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 130,
                   "name": "new DecoratedClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2662,7 +2547,6 @@
               "id": 131,
               "name": "decoratedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -2677,7 +2561,6 @@
                   "id": 132,
                   "name": "decoratedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2722,7 +2605,6 @@
           "id": 115,
           "name": "decoratorAtom",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2737,7 +2619,6 @@
               "id": 116,
               "name": "decoratorAtom",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2752,7 +2633,6 @@
                   "id": 117,
                   "name": "target",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2765,7 +2645,6 @@
                   "id": 118,
                   "name": "propertyKey",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "union",
@@ -2785,7 +2664,6 @@
                   "id": 119,
                   "name": "descriptor",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2812,7 +2690,6 @@
           "id": 123,
           "name": "decoratorWithOptions",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2827,7 +2704,6 @@
               "id": 124,
               "name": "decoratorWithOptions",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2842,7 +2718,6 @@
                   "id": 125,
                   "name": "options",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2858,14 +2733,12 @@
                       "id": 126,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 127,
                           "name": "name",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -2922,7 +2795,6 @@
           "id": 120,
           "name": "decoratorWithParam",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2937,7 +2809,6 @@
               "id": 121,
               "name": "decoratorWithParam",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2952,7 +2823,6 @@
                   "id": 122,
                   "name": "value",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3007,28 +2877,24 @@
       "id": 160,
       "name": "events",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 161,
           "name": "EventDispatcher",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 163,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 164,
                   "name": "new EventDispatcher",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -3042,7 +2908,6 @@
               "id": 162,
               "name": "EVENT_CLICK",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -3114,14 +2979,12 @@
       "id": 133,
       "name": "events-overloads",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 134,
           "name": "Test",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -3147,7 +3010,6 @@
               "id": 135,
               "name": "on",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -3180,7 +3042,6 @@
                   "id": 136,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3195,7 +3056,6 @@
                       "id": 137,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3214,7 +3074,6 @@
                       "id": 138,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3230,7 +3089,6 @@
                           "id": 139,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3245,14 +3103,12 @@
                               "id": 140,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 141,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3279,7 +3135,6 @@
                   "id": 142,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3294,7 +3149,6 @@
                       "id": 143,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3313,7 +3167,6 @@
                       "id": 144,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3329,7 +3182,6 @@
                           "id": 145,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3344,14 +3196,12 @@
                               "id": 146,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 147,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3378,7 +3228,6 @@
                   "id": 148,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3393,7 +3242,6 @@
                       "id": 149,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3412,7 +3260,6 @@
                       "id": 150,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3428,7 +3275,6 @@
                           "id": 151,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3443,14 +3289,12 @@
                               "id": 152,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 153,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3477,7 +3321,6 @@
                   "id": 154,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3492,7 +3335,6 @@
                       "id": 155,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3511,7 +3353,6 @@
                       "id": 156,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3527,7 +3368,6 @@
                           "id": 157,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3542,14 +3382,12 @@
                               "id": 158,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 159,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3614,14 +3452,12 @@
       "id": 165,
       "name": "generic-class",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 166,
           "name": "GenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -3636,7 +3472,6 @@
               "id": 167,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -3651,7 +3486,6 @@
                   "id": 168,
                   "name": "new GenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3666,7 +3500,6 @@
                       "id": 169,
                       "name": "T",
                       "kind": 131072,
-                      "kindString": "Type parameter",
                       "flags": {}
                     }
                   ],
@@ -3675,7 +3508,6 @@
                       "id": 170,
                       "name": "value",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3711,7 +3543,6 @@
               "id": 171,
               "name": "value",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3741,7 +3572,6 @@
               "id": 172,
               "name": "values",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3774,7 +3604,6 @@
               "id": 173,
               "name": "getValue",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -3789,7 +3618,6 @@
                   "id": 174,
                   "name": "getValue",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3853,7 +3681,6 @@
               "id": 175,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "comment": {
                 "summary": [
@@ -3877,7 +3704,6 @@
           "id": 176,
           "name": "NonGenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -3892,7 +3718,6 @@
               "id": 177,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -3907,7 +3732,6 @@
                   "id": 178,
                   "name": "new NonGenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3922,7 +3746,6 @@
                       "id": 179,
                       "name": "value",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3960,7 +3783,6 @@
               "id": 180,
               "name": "value",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3994,7 +3816,6 @@
               "id": 181,
               "name": "values",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -4031,7 +3852,6 @@
               "id": 182,
               "name": "getValue",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -4046,7 +3866,6 @@
                   "id": 183,
                   "name": "getValue",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -4151,28 +3970,24 @@
       "id": 184,
       "name": "getter-setter",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 185,
           "name": "GetterSetter",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 186,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 187,
                   "name": "new GetterSetter",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4186,7 +4001,6 @@
               "id": 188,
               "name": "_name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -4207,7 +4021,6 @@
               "id": 189,
               "name": "name",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4227,7 +4040,6 @@
                 "id": 190,
                 "name": "name",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -4238,14 +4050,12 @@
                 "id": 191,
                 "name": "name",
                 "kind": 1048576,
-                "kindString": "Set signature",
                 "flags": {},
                 "parameters": [
                   {
                     "id": 192,
                     "name": "value",
                     "kind": 32768,
-                    "kindString": "Parameter",
                     "flags": {},
                     "type": {
                       "type": "intrinsic",
@@ -4263,7 +4073,6 @@
               "id": 193,
               "name": "readOnlyName",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4277,7 +4086,6 @@
                 "id": 194,
                 "name": "readOnlyName",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -4289,7 +4097,6 @@
               "id": 195,
               "name": "writeOnlyName",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4303,14 +4110,12 @@
                 "id": 196,
                 "name": "writeOnlyName",
                 "kind": 1048576,
-                "kindString": "Set signature",
                 "flags": {},
                 "parameters": [
                   {
                     "id": 197,
                     "name": "value",
                     "kind": 32768,
-                    "kindString": "Parameter",
                     "flags": {},
                     "type": {
                       "type": "intrinsic",
@@ -4378,14 +4183,12 @@
       "id": 198,
       "name": "this",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 199,
           "name": "ChainClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -4400,14 +4203,12 @@
               "id": 200,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 201,
                   "name": "new ChainClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4421,7 +4222,6 @@
               "id": 202,
               "name": "chain",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -4438,7 +4238,6 @@
                   "id": 203,
                   "name": "chain",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -4502,35 +4301,30 @@
       "id": 204,
       "name": "type-operator",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 210,
           "name": "GenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 211,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 212,
                   "name": "new GenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "typeParameter": [
                     {
                       "id": 213,
                       "name": "T",
                       "kind": 131072,
-                      "kindString": "Type parameter",
                       "flags": {},
                       "type": {
                         "type": "typeOperator",
@@ -4562,7 +4356,6 @@
               "id": 214,
               "name": "c",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -4606,7 +4399,6 @@
               "id": 215,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "typeOperator",
@@ -4624,7 +4416,6 @@
           "id": 205,
           "name": "TestClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -4656,14 +4447,12 @@
               "id": 206,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 207,
                   "name": "new TestClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4677,7 +4466,6 @@
               "id": 208,
               "name": "a",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -4696,7 +4484,6 @@
               "id": 209,
               "name": "b",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json
index b7e1e123a..0c98222fe 100644
--- a/src/test/converter/class/specs.json
+++ b/src/test/converter/class/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "access",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 8,
           "name": "PrivateClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isPrivate": true
           },
@@ -32,7 +30,6 @@
               "id": 13,
               "name": "fakePrivateProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -61,7 +58,6 @@
               "id": 14,
               "name": "fakeProtectedProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -90,7 +86,6 @@
               "id": 9,
               "name": "privateStaticGetter",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {
                 "isPrivate": true,
                 "isStatic": true
@@ -107,7 +102,6 @@
                 "id": 10,
                 "name": "privateStaticGetter",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -119,7 +113,6 @@
               "id": 15,
               "name": "fakePrivateMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -136,7 +129,6 @@
                   "id": 16,
                   "name": "fakePrivateMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {
                     "isPrivate": true
                   },
@@ -159,7 +151,6 @@
               "id": 17,
               "name": "fakeProtectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -176,7 +167,6 @@
                   "id": 18,
                   "name": "fakeProtectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {
                     "isProtected": true
                   },
@@ -199,7 +189,6 @@
               "id": 19,
               "name": "privateArrow",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -216,7 +205,6 @@
                   "id": 20,
                   "name": "privateArrow",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -262,7 +250,6 @@
           "id": 6,
           "name": "fakePrivateVariable",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isPrivate": true,
             "isConst": true
@@ -293,7 +280,6 @@
           "id": 7,
           "name": "fakeProtectedVariable",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isProtected": true,
             "isConst": true
@@ -324,7 +310,6 @@
           "id": 2,
           "name": "fakePrivateFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {
             "isPrivate": true
           },
@@ -341,7 +326,6 @@
               "id": 3,
               "name": "fakePrivateFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {
                 "isPrivate": true
               },
@@ -364,7 +348,6 @@
           "id": 4,
           "name": "fakeProtectedFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {
             "isProtected": true
           },
@@ -381,7 +364,6 @@
               "id": 5,
               "name": "fakeProtectedFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {
                 "isProtected": true
               },
@@ -436,21 +418,18 @@
       "id": 21,
       "name": "class",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 59,
           "name": "TestSubClass",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "children": [
             {
               "id": 60,
               "name": "staticMergedMethod",
               "kind": 64,
-              "kindString": "Function",
               "flags": {},
               "sources": [
                 {
@@ -465,7 +444,6 @@
                   "id": 61,
                   "name": "staticMergedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -516,7 +494,6 @@
           "id": 85,
           "name": "Abstract",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isAbstract": true
           },
@@ -525,14 +502,12 @@
               "id": 86,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 87,
                   "name": "new Abstract",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -546,7 +521,6 @@
               "id": 88,
               "name": "needsImpl",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isAbstract": true
               },
@@ -563,7 +537,6 @@
                   "id": 89,
                   "name": "needsImpl",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -600,21 +573,18 @@
           "id": 74,
           "name": "ComputedNames",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 75,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 76,
                   "name": "new ComputedNames",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -628,7 +598,6 @@
               "id": 79,
               "name": "[toStringTag]",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -648,7 +617,6 @@
               "id": 80,
               "name": "literal",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -668,7 +636,6 @@
               "id": 77,
               "name": "literal2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -688,7 +655,6 @@
               "id": 78,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -735,7 +701,6 @@
           "id": 62,
           "name": "TestAbstractClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {
             "isAbstract": true
           },
@@ -744,14 +709,12 @@
               "id": 63,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 64,
                   "name": "new TestAbstractClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -765,7 +728,6 @@
               "id": 65,
               "name": "myAbstractProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isAbstract": true
               },
@@ -786,7 +748,6 @@
               "id": 66,
               "name": "myAbstractMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true,
                 "isAbstract": true
@@ -804,7 +765,6 @@
                   "id": 67,
                   "name": "myAbstractMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -854,21 +814,18 @@
           "id": 68,
           "name": "TestAbstractClassImplementation",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 69,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 70,
                   "name": "new TestAbstractClassImplementation",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -892,7 +849,6 @@
               "id": 71,
               "name": "myAbstractProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -916,7 +872,6 @@
               "id": 72,
               "name": "myAbstractMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -933,7 +888,6 @@
                   "id": 73,
                   "name": "myAbstractMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -993,7 +947,6 @@
           "id": 22,
           "name": "TestClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -1025,7 +978,6 @@
               "id": 26,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -1040,7 +992,6 @@
                   "id": 27,
                   "name": "new TestClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1062,7 +1013,6 @@
               "id": 29,
               "name": "privateProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -1094,7 +1044,6 @@
               "id": 28,
               "name": "publicProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1123,7 +1072,6 @@
               "id": 23,
               "name": "staticProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -1153,7 +1101,6 @@
               "id": 36,
               "name": "arrowMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1168,7 +1115,6 @@
                   "id": 37,
                   "name": "arrowMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1189,7 +1135,6 @@
               "id": 34,
               "name": "privateMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPrivate": true
               },
@@ -1206,7 +1151,6 @@
                   "id": 35,
                   "name": "privateMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1227,7 +1171,6 @@
               "id": 32,
               "name": "protectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -1244,7 +1187,6 @@
                   "id": 33,
                   "name": "protectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1265,7 +1207,6 @@
               "id": 30,
               "name": "publicMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -1282,7 +1223,6 @@
                   "id": 31,
                   "name": "publicMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1303,7 +1243,6 @@
               "id": 24,
               "name": "staticMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -1320,7 +1259,6 @@
                   "id": 25,
                   "name": "staticMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1408,7 +1346,6 @@
           "id": 38,
           "name": "TestSubClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -1440,7 +1377,6 @@
               "id": 42,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -1455,7 +1391,6 @@
                   "id": 43,
                   "name": "new TestSubClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1470,7 +1405,6 @@
                       "id": 44,
                       "name": "p1",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1489,7 +1423,6 @@
                       "id": 45,
                       "name": "p2",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1508,7 +1441,6 @@
                       "id": 46,
                       "name": "p3",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1527,7 +1459,6 @@
                       "id": 47,
                       "name": "p4",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1565,7 +1496,6 @@
               "id": 52,
               "name": "p3",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1586,7 +1516,6 @@
               "id": 53,
               "name": "p4",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1607,7 +1536,6 @@
               "id": 56,
               "name": "publicProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -1641,7 +1569,6 @@
               "id": 39,
               "name": "staticProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -1676,7 +1603,6 @@
               "id": 57,
               "name": "arrowMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1691,7 +1617,6 @@
                   "id": 58,
                   "name": "arrowMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1722,7 +1647,6 @@
               "id": 54,
               "name": "mergedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -1737,7 +1661,6 @@
                   "id": 55,
                   "name": "mergedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1758,7 +1681,6 @@
               "id": 50,
               "name": "protectedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isProtected": true
               },
@@ -1775,7 +1697,6 @@
                   "id": 51,
                   "name": "protectedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1806,7 +1727,6 @@
               "id": 48,
               "name": "publicMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -1823,7 +1743,6 @@
                   "id": 49,
                   "name": "publicMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1854,7 +1773,6 @@
               "id": 40,
               "name": "staticMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -1871,7 +1789,6 @@
                   "id": 41,
                   "name": "staticMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1958,21 +1875,18 @@
           "id": 81,
           "name": "Ts38PrivateFields",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 82,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 83,
                   "name": "new Ts38PrivateFields",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -1986,7 +1900,6 @@
               "id": 84,
               "name": "#foo",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -2040,7 +1953,6 @@
           "id": 90,
           "name": "AbstractMe",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -2056,7 +1968,6 @@
               "id": 91,
               "name": "__type",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2071,7 +1982,6 @@
                   "id": 92,
                   "name": "__type",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {
                     "isAbstract": true
                   },
@@ -2125,14 +2035,12 @@
       "id": 93,
       "name": "constructor-properties",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 94,
           "name": "Vector2",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2147,7 +2055,6 @@
               "id": 95,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2162,14 +2069,12 @@
                   "id": 96,
                   "name": "new Vector2",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 97,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2188,7 +2093,6 @@
                       "id": 98,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2207,7 +2111,6 @@
                       "id": 99,
                       "name": "name",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2235,7 +2138,6 @@
               "id": 102,
               "name": "name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isReadonly": true
               },
@@ -2256,7 +2158,6 @@
               "id": 100,
               "name": "x",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2277,7 +2178,6 @@
               "id": 101,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2331,7 +2231,6 @@
           "id": 103,
           "name": "Vector3",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2346,7 +2245,6 @@
               "id": 104,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -2361,14 +2259,12 @@
                   "id": 105,
                   "name": "new Vector3",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 106,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2387,7 +2283,6 @@
                       "id": 107,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2406,7 +2301,6 @@
                       "id": 108,
                       "name": "z",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2425,7 +2319,6 @@
                       "id": 109,
                       "name": "name",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -2463,7 +2356,6 @@
               "id": 112,
               "name": "name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isReadonly": true
               },
@@ -2489,7 +2381,6 @@
               "id": 113,
               "name": "x",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2515,7 +2406,6 @@
               "id": 110,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2541,7 +2431,6 @@
               "id": 111,
               "name": "z",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPublic": true
               },
@@ -2615,14 +2504,12 @@
       "id": 114,
       "name": "decorators",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 128,
           "name": "DecoratedClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -2637,14 +2524,12 @@
               "id": 129,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 130,
                   "name": "new DecoratedClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2658,7 +2543,6 @@
               "id": 131,
               "name": "decoratedMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -2673,7 +2557,6 @@
                   "id": 132,
                   "name": "decoratedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2718,7 +2601,6 @@
           "id": 115,
           "name": "decoratorAtom",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2733,7 +2615,6 @@
               "id": 116,
               "name": "decoratorAtom",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2748,7 +2629,6 @@
                   "id": 117,
                   "name": "target",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2761,7 +2641,6 @@
                   "id": 118,
                   "name": "propertyKey",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "union",
@@ -2781,7 +2660,6 @@
                   "id": 119,
                   "name": "descriptor",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -2808,7 +2686,6 @@
           "id": 123,
           "name": "decoratorWithOptions",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2823,7 +2700,6 @@
               "id": 124,
               "name": "decoratorWithOptions",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2838,7 +2714,6 @@
                   "id": 125,
                   "name": "options",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2854,14 +2729,12 @@
                       "id": 126,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 127,
                           "name": "name",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -2918,7 +2791,6 @@
           "id": 120,
           "name": "decoratorWithParam",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2933,7 +2805,6 @@
               "id": 121,
               "name": "decoratorWithParam",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2948,7 +2819,6 @@
                   "id": 122,
                   "name": "value",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3003,28 +2873,24 @@
       "id": 160,
       "name": "events",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 161,
           "name": "EventDispatcher",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 163,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 164,
                   "name": "new EventDispatcher",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -3038,7 +2904,6 @@
               "id": 162,
               "name": "EVENT_CLICK",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -3110,14 +2975,12 @@
       "id": 133,
       "name": "events-overloads",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 134,
           "name": "Test",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -3143,7 +3006,6 @@
               "id": 135,
               "name": "on",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -3176,7 +3038,6 @@
                   "id": 136,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3191,7 +3052,6 @@
                       "id": 137,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3210,7 +3070,6 @@
                       "id": 138,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3226,7 +3085,6 @@
                           "id": 139,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3241,14 +3099,12 @@
                               "id": 140,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 141,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3275,7 +3131,6 @@
                   "id": 142,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3290,7 +3145,6 @@
                       "id": 143,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3309,7 +3163,6 @@
                       "id": 144,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3325,7 +3178,6 @@
                           "id": 145,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3340,14 +3192,12 @@
                               "id": 146,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 147,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3374,7 +3224,6 @@
                   "id": 148,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3389,7 +3238,6 @@
                       "id": 149,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3408,7 +3256,6 @@
                       "id": 150,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3424,7 +3271,6 @@
                           "id": 151,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3439,14 +3285,12 @@
                               "id": 152,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 153,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3473,7 +3317,6 @@
                   "id": 154,
                   "name": "on",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3488,7 +3331,6 @@
                       "id": 155,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3507,7 +3349,6 @@
                       "id": 156,
                       "name": "handler",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3523,7 +3364,6 @@
                           "id": 157,
                           "name": "__type",
                           "kind": 65536,
-                          "kindString": "Type literal",
                           "flags": {},
                           "sources": [
                             {
@@ -3538,14 +3378,12 @@
                               "id": 158,
                               "name": "__type",
                               "kind": 4096,
-                              "kindString": "Call signature",
                               "flags": {},
                               "parameters": [
                                 {
                                   "id": 159,
                                   "name": "e",
                                   "kind": 32768,
-                                  "kindString": "Parameter",
                                   "flags": {},
                                   "type": {
                                     "type": "intrinsic",
@@ -3610,14 +3448,12 @@
       "id": 165,
       "name": "generic-class",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 166,
           "name": "GenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -3632,7 +3468,6 @@
               "id": 167,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -3647,7 +3482,6 @@
                   "id": 168,
                   "name": "new GenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3662,7 +3496,6 @@
                       "id": 169,
                       "name": "T",
                       "kind": 131072,
-                      "kindString": "Type parameter",
                       "flags": {}
                     }
                   ],
@@ -3671,7 +3504,6 @@
                       "id": 170,
                       "name": "value",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3707,7 +3539,6 @@
               "id": 171,
               "name": "value",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3737,7 +3568,6 @@
               "id": 172,
               "name": "values",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3770,7 +3600,6 @@
               "id": 173,
               "name": "getValue",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -3785,7 +3614,6 @@
                   "id": 174,
                   "name": "getValue",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3849,7 +3677,6 @@
               "id": 175,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "comment": {
                 "summary": [
@@ -3873,7 +3700,6 @@
           "id": 176,
           "name": "NonGenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -3888,7 +3714,6 @@
               "id": 177,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -3903,7 +3728,6 @@
                   "id": 178,
                   "name": "new NonGenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -3918,7 +3742,6 @@
                       "id": 179,
                       "name": "value",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -3956,7 +3779,6 @@
               "id": 180,
               "name": "value",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -3990,7 +3812,6 @@
               "id": 181,
               "name": "values",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isProtected": true
               },
@@ -4027,7 +3848,6 @@
               "id": 182,
               "name": "getValue",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -4042,7 +3862,6 @@
                   "id": 183,
                   "name": "getValue",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -4147,28 +3966,24 @@
       "id": 184,
       "name": "getter-setter",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 185,
           "name": "GetterSetter",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 186,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 187,
                   "name": "new GetterSetter",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4182,7 +3997,6 @@
               "id": 188,
               "name": "_name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -4203,7 +4017,6 @@
               "id": 189,
               "name": "name",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4223,7 +4036,6 @@
                 "id": 190,
                 "name": "name",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -4234,14 +4046,12 @@
                 "id": 191,
                 "name": "name",
                 "kind": 1048576,
-                "kindString": "Set signature",
                 "flags": {},
                 "parameters": [
                   {
                     "id": 192,
                     "name": "value",
                     "kind": 32768,
-                    "kindString": "Parameter",
                     "flags": {},
                     "type": {
                       "type": "intrinsic",
@@ -4259,7 +4069,6 @@
               "id": 193,
               "name": "readOnlyName",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4273,7 +4082,6 @@
                 "id": 194,
                 "name": "readOnlyName",
                 "kind": 524288,
-                "kindString": "Get signature",
                 "flags": {},
                 "type": {
                   "type": "intrinsic",
@@ -4285,7 +4093,6 @@
               "id": 195,
               "name": "writeOnlyName",
               "kind": 262144,
-              "kindString": "Accessor",
               "flags": {},
               "sources": [
                 {
@@ -4299,14 +4106,12 @@
                 "id": 196,
                 "name": "writeOnlyName",
                 "kind": 1048576,
-                "kindString": "Set signature",
                 "flags": {},
                 "parameters": [
                   {
                     "id": 197,
                     "name": "value",
                     "kind": 32768,
-                    "kindString": "Parameter",
                     "flags": {},
                     "type": {
                       "type": "intrinsic",
@@ -4374,14 +4179,12 @@
       "id": 198,
       "name": "this",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 199,
           "name": "ChainClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -4396,14 +4199,12 @@
               "id": 200,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 201,
                   "name": "new ChainClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4417,7 +4218,6 @@
               "id": 202,
               "name": "chain",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -4434,7 +4234,6 @@
                   "id": 203,
                   "name": "chain",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -4498,35 +4297,30 @@
       "id": 204,
       "name": "type-operator",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 210,
           "name": "GenericClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 211,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 212,
                   "name": "new GenericClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "typeParameter": [
                     {
                       "id": 213,
                       "name": "T",
                       "kind": 131072,
-                      "kindString": "Type parameter",
                       "flags": {},
                       "type": {
                         "type": "typeOperator",
@@ -4558,7 +4352,6 @@
               "id": 214,
               "name": "c",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -4602,7 +4395,6 @@
               "id": 215,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "typeOperator",
@@ -4620,7 +4412,6 @@
           "id": 205,
           "name": "TestClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -4652,14 +4443,12 @@
               "id": 206,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 207,
                   "name": "new TestClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -4673,7 +4462,6 @@
               "id": 208,
               "name": "a",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -4692,7 +4480,6 @@
               "id": 209,
               "name": "b",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json
index a3ee5fc33..c27b5a777 100644
--- a/src/test/converter/comment/specs.json
+++ b/src/test/converter/comment/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "comment",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "CommentedClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -49,14 +47,12 @@
               "id": 3,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 4,
                   "name": "new CommentedClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -70,7 +66,6 @@
               "id": 5,
               "name": "prop",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -97,14 +92,20 @@
               "id": 19,
               "name": "mixedHidden",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
+              "sources": [
+                {
+                  "fileName": "comment.ts",
+                  "line": 77,
+                  "character": 4,
+                  "url": "typedoc://comment.ts#L77"
+                }
+              ],
               "signatures": [
                 {
                   "id": 22,
                   "name": "mixedHidden",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -119,7 +120,6 @@
                       "id": 23,
                       "name": "arg1",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -130,7 +130,6 @@
                       "id": 24,
                       "name": "arg2",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -197,7 +196,6 @@
       "id": 26,
       "name": "comment2",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "comment": {
         "summary": [
@@ -220,7 +218,6 @@
           "id": 27,
           "name": "multiply",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -235,14 +232,12 @@
               "id": 28,
               "name": "multiply",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 29,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -253,7 +248,6 @@
                   "id": 30,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -290,7 +284,6 @@
       "id": 31,
       "name": "comment3",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "comment": {
         "summary": [
@@ -313,7 +306,6 @@
           "id": 32,
           "name": "multiply",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -328,14 +320,12 @@
               "id": 33,
               "name": "multiply",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 34,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -346,7 +336,6 @@
                   "id": 35,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -383,7 +372,6 @@
       "id": 36,
       "name": "comment4",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "comment": {
         "summary": [
@@ -402,7 +390,6 @@
           "id": 37,
           "name": "multiply",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -417,14 +404,12 @@
               "id": 38,
               "name": "multiply",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 39,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -435,7 +420,6 @@
                   "id": 40,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
diff --git a/src/test/converter/declaration/specs.json b/src/test/converter/declaration/specs.json
index 14f233239..2ffd5f610 100644
--- a/src/test/converter/declaration/specs.json
+++ b/src/test/converter/declaration/specs.json
@@ -8,28 +8,24 @@
       "id": 1,
       "name": "declaration",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "Decl",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 3,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 4,
                   "name": "new Decl",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -43,7 +39,6 @@
               "id": 5,
               "name": "prop",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -86,7 +81,6 @@
           "id": 6,
           "name": "x",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -131,28 +125,24 @@
       "id": 7,
       "name": "export-declaration",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 8,
           "name": "Exported",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 9,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 10,
                   "name": "new Exported",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -184,21 +174,18 @@
           "id": 11,
           "name": "NotExported",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 12,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 13,
                   "name": "new NotExported",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -249,14 +236,12 @@
       "id": 14,
       "name": "external",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 15,
           "name": "ActionSet",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
diff --git a/src/test/converter/enum/specs.json b/src/test/converter/enum/specs.json
index 0492e2703..a14386276 100644
--- a/src/test/converter/enum/specs.json
+++ b/src/test/converter/enum/specs.json
@@ -2,14 +2,12 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 9,
       "name": "ModuleEnum",
       "kind": 4,
-      "kindString": "Namespace",
       "flags": {},
       "comment": {
         "summary": [
@@ -24,7 +22,6 @@
           "id": 12,
           "name": "enumValue",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "comment": {
             "summary": [
@@ -51,7 +48,6 @@
           "id": 10,
           "name": "enumFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -66,7 +62,6 @@
               "id": 11,
               "name": "enumFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -117,7 +112,6 @@
       "id": 13,
       "name": "ConstEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {
         "isConst": true
       },
@@ -134,7 +128,6 @@
           "id": 14,
           "name": "a",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "sources": [
             {
@@ -153,7 +146,6 @@
           "id": 15,
           "name": "b",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "sources": [
             {
@@ -191,7 +183,6 @@
       "id": 5,
       "name": "ModuleEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {},
       "comment": {
         "summary": [
@@ -206,7 +197,6 @@
           "id": 6,
           "name": "EnumValue1",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -233,7 +223,6 @@
           "id": 7,
           "name": "EnumValue2",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -260,7 +249,6 @@
           "id": 8,
           "name": "EnumValue3",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -313,7 +301,6 @@
       "id": 1,
       "name": "SimpleEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {},
       "comment": {
         "summary": [
@@ -328,7 +315,6 @@
           "id": 2,
           "name": "EnumValue1",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -355,7 +341,6 @@
           "id": 3,
           "name": "EnumValue2",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -382,7 +367,6 @@
           "id": 4,
           "name": "EnumValue3",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
diff --git a/src/test/converter/enum/specs.nodoc.json b/src/test/converter/enum/specs.nodoc.json
index 0492e2703..a14386276 100644
--- a/src/test/converter/enum/specs.nodoc.json
+++ b/src/test/converter/enum/specs.nodoc.json
@@ -2,14 +2,12 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 9,
       "name": "ModuleEnum",
       "kind": 4,
-      "kindString": "Namespace",
       "flags": {},
       "comment": {
         "summary": [
@@ -24,7 +22,6 @@
           "id": 12,
           "name": "enumValue",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "comment": {
             "summary": [
@@ -51,7 +48,6 @@
           "id": 10,
           "name": "enumFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -66,7 +62,6 @@
               "id": 11,
               "name": "enumFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -117,7 +112,6 @@
       "id": 13,
       "name": "ConstEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {
         "isConst": true
       },
@@ -134,7 +128,6 @@
           "id": 14,
           "name": "a",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "sources": [
             {
@@ -153,7 +146,6 @@
           "id": 15,
           "name": "b",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "sources": [
             {
@@ -191,7 +183,6 @@
       "id": 5,
       "name": "ModuleEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {},
       "comment": {
         "summary": [
@@ -206,7 +197,6 @@
           "id": 6,
           "name": "EnumValue1",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -233,7 +223,6 @@
           "id": 7,
           "name": "EnumValue2",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -260,7 +249,6 @@
           "id": 8,
           "name": "EnumValue3",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -313,7 +301,6 @@
       "id": 1,
       "name": "SimpleEnum",
       "kind": 8,
-      "kindString": "Enumeration",
       "flags": {},
       "comment": {
         "summary": [
@@ -328,7 +315,6 @@
           "id": 2,
           "name": "EnumValue1",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -355,7 +341,6 @@
           "id": 3,
           "name": "EnumValue2",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
@@ -382,7 +367,6 @@
           "id": 4,
           "name": "EnumValue3",
           "kind": 16,
-          "kindString": "Enumeration Member",
           "flags": {},
           "comment": {
             "summary": [
diff --git a/src/test/converter/exports/specs.json b/src/test/converter/exports/specs.json
index 7efe65460..77ea2ccc7 100644
--- a/src/test/converter/exports/specs.json
+++ b/src/test/converter/exports/specs.json
@@ -8,14 +8,12 @@
       "id": 14,
       "name": "export",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 48,
           "name": "GH1453Helper",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -31,7 +29,6 @@
           "id": 41,
           "name": "Mod",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -47,7 +44,6 @@
           "id": 43,
           "name": "Mod2",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -71,7 +67,6 @@
           "id": 42,
           "name": "ModDefault",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -87,7 +82,6 @@
           "id": 47,
           "name": "ThisModule",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -103,7 +97,6 @@
           "id": 44,
           "name": "a",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -119,7 +112,6 @@
           "id": 45,
           "name": "b",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -143,7 +135,6 @@
           "id": 40,
           "name": "c",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -159,14 +150,12 @@
           "id": 20,
           "name": "GH1453",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "children": [
             {
               "id": 25,
               "name": "Foo",
               "kind": 4194304,
-              "kindString": "Type alias",
               "flags": {},
               "sources": [
                 {
@@ -186,7 +175,6 @@
               "id": 23,
               "name": "Member",
               "kind": 32,
-              "kindString": "Variable",
               "flags": {
                 "isConst": true
               },
@@ -208,7 +196,6 @@
               "id": 21,
               "name": "Module",
               "kind": 32,
-              "kindString": "Variable",
               "flags": {
                 "isConst": true
               },
@@ -231,7 +218,6 @@
               "id": 24,
               "name": "TypedMember",
               "kind": 32,
-              "kindString": "Variable",
               "flags": {
                 "isConst": true
               },
@@ -254,7 +240,6 @@
               "id": 22,
               "name": "TypedModule",
               "kind": 32,
-              "kindString": "Variable",
               "flags": {
                 "isConst": true
               },
@@ -304,7 +289,6 @@
           "id": 15,
           "name": "add",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -319,14 +303,12 @@
               "id": 16,
               "name": "add",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 17,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -337,7 +319,6 @@
                   "id": 18,
                   "name": "y",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -356,7 +337,6 @@
           "id": 26,
           "name": "default",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -371,14 +351,12 @@
               "id": 27,
               "name": "default",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 28,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -435,14 +413,12 @@
       "id": 1,
       "name": "export-assignment",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "export=",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -457,14 +433,12 @@
               "id": 3,
               "name": "export=",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 4,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -475,7 +449,6 @@
                   "id": 5,
                   "name": "y",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -512,14 +485,12 @@
       "id": 6,
       "name": "export-default",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 7,
           "name": "default",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -559,14 +530,12 @@
       "id": 8,
       "name": "export-with-local",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 13,
           "name": "x",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -588,7 +557,6 @@
           "id": 9,
           "name": "add",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -603,14 +571,12 @@
               "id": 10,
               "name": "add",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 11,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -621,7 +587,6 @@
                   "id": 12,
                   "name": "y",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -664,14 +629,12 @@
       "id": 29,
       "name": "mod",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 34,
           "name": "ThisModule",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "sources": [
             {
@@ -687,7 +650,6 @@
           "id": 31,
           "name": "b",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -711,7 +673,6 @@
           "id": 32,
           "name": "c",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -735,7 +696,6 @@
           "id": 35,
           "name": "GH1453Helper",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -754,7 +714,6 @@
           "id": 30,
           "name": "a",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -784,7 +743,6 @@
           "id": 36,
           "name": "default",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -799,7 +757,6 @@
               "id": 37,
               "name": "default",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -858,7 +815,6 @@
       "id": 38,
       "name": "no-doc-members",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "comment": {
         "summary": [
@@ -884,7 +840,6 @@
           "id": 39,
           "name": "abc",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
diff --git a/src/test/converter/exports/specs.nodoc.json b/src/test/converter/exports/specs.nodoc.json
index ad6c450ef..028922782 100644
--- a/src/test/converter/exports/specs.nodoc.json
+++ b/src/test/converter/exports/specs.nodoc.json
@@ -8,14 +8,12 @@
       "id": 14,
       "name": "export",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 43,
           "name": "Mod2",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -39,7 +37,6 @@
           "id": 45,
           "name": "b",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -82,14 +79,12 @@
       "id": 29,
       "name": "mod",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 31,
           "name": "b",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -113,7 +108,6 @@
           "id": 32,
           "name": "c",
           "kind": 8388608,
-          "kindString": "Reference",
           "flags": {},
           "comment": {
             "summary": [
@@ -137,7 +131,6 @@
           "id": 30,
           "name": "a",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -167,7 +160,6 @@
           "id": 36,
           "name": "default",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -182,7 +174,6 @@
               "id": 37,
               "name": "default",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -234,7 +225,6 @@
       "id": 38,
       "name": "no-doc-members",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "comment": {
         "summary": [
diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json
index 6e7ffd29e..6cd3fcff2 100644
--- a/src/test/converter/function/specs.json
+++ b/src/test/converter/function/specs.json
@@ -8,21 +8,18 @@
       "id": 1,
       "name": "function",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 80,
           "name": "merged",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "children": [
             {
               "id": 81,
               "name": "nsFn",
               "kind": 64,
-              "kindString": "Function",
               "flags": {},
               "sources": [
                 {
@@ -37,7 +34,6 @@
                   "id": 82,
                   "name": "nsFn",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -74,7 +70,6 @@
           "id": 55,
           "name": "moduleFunction",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "comment": {
             "summary": [
@@ -89,7 +84,6 @@
               "id": 60,
               "name": "functionVariable",
               "kind": 32,
-              "kindString": "Variable",
               "flags": {},
               "comment": {
                 "summary": [
@@ -116,7 +110,6 @@
               "id": 56,
               "name": "append",
               "kind": 64,
-              "kindString": "Function",
               "flags": {},
               "sources": [
                 {
@@ -131,7 +124,6 @@
                   "id": 57,
                   "name": "append",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -152,7 +144,6 @@
               "id": 58,
               "name": "prepend",
               "kind": 64,
-              "kindString": "Function",
               "flags": {},
               "sources": [
                 {
@@ -167,7 +158,6 @@
                   "id": 59,
                   "name": "prepend",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -219,21 +209,18 @@
           "id": 86,
           "name": "Predicates",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 93,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 94,
                   "name": "new Predicates",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -247,7 +234,6 @@
               "id": 97,
               "name": "assertString",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -262,7 +248,6 @@
                   "id": 98,
                   "name": "assertString",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "predicate",
@@ -280,7 +265,6 @@
               "id": 95,
               "name": "isString",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -295,7 +279,6 @@
                   "id": 96,
                   "name": "isString",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "predicate",
@@ -313,7 +296,6 @@
               "id": 90,
               "name": "assert",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -330,14 +312,12 @@
                   "id": 91,
                   "name": "assert",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 92,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -357,7 +337,6 @@
               "id": 87,
               "name": "isString",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isStatic": true
               },
@@ -374,14 +353,12 @@
                   "id": 88,
                   "name": "isString",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 89,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -432,7 +409,6 @@
           "id": 99,
           "name": "all",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -447,14 +423,20 @@
               "id": 100,
               "name": "all",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
+              "comment": {
+                "summary": [
+                  {
+                    "kind": "text",
+                    "text": "Returns true if fn returns true for every item in the iterator\n\nReturns true if the iterator is empty"
+                  }
+                ]
+              },
               "typeParameter": [
                 {
                   "id": 101,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -463,7 +445,6 @@
                   "id": 102,
                   "name": "fn",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reflection",
@@ -471,7 +452,6 @@
                       "id": 103,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -486,14 +466,12 @@
                           "id": 104,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "parameters": [
                             {
                               "id": 105,
                               "name": "item",
                               "kind": 32768,
-                              "kindString": "Parameter",
                               "flags": {},
                               "type": {
                                 "type": "reference",
@@ -515,7 +493,6 @@
                   "id": 106,
                   "name": "iterator",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -541,14 +518,20 @@
               "id": 107,
               "name": "all",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
+              "comment": {
+                "summary": [
+                  {
+                    "kind": "text",
+                    "text": "Returns true if fn returns true for every item in the iterator\n\nReturns true if the iterator is empty"
+                  }
+                ]
+              },
               "typeParameter": [
                 {
                   "id": 108,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -557,7 +540,6 @@
                   "id": 109,
                   "name": "fn",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reflection",
@@ -565,7 +547,6 @@
                       "id": 110,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -580,14 +561,12 @@
                           "id": 111,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "parameters": [
                             {
                               "id": 112,
                               "name": "item",
                               "kind": 32768,
-                              "kindString": "Parameter",
                               "flags": {},
                               "type": {
                                 "type": "reference",
@@ -612,7 +591,6 @@
                   "id": 113,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "sources": [
                     {
@@ -627,14 +605,12 @@
                       "id": 114,
                       "name": "__type",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 115,
                           "name": "iterator",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -666,7 +642,6 @@
           "id": 67,
           "name": "assertIsNonNull",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -681,7 +656,6 @@
               "id": 68,
               "name": "assertIsNonNull",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -696,7 +670,6 @@
                   "id": 69,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -705,7 +678,6 @@
                   "id": 70,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "union",
@@ -744,7 +716,6 @@
           "id": 61,
           "name": "assertionFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -759,7 +730,6 @@
               "id": 62,
               "name": "assertionFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -774,7 +744,6 @@
                   "id": 63,
                   "name": "condition",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -802,7 +771,6 @@
           "id": 75,
           "name": "boolOrUndef",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -817,14 +785,12 @@
               "id": 76,
               "name": "boolOrUndef",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 77,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -852,7 +818,6 @@
           "id": 64,
           "name": "checkerFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -867,7 +832,6 @@
               "id": 65,
               "name": "checkerFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -882,7 +846,6 @@
                   "id": 66,
                   "name": "anything",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -906,7 +869,6 @@
           "id": 2,
           "name": "exportedFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -921,7 +883,6 @@
               "id": 3,
               "name": "exportedFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -942,7 +903,6 @@
           "id": 23,
           "name": "functionWithADestructuredParameter",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -957,7 +917,6 @@
               "id": 24,
               "name": "functionWithADestructuredParameter",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -983,7 +942,6 @@
                   "id": 25,
                   "name": "destructuredParam",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -999,14 +957,12 @@
                       "id": 26,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 29,
                           "name": "paramA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -1039,7 +995,6 @@
                           "id": 28,
                           "name": "paramG",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -1066,7 +1021,6 @@
                           "id": 27,
                           "name": "paramZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -1123,7 +1077,6 @@
           "id": 38,
           "name": "functionWithADestructuredParameterAndAnExtraParamDirective",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1138,7 +1091,6 @@
               "id": 39,
               "name": "functionWithADestructuredParameterAndAnExtraParamDirective",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1180,7 +1132,6 @@
                   "id": 40,
                   "name": "__namedParameters",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reflection",
@@ -1188,14 +1139,12 @@
                       "id": 41,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 44,
                           "name": "paramA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1216,7 +1165,6 @@
                           "id": 43,
                           "name": "paramG",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1235,7 +1183,6 @@
                           "id": 42,
                           "name": "paramZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1284,7 +1231,6 @@
           "id": 30,
           "name": "functionWithADestructuredParameterAndExtraParameters",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1299,7 +1245,6 @@
               "id": 31,
               "name": "functionWithADestructuredParameterAndExtraParameters",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1333,7 +1278,6 @@
                   "id": 32,
                   "name": "__namedParameters",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reflection",
@@ -1341,14 +1285,12 @@
                       "id": 33,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 36,
                           "name": "paramA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1369,7 +1311,6 @@
                           "id": 35,
                           "name": "paramG",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1388,7 +1329,6 @@
                           "id": 34,
                           "name": "paramZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1429,7 +1369,6 @@
                   "id": 37,
                   "name": "extraParameter",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -1448,7 +1387,6 @@
           "id": 13,
           "name": "functionWithDefaults",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1463,7 +1401,6 @@
               "id": 14,
               "name": "functionWithDefaults",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1489,7 +1426,6 @@
                   "id": 15,
                   "name": "valueA",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1509,7 +1445,6 @@
                   "id": 16,
                   "name": "valueB",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1529,7 +1464,6 @@
                   "id": 17,
                   "name": "valueC",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1549,7 +1483,6 @@
                   "id": 18,
                   "name": "valueD",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1569,7 +1502,6 @@
                   "id": 19,
                   "name": "valueE",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1597,7 +1529,6 @@
           "id": 9,
           "name": "functionWithOptionalValue",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1612,7 +1543,6 @@
               "id": 10,
               "name": "functionWithOptionalValue",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1627,7 +1557,6 @@
                   "id": 11,
                   "name": "requiredParam",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1646,7 +1575,6 @@
                   "id": 12,
                   "name": "optionalParam",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {
                     "isOptional": true
                   },
@@ -1675,7 +1603,6 @@
           "id": 4,
           "name": "functionWithParameters",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1690,7 +1617,6 @@
               "id": 5,
               "name": "functionWithParameters",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1716,7 +1642,6 @@
                   "id": 6,
                   "name": "paramZ",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1735,7 +1660,6 @@
                   "id": 7,
                   "name": "paramG",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1754,7 +1678,6 @@
                   "id": 8,
                   "name": "paramA",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -1787,7 +1710,6 @@
           "id": 20,
           "name": "functionWithRest",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1802,7 +1724,6 @@
               "id": 21,
               "name": "functionWithRest",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1828,7 +1749,6 @@
                   "id": 22,
                   "name": "rest",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {
                     "isRest": true
                   },
@@ -1860,7 +1780,6 @@
           "id": 71,
           "name": "isNonNull",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1875,7 +1794,6 @@
               "id": 72,
               "name": "isNonNull",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1890,7 +1808,6 @@
                   "id": 73,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1899,7 +1816,6 @@
                   "id": 74,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "union",
@@ -1938,7 +1854,6 @@
           "id": 78,
           "name": "merged",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1959,7 +1874,6 @@
               "id": 79,
               "name": "merged",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -1972,7 +1886,6 @@
           "id": 52,
           "name": "moduleFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -1993,7 +1906,6 @@
               "id": 53,
               "name": "moduleFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2008,7 +1920,6 @@
                   "id": 54,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2035,7 +1946,6 @@
           "id": 45,
           "name": "multipleSignatures",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2062,7 +1972,6 @@
               "id": 46,
               "name": "multipleSignatures",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2077,7 +1986,6 @@
                   "id": 47,
                   "name": "value",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2102,7 +2010,6 @@
               "id": 48,
               "name": "multipleSignatures",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2117,7 +2024,6 @@
                   "id": 49,
                   "name": "value",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2133,14 +2039,12 @@
                       "id": 50,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 51,
                           "name": "name",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "comment": {
                             "summary": [
@@ -2195,7 +2099,6 @@
           "id": 83,
           "name": "variableFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2210,7 +2113,6 @@
               "id": 84,
               "name": "variableFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2236,7 +2138,6 @@
                   "id": 85,
                   "name": "someParam",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2311,14 +2212,12 @@
       "id": 116,
       "name": "generic-function",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 121,
           "name": "functionWithGenericArrayParameter",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2333,7 +2232,6 @@
               "id": 122,
               "name": "functionWithGenericArrayParameter",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2359,7 +2257,6 @@
                   "id": 123,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -2368,7 +2265,6 @@
                   "id": 124,
                   "name": "param",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2388,7 +2284,6 @@
                   "id": 125,
                   "name": "params",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2423,7 +2318,6 @@
           "id": 126,
           "name": "functionWithTemplate",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2438,14 +2332,12 @@
               "id": 127,
               "name": "functionWithTemplate",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "typeParameter": [
                 {
                   "id": 128,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2462,7 +2354,6 @@
                   "id": 129,
                   "name": "param",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2491,7 +2382,6 @@
           "id": 117,
           "name": "genericFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2506,7 +2396,6 @@
               "id": 118,
               "name": "genericFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -2532,7 +2421,6 @@
                   "id": 119,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2555,7 +2443,6 @@
                   "id": 120,
                   "name": "value",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -2604,21 +2491,18 @@
       "id": 130,
       "name": "implicit-types",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 139,
           "name": "BreakpointRange",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 141,
               "name": "end",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2637,7 +2521,6 @@
               "id": 140,
               "name": "start",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2675,7 +2558,6 @@
           "id": 131,
           "name": "getBreakpoints",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -2690,7 +2572,6 @@
               "id": 132,
               "name": "getBreakpoints",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "reflection",
@@ -2698,14 +2579,12 @@
                   "id": 133,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 136,
                       "name": "large",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -2725,7 +2604,6 @@
                       "id": 135,
                       "name": "medium",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -2745,7 +2623,6 @@
                       "id": 134,
                       "name": "small",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -2765,7 +2642,6 @@
                       "id": 137,
                       "name": "xlarge",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -2785,7 +2661,6 @@
                       "id": 138,
                       "name": "xxlarge",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
diff --git a/src/test/converter/inherit-param-doc/specs.json b/src/test/converter/inherit-param-doc/specs.json
index 32c74075b..a2dffa498 100644
--- a/src/test/converter/inherit-param-doc/specs.json
+++ b/src/test/converter/inherit-param-doc/specs.json
@@ -2,28 +2,24 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 6,
       "name": "Class1",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "children": [
         {
           "id": 7,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "signatures": [
             {
               "id": 8,
               "name": "new Class1",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -37,7 +33,6 @@
           "id": 9,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -52,14 +47,12 @@
               "id": 10,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 11,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -78,7 +71,6 @@
                   "id": 12,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -146,21 +138,18 @@
       "id": 13,
       "name": "Class2",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "children": [
         {
           "id": 14,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "signatures": [
             {
               "id": 15,
               "name": "new Class2",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -174,7 +163,6 @@
           "id": 16,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -189,14 +177,12 @@
               "id": 17,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 18,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -215,7 +201,6 @@
                   "id": 19,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -283,21 +268,18 @@
       "id": 20,
       "name": "Class3",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "children": [
         {
           "id": 21,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "signatures": [
             {
               "id": 22,
               "name": "new Class3",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -311,7 +293,6 @@
           "id": 23,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -326,14 +307,12 @@
               "id": 24,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 25,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -352,7 +331,6 @@
                   "id": 26,
                   "name": "c",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -420,14 +398,12 @@
       "id": 1,
       "name": "Base",
       "kind": 256,
-      "kindString": "Interface",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -442,14 +418,12 @@
               "id": 3,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 4,
                   "name": "a",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -468,7 +442,6 @@
                   "id": 5,
                   "name": "b",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
diff --git a/src/test/converter/inheritance/specs.json b/src/test/converter/inheritance/specs.json
index 115858b6c..b0d2a20b6 100644
--- a/src/test/converter/inheritance/specs.json
+++ b/src/test/converter/inheritance/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "inherit-doc",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 14,
           "name": "InterfaceSource",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -30,7 +28,6 @@
               "id": 15,
               "name": "property",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -70,7 +67,6 @@
               "id": 16,
               "name": "someMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -85,7 +81,6 @@
                   "id": 17,
                   "name": "someMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -100,7 +95,6 @@
                       "id": 18,
                       "name": "arg",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -144,7 +138,6 @@
               "id": 19,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "comment": {
                 "summary": [
@@ -161,7 +154,6 @@
           "id": 20,
           "name": "InterfaceTarget",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -176,7 +168,6 @@
               "id": 21,
               "name": "property",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -204,7 +195,6 @@
               "id": 22,
               "name": "someMethod",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {},
               "sources": [
                 {
@@ -219,7 +209,6 @@
                   "id": 23,
                   "name": "someMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -234,7 +223,6 @@
                       "id": 24,
                       "name": "arg",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -278,7 +266,6 @@
               "id": 25,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "comment": {
                 "summary": [
@@ -295,7 +282,6 @@
           "id": 2,
           "name": "functionSource",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -310,7 +296,6 @@
               "id": 3,
               "name": "functionSource",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -354,7 +339,6 @@
                   "id": 4,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -371,7 +355,6 @@
                   "id": 5,
                   "name": "arg1",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -391,7 +374,6 @@
                   "id": 6,
                   "name": "arg2",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -419,7 +401,6 @@
           "id": 7,
           "name": "functionTargetGlobal",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -434,7 +415,6 @@
               "id": 8,
               "name": "functionTargetGlobal",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [],
@@ -457,7 +437,6 @@
           "id": 9,
           "name": "functionTargetLocal",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -472,7 +451,6 @@
               "id": 10,
               "name": "functionTargetLocal",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -533,7 +511,6 @@
                   "id": 11,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -550,7 +527,6 @@
                   "id": 12,
                   "name": "arg1",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -570,7 +546,6 @@
                   "id": 13,
                   "name": "arg2",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -625,21 +600,18 @@
       "id": 26,
       "name": "mergable-class",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 34,
           "name": "MySubClass",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "children": [
             {
               "id": 36,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -654,7 +626,6 @@
                   "id": 37,
                   "name": "new MySubClass",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -676,7 +647,6 @@
               "id": 38,
               "name": "instanceProp",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -699,7 +669,6 @@
               "id": 35,
               "name": "staticProp",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isStatic": true
               },
@@ -756,14 +725,12 @@
           "id": 32,
           "name": "My",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 33,
               "name": "instanceProp",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -806,14 +773,12 @@
           "id": 27,
           "name": "MyCtor",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 29,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -828,7 +793,6 @@
                   "id": 30,
                   "name": "new MyCtor",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -842,7 +806,6 @@
               "id": 28,
               "name": "staticProp",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -885,7 +848,6 @@
           "id": 31,
           "name": "My",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json
index 1fe5803f6..0b8aa85f3 100644
--- a/src/test/converter/interface/specs.json
+++ b/src/test/converter/interface/specs.json
@@ -8,21 +8,18 @@
       "id": 1,
       "name": "constructor-type",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "Constructor",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 3,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "sources": [
                 {
@@ -37,14 +34,12 @@
                   "id": 4,
                   "name": "new Constructor",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 5,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -55,7 +50,6 @@
                       "id": 6,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -72,14 +66,12 @@
                   "id": 7,
                   "name": "new Constructor",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 8,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -90,7 +82,6 @@
                       "id": 9,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -108,14 +99,12 @@
                   "id": 10,
                   "name": "new Constructor",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 11,
                       "name": "x",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -126,7 +115,6 @@
                       "id": 12,
                       "name": "y",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -164,7 +152,6 @@
           "id": 13,
           "name": "Instance",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -198,14 +185,12 @@
       "id": 14,
       "name": "index-signature",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 21,
           "name": "BothIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -219,7 +204,6 @@
             "id": 22,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -243,7 +227,6 @@
           "id": 18,
           "name": "NumIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -257,7 +240,6 @@
             "id": 19,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -281,7 +263,6 @@
           "id": 15,
           "name": "StrIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -295,7 +276,6 @@
             "id": 16,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -319,7 +299,6 @@
           "id": 24,
           "name": "TypeIndex",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -335,7 +314,6 @@
               "id": 25,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -349,7 +327,6 @@
                 "id": 26,
                 "name": "__index",
                 "kind": 8192,
-                "kindString": "Index signature",
                 "flags": {},
                 "parameters": [
                   {
@@ -401,14 +378,12 @@
       "id": 28,
       "name": "interface-empty",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 30,
           "name": "ClassImplementingEmptyInterface",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -423,14 +398,12 @@
               "id": 31,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 32,
                   "name": "new ClassImplementingEmptyInterface",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -444,7 +417,6 @@
               "id": 33,
               "name": "name",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isPrivate": true
               },
@@ -465,7 +437,6 @@
               "id": 34,
               "name": "goto",
               "kind": 2048,
-              "kindString": "Method",
               "flags": {
                 "isPublic": true
               },
@@ -482,7 +453,6 @@
                   "id": 35,
                   "name": "goto",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -532,7 +502,6 @@
           "id": 29,
           "name": "EmptyInterface",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -586,21 +555,18 @@
       "id": 36,
       "name": "interface-implementation",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 37,
           "name": "Forms",
           "kind": 4,
-          "kindString": "Namespace",
           "flags": {},
           "children": [
             {
               "id": 81,
               "name": "EventDispatcher",
               "kind": 128,
-              "kindString": "Class",
               "flags": {},
               "comment": {
                 "summary": [
@@ -626,21 +592,18 @@
                   "id": 82,
                   "name": "constructor",
                   "kind": 512,
-                  "kindString": "Constructor",
                   "flags": {},
                   "signatures": [
                     {
                       "id": 83,
                       "name": "new EventDispatcher",
                       "kind": 16384,
-                      "kindString": "Constructor signature",
                       "flags": {},
                       "typeParameter": [
                         {
                           "id": 84,
                           "name": "T",
                           "kind": 131072,
-                          "kindString": "Type parameter",
                           "flags": {}
                         }
                       ],
@@ -663,7 +626,6 @@
                   "id": 85,
                   "name": "subscriptions",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isPrivate": true
                   },
@@ -695,7 +657,6 @@
                   "id": 86,
                   "name": "add",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -710,14 +671,12 @@
                       "id": 87,
                       "name": "add",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 88,
                           "name": "listener",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -736,7 +695,6 @@
                           "id": 89,
                           "name": "filter",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -748,7 +706,6 @@
                           "id": 90,
                           "name": "priority",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -786,7 +743,6 @@
                   "id": 97,
                   "name": "clear",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -801,7 +757,6 @@
                       "id": 98,
                       "name": "clear",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -824,7 +779,6 @@
                   "id": 94,
                   "name": "dispatch",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -839,14 +793,12 @@
                       "id": 95,
                       "name": "dispatch",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 96,
                           "name": "event",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -876,7 +828,6 @@
                   "id": 99,
                   "name": "hasListeners",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -891,7 +842,6 @@
                       "id": 100,
                       "name": "hasListeners",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -914,7 +864,6 @@
                   "id": 91,
                   "name": "remove",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -929,14 +878,12 @@
                       "id": 92,
                       "name": "remove",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 93,
                           "name": "subscription",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1007,7 +954,6 @@
                   "id": 101,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1030,7 +976,6 @@
               "id": 49,
               "name": "Subscription",
               "kind": 128,
-              "kindString": "Class",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1045,7 +990,6 @@
                   "id": 50,
                   "name": "constructor",
                   "kind": 512,
-                  "kindString": "Constructor",
                   "flags": {},
                   "sources": [
                     {
@@ -1060,14 +1004,12 @@
                       "id": 51,
                       "name": "new Subscription",
                       "kind": 16384,
-                      "kindString": "Constructor signature",
                       "flags": {},
                       "typeParameter": [
                         {
                           "id": 52,
                           "name": "V",
                           "kind": 131072,
-                          "kindString": "Type parameter",
                           "flags": {}
                         }
                       ],
@@ -1076,7 +1018,6 @@
                           "id": 53,
                           "name": "listener",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1095,7 +1036,6 @@
                           "id": 54,
                           "name": "filter",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -1106,7 +1046,6 @@
                           "id": 55,
                           "name": "priority",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -1117,7 +1056,6 @@
                           "id": 56,
                           "name": "dispatcher",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1152,7 +1090,6 @@
                   "id": 60,
                   "name": "dispatcher",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isPublic": true
                   },
@@ -1181,7 +1118,6 @@
                   "id": 58,
                   "name": "filter",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isPublic": true
                   },
@@ -1207,7 +1143,6 @@
                   "id": 57,
                   "name": "listener",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isPublic": true
                   },
@@ -1241,7 +1176,6 @@
                   "id": 59,
                   "name": "priority",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isPublic": true
                   },
@@ -1267,7 +1201,6 @@
                   "id": 61,
                   "name": "unsubscribe",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1282,7 +1215,6 @@
                       "id": 62,
                       "name": "unsubscribe",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1346,7 +1278,6 @@
                   "id": 63,
                   "name": "V",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1369,7 +1300,6 @@
               "id": 64,
               "name": "EventDispatcherInt",
               "kind": 256,
-              "kindString": "Interface",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1384,7 +1314,6 @@
                   "id": 65,
                   "name": "add",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1399,14 +1328,12 @@
                       "id": 66,
                       "name": "add",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 67,
                           "name": "listener",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1425,7 +1352,6 @@
                           "id": 68,
                           "name": "filter",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {
                             "isOptional": true
                           },
@@ -1438,7 +1364,6 @@
                           "id": 69,
                           "name": "priority",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {
                             "isOptional": true
                           },
@@ -1467,7 +1392,6 @@
                   "id": 76,
                   "name": "clear",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1482,7 +1406,6 @@
                       "id": 77,
                       "name": "clear",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -1495,7 +1418,6 @@
                   "id": 73,
                   "name": "dispatch",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1510,14 +1432,12 @@
                       "id": 74,
                       "name": "dispatch",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 75,
                           "name": "parameter",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1537,7 +1457,6 @@
                   "id": 78,
                   "name": "hasListeners",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1552,7 +1471,6 @@
                       "id": 79,
                       "name": "hasListeners",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "type": {
                         "type": "intrinsic",
@@ -1565,7 +1483,6 @@
                   "id": 70,
                   "name": "remove",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1580,14 +1497,12 @@
                       "id": 71,
                       "name": "remove",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "parameters": [
                         {
                           "id": 72,
                           "name": "subscription",
                           "kind": 32768,
-                          "kindString": "Parameter",
                           "flags": {},
                           "type": {
                             "type": "reference",
@@ -1636,7 +1551,6 @@
                   "id": 80,
                   "name": "U",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1652,7 +1566,6 @@
               "id": 38,
               "name": "EventListener",
               "kind": 256,
-              "kindString": "Interface",
               "flags": {},
               "sources": [
                 {
@@ -1667,7 +1580,6 @@
                   "id": 39,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1676,14 +1588,12 @@
                   "id": 40,
                   "name": "EventListener",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 41,
                       "name": "parameter",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1711,7 +1621,6 @@
               "id": 42,
               "name": "SubscriptionInt",
               "kind": 256,
-              "kindString": "Interface",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1726,7 +1635,6 @@
                   "id": 45,
                   "name": "filter",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1745,7 +1653,6 @@
                   "id": 43,
                   "name": "listener",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1772,7 +1679,6 @@
                   "id": 44,
                   "name": "priority",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1791,7 +1697,6 @@
                   "id": 46,
                   "name": "unsubscribe",
                   "kind": 2048,
-                  "kindString": "Method",
                   "flags": {},
                   "sources": [
                     {
@@ -1806,7 +1711,6 @@
                       "id": 47,
                       "name": "unsubscribe",
                       "kind": 4096,
-                      "kindString": "Call signature",
                       "flags": {},
                       "comment": {
                         "summary": [
@@ -1853,7 +1757,6 @@
                   "id": 48,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -1914,21 +1817,18 @@
       "id": 102,
       "name": "merging",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 103,
           "name": "Base",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 104,
               "name": "base",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -1977,14 +1877,12 @@
           "id": 105,
           "name": "Base2",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 106,
               "name": "base2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2028,14 +1926,12 @@
           "id": 107,
           "name": "Child",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 110,
               "name": "base",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2059,7 +1955,6 @@
               "id": 111,
               "name": "base2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2083,7 +1978,6 @@
               "id": 108,
               "name": "child",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2102,7 +1996,6 @@
               "id": 109,
               "name": "child3",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2167,14 +2060,12 @@
           "id": 112,
           "name": "Child2",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 116,
               "name": "base",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2198,7 +2089,6 @@
               "id": 117,
               "name": "base2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2222,7 +2112,6 @@
               "id": 114,
               "name": "child",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2246,7 +2135,6 @@
               "id": 113,
               "name": "child2",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -2265,7 +2153,6 @@
               "id": 115,
               "name": "child3",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
diff --git a/src/test/converter/js/specs.json b/src/test/converter/js/specs.json
index 3f1e08a45..74c3d3980 100644
--- a/src/test/converter/js/specs.json
+++ b/src/test/converter/js/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "export-eq-type",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 5,
           "name": "Foo",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -34,7 +32,6 @@
           "id": 2,
           "name": "export=",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -49,14 +46,12 @@
               "id": 3,
               "name": "export=",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 4,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -99,14 +94,12 @@
       "id": 6,
       "name": "index",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 10,
           "name": "ColumnType",
           "kind": 8,
-          "kindString": "Enumeration",
           "flags": {},
           "comment": {
             "summary": [
@@ -121,7 +114,6 @@
               "id": 12,
               "name": "NUMBER",
               "kind": 16,
-              "kindString": "Enumeration Member",
               "flags": {},
               "sources": [
                 {
@@ -140,7 +132,6 @@
               "id": 11,
               "name": "STRING",
               "kind": 16,
-              "kindString": "Enumeration Member",
               "flags": {},
               "sources": [
                 {
@@ -184,7 +175,6 @@
           "id": 15,
           "name": "AlsoInterfaceIsh",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -199,7 +189,6 @@
               "id": 17,
               "name": "bar",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -218,7 +207,6 @@
               "id": 16,
               "name": "foo",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -256,14 +244,12 @@
           "id": 13,
           "name": "InterfaceIsh",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "children": [
             {
               "id": 14,
               "name": "foo",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "sources": [
                 {
@@ -300,7 +286,6 @@
           "id": 42,
           "name": "Foo",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -316,7 +301,6 @@
               "id": 43,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -331,14 +315,12 @@
                   "id": 44,
                   "name": "__type",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 45,
                       "name": "args",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {
                         "isRest": true
                       },
@@ -364,7 +346,6 @@
           "id": 28,
           "name": "HasReturnTag",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -380,7 +361,6 @@
               "id": 29,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -395,7 +375,6 @@
                   "id": 30,
                   "name": "__type",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -410,7 +389,6 @@
           "id": 40,
           "name": "Identity",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "comment": {
             "summary": [
@@ -433,7 +411,6 @@
               "id": 41,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "comment": {
                 "summary": [
@@ -455,7 +432,6 @@
           "id": 31,
           "name": "IdentityFn",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -470,7 +446,6 @@
               "id": 35,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {}
             }
           ],
@@ -480,7 +455,6 @@
               "id": 32,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -495,14 +469,12 @@
                   "id": 33,
                   "name": "__type",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 34,
                       "name": "data",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "type": {
                         "type": "reference",
@@ -525,7 +497,6 @@
           "id": 20,
           "name": "IntersectionType",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "comment": {
             "summary": [
@@ -552,14 +523,12 @@
                   "id": 21,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 22,
                       "name": "x",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -599,14 +568,12 @@
                   "id": 23,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 24,
                       "name": "y",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -647,7 +614,6 @@
           "id": 25,
           "name": "NoReturnTag",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -663,7 +629,6 @@
               "id": 26,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -678,7 +643,6 @@
                   "id": 27,
                   "name": "__type",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "summary": [
@@ -701,7 +665,6 @@
           "id": 18,
           "name": "ObjectAlias",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "comment": {
             "summary": [
@@ -730,7 +693,6 @@
           "id": 36,
           "name": "OptionalArg",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -746,7 +708,6 @@
               "id": 37,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "sources": [
                 {
@@ -761,14 +722,12 @@
                   "id": 38,
                   "name": "__type",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "parameters": [
                     {
                       "id": 39,
                       "name": "data",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {
                         "isOptional": true
                       },
@@ -799,7 +758,6 @@
           "id": 19,
           "name": "UnionType",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "comment": {
             "summary": [
@@ -835,7 +793,6 @@
           "id": 7,
           "name": "usedFoo",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -850,14 +807,12 @@
               "id": 8,
               "name": "usedFoo",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 9,
                   "name": "args",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {
                     "isRest": true
                   },
diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json
index 3072f8d4f..dee0a061e 100644
--- a/src/test/converter/mixin/specs.json
+++ b/src/test/converter/mixin/specs.json
@@ -2,14 +2,12 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 13,
       "name": "Base",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "comment": {
         "summary": [
@@ -24,14 +22,12 @@
           "id": 14,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "signatures": [
             {
               "id": 15,
               "name": "new Base",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -45,7 +41,6 @@
           "id": 16,
           "name": "baseProperty",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -65,7 +60,6 @@
           "id": 17,
           "name": "baseMethod",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -80,7 +74,6 @@
               "id": 18,
               "name": "baseMethod",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -123,7 +116,6 @@
       "id": 58,
       "name": "SomeClassWithMixin",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "comment": {
         "summary": [
@@ -138,14 +130,12 @@
           "id": 61,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "signatures": [
             {
               "id": 62,
               "name": "new SomeClassWithMixin",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -167,7 +157,6 @@
           "id": 74,
           "name": "baseProperty",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -191,7 +180,6 @@
           "id": 63,
           "name": "classWithMixinProperty",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -211,7 +199,6 @@
           "id": 70,
           "name": "property1",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -235,7 +222,6 @@
           "id": 66,
           "name": "property2",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -259,7 +245,6 @@
           "id": 75,
           "name": "baseMethod",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -274,7 +259,6 @@
               "id": 76,
               "name": "baseMethod",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -295,7 +279,6 @@
           "id": 64,
           "name": "classWithMixinMethod",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -310,7 +293,6 @@
               "id": 65,
               "name": "classWithMixinMethod",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -323,7 +305,6 @@
           "id": 71,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -338,14 +319,12 @@
               "id": 72,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 73,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "array",
@@ -380,7 +359,6 @@
           "id": 67,
           "name": "method2",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -395,14 +373,12 @@
               "id": 68,
               "name": "method2",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 69,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -479,14 +455,12 @@
                         "id": 59,
                         "name": "__type",
                         "kind": 65536,
-                        "kindString": "Type literal",
                         "flags": {},
                         "children": [
                           {
                             "id": 60,
                             "name": "prototype",
                             "kind": 1024,
-                            "kindString": "Property",
                             "flags": {},
                             "type": {
                               "type": "reference",
@@ -574,7 +548,6 @@
       "id": 25,
       "name": "Mixin1Type",
       "kind": 256,
-      "kindString": "Interface",
       "flags": {},
       "comment": {
         "summary": [
@@ -589,7 +562,6 @@
           "id": 30,
           "name": "baseProperty",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -613,7 +585,6 @@
           "id": 26,
           "name": "property1",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -637,7 +608,6 @@
           "id": 31,
           "name": "baseMethod",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -652,7 +622,6 @@
               "id": 32,
               "name": "baseMethod",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -673,7 +642,6 @@
           "id": 27,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -688,14 +656,12 @@
               "id": 28,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 29,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "array",
@@ -773,7 +739,6 @@
       "id": 39,
       "name": "Mixin2Type",
       "kind": 256,
-      "kindString": "Interface",
       "flags": {},
       "comment": {
         "summary": [
@@ -788,7 +753,6 @@
           "id": 48,
           "name": "baseProperty",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -812,7 +776,6 @@
           "id": 44,
           "name": "property1",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -836,7 +799,6 @@
           "id": 40,
           "name": "property2",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -860,7 +822,6 @@
           "id": 49,
           "name": "baseMethod",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -875,7 +836,6 @@
               "id": 50,
               "name": "baseMethod",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -896,7 +856,6 @@
           "id": 45,
           "name": "method1",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -911,14 +870,12 @@
               "id": 46,
               "name": "method1",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 47,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "array",
@@ -953,7 +910,6 @@
           "id": 41,
           "name": "method2",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -968,14 +924,12 @@
               "id": 42,
               "name": "method2",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 43,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -1049,7 +1003,6 @@
       "id": 6,
       "name": "AnyConstructor",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "sources": [
         {
@@ -1064,7 +1017,6 @@
           "id": 10,
           "name": "A",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {},
           "default": {
             "type": "intrinsic",
@@ -1078,7 +1030,6 @@
           "id": 7,
           "name": "__type",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "sources": [
             {
@@ -1093,7 +1044,6 @@
               "id": 8,
               "name": "__type",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1108,7 +1058,6 @@
                   "id": 9,
                   "name": "input",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {
                     "isRest": true
                   },
@@ -1135,7 +1084,6 @@
       "id": 1,
       "name": "AnyFunction",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "sources": [
         {
@@ -1150,7 +1098,6 @@
           "id": 5,
           "name": "A",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {},
           "default": {
             "type": "intrinsic",
@@ -1164,7 +1111,6 @@
           "id": 2,
           "name": "__type",
           "kind": 65536,
-          "kindString": "Type literal",
           "flags": {},
           "sources": [
             {
@@ -1179,7 +1125,6 @@
               "id": 3,
               "name": "__type",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1194,7 +1139,6 @@
                   "id": 4,
                   "name": "input",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {
                     "isRest": true
                   },
@@ -1221,7 +1165,6 @@
       "id": 11,
       "name": "Mixin",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "comment": {
         "summary": [
@@ -1244,7 +1187,6 @@
           "id": 12,
           "name": "T",
           "kind": 131072,
-          "kindString": "Type parameter",
           "flags": {},
           "type": {
             "type": "reference",
@@ -1291,7 +1233,6 @@
       "id": 57,
       "name": "Mixin3",
       "kind": 4194304,
-      "kindString": "Type alias",
       "flags": {},
       "comment": {
         "summary": [
@@ -1335,7 +1276,6 @@
       "id": 19,
       "name": "Mixin1Func",
       "kind": 64,
-      "kindString": "Function",
       "flags": {},
       "sources": [
         {
@@ -1350,7 +1290,6 @@
           "id": 20,
           "name": "Mixin1Func",
           "kind": 4096,
-          "kindString": "Call signature",
           "flags": {},
           "comment": {
             "summary": [
@@ -1365,7 +1304,6 @@
               "id": 21,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1386,7 +1324,6 @@
               "id": 22,
               "name": "base",
               "kind": 32768,
-              "kindString": "Parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1404,14 +1341,12 @@
                   "id": 23,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 24,
                       "name": "prototype",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "type": {
                         "type": "reference",
@@ -1458,7 +1393,6 @@
       "id": 33,
       "name": "Mixin2",
       "kind": 64,
-      "kindString": "Function",
       "flags": {},
       "sources": [
         {
@@ -1473,7 +1407,6 @@
           "id": 34,
           "name": "Mixin2",
           "kind": 4096,
-          "kindString": "Call signature",
           "flags": {},
           "comment": {
             "summary": [
@@ -1488,7 +1421,6 @@
               "id": 35,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1519,7 +1451,6 @@
               "id": 36,
               "name": "base",
               "kind": 32768,
-              "kindString": "Parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1537,14 +1468,12 @@
                   "id": 37,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 38,
                       "name": "prototype",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "type": {
                         "type": "reference",
@@ -1591,7 +1520,6 @@
       "id": 51,
       "name": "Mixin3",
       "kind": 64,
-      "kindString": "Function",
       "flags": {},
       "sources": [
         {
@@ -1612,7 +1540,6 @@
           "id": 52,
           "name": "Mixin3",
           "kind": 4096,
-          "kindString": "Call signature",
           "flags": {},
           "comment": {
             "summary": [
@@ -1627,7 +1554,6 @@
               "id": 53,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1647,7 +1573,6 @@
               "id": 54,
               "name": "base",
               "kind": 32768,
-              "kindString": "Parameter",
               "flags": {},
               "type": {
                 "type": "reference",
@@ -1665,14 +1590,12 @@
                   "id": 55,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 56,
                       "name": "prototype",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "type": {
                         "type": "reference",
diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json
index c4e75e425..80b737e28 100644
--- a/src/test/converter/react/specs.json
+++ b/src/test/converter/react/specs.json
@@ -2,21 +2,18 @@
   "id": 0,
   "name": "typedoc",
   "kind": 1,
-  "kindString": "Project",
   "flags": {},
   "children": [
     {
       "id": 4,
       "name": "Demo",
       "kind": 128,
-      "kindString": "Class",
       "flags": {},
       "children": [
         {
           "id": 5,
           "name": "constructor",
           "kind": 512,
-          "kindString": "Constructor",
           "flags": {},
           "sources": [
             {
@@ -31,14 +28,12 @@
               "id": 6,
               "name": "new Demo",
               "kind": 16384,
-              "kindString": "Constructor signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 7,
                   "name": "props",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -59,7 +54,6 @@
           "id": 8,
           "name": "foo",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {
             "isPrivate": true
           },
@@ -80,7 +74,6 @@
           "id": 9,
           "name": "render",
           "kind": 2048,
-          "kindString": "Method",
           "flags": {},
           "sources": [
             {
@@ -95,7 +88,6 @@
               "id": 10,
               "name": "render",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "type": {
                 "type": "intrinsic",
@@ -138,14 +130,12 @@
       "id": 1,
       "name": "DemoProps",
       "kind": 256,
-      "kindString": "Interface",
       "flags": {},
       "children": [
         {
           "id": 3,
           "name": "age",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
@@ -164,7 +154,6 @@
           "id": 2,
           "name": "name",
           "kind": 1024,
-          "kindString": "Property",
           "flags": {},
           "sources": [
             {
diff --git a/src/test/converter/types/specs.json b/src/test/converter/types/specs.json
index 55eac7510..27430f694 100644
--- a/src/test/converter/types/specs.json
+++ b/src/test/converter/types/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "general",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 8,
           "name": "BigIntAlias",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -34,7 +32,6 @@
           "id": 2,
           "name": "BigIntLiteral",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -56,7 +53,6 @@
           "id": 11,
           "name": "FirstIfString",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -71,7 +67,6 @@
               "id": 12,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {},
               "type": {
                 "type": "array",
@@ -126,7 +121,6 @@
           "id": 4,
           "name": "NegativeBigIntLiteral",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -148,7 +142,6 @@
           "id": 9,
           "name": "NegativeOne",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -167,7 +160,6 @@
           "id": 6,
           "name": "NumArray",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -189,7 +181,6 @@
           "id": 3,
           "name": "BigIntLiteralType",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -214,7 +205,6 @@
           "id": 5,
           "name": "NegativeBigIntLiteralType",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -239,7 +229,6 @@
           "id": 10,
           "name": "negativeOne",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -261,7 +250,6 @@
           "id": 7,
           "name": "numArray",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -318,14 +306,12 @@
       "id": 13,
       "name": "index-signature",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 17,
           "name": "PartialIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -339,7 +325,6 @@
             "id": 18,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -372,7 +357,6 @@
           "id": 14,
           "name": "SymbolIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -386,7 +370,6 @@
             "id": 15,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -410,7 +393,6 @@
           "id": 20,
           "name": "UnionIndex",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "sources": [
             {
@@ -424,7 +406,6 @@
             "id": 21,
             "name": "__index",
             "kind": 8192,
-            "kindString": "Index signature",
             "flags": {},
             "parameters": [
               {
@@ -477,14 +458,12 @@
       "id": 23,
       "name": "mapped",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 34,
           "name": "DoubleKey",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -499,7 +478,6 @@
               "id": 35,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {}
             }
           ],
@@ -562,7 +540,6 @@
           "id": 32,
           "name": "Mappy",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -577,7 +554,6 @@
               "id": 33,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {}
             }
           ],
@@ -611,7 +587,6 @@
           "id": 28,
           "name": "doubleKey",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -626,14 +601,12 @@
               "id": 29,
               "name": "doubleKey",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "typeParameter": [
                 {
                   "id": 30,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -642,7 +615,6 @@
                   "id": 31,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -698,7 +670,6 @@
           "id": 24,
           "name": "mapped",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -713,14 +684,12 @@
               "id": 25,
               "name": "mapped",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "typeParameter": [
                 {
                   "id": 26,
                   "name": "T",
                   "kind": 131072,
-                  "kindString": "Type parameter",
                   "flags": {}
                 }
               ],
@@ -729,7 +698,6 @@
                   "id": 27,
                   "name": "arg",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -798,14 +766,12 @@
       "id": 36,
       "name": "parens",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 37,
           "name": "ZZ",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -828,14 +794,12 @@
                   "id": 38,
                   "name": "__type",
                   "kind": 65536,
-                  "kindString": "Type literal",
                   "flags": {},
                   "children": [
                     {
                       "id": 39,
                       "name": "a",
                       "kind": 1024,
-                      "kindString": "Property",
                       "flags": {},
                       "sources": [
                         {
@@ -894,14 +858,12 @@
       "id": 40,
       "name": "query",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 42,
           "name": "TypeOfX",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -924,7 +886,6 @@
           "id": 41,
           "name": "x",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -970,14 +931,12 @@
       "id": 43,
       "name": "tuple",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 52,
           "name": "LeadingRest",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1011,7 +970,6 @@
           "id": 44,
           "name": "NamedTuple",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1049,7 +1007,6 @@
           "id": 50,
           "name": "WithOptionalElements",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1087,7 +1044,6 @@
           "id": 46,
           "name": "WithRestType",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1121,7 +1077,6 @@
           "id": 48,
           "name": "WithRestTypeNames",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1162,7 +1117,6 @@
           "id": 53,
           "name": "leadingRest",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1199,7 +1153,6 @@
           "id": 45,
           "name": "namedTuple",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1240,7 +1193,6 @@
           "id": 51,
           "name": "withOptionalElements",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1281,7 +1233,6 @@
           "id": 47,
           "name": "withRestType",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1318,7 +1269,6 @@
           "id": 49,
           "name": "withRestTypeNames",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1397,14 +1347,12 @@
       "id": 54,
       "name": "type-operator",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 56,
           "name": "B",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1430,7 +1378,6 @@
           "id": 57,
           "name": "C",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1446,14 +1393,12 @@
               "id": 58,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 59,
                   "name": "prop1",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1472,7 +1417,6 @@
                   "id": 60,
                   "name": "prop2",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1512,7 +1456,6 @@
           "id": 61,
           "name": "D",
           "kind": 4194304,
-          "kindString": "Type alias",
           "flags": {},
           "sources": [
             {
@@ -1536,7 +1479,6 @@
           "id": 55,
           "name": "a",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1588,14 +1530,12 @@
       "id": 62,
       "name": "union-or-intersection",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 63,
           "name": "FirstType",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -1610,7 +1550,6 @@
               "id": 64,
               "name": "firstProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1655,7 +1594,6 @@
           "id": 65,
           "name": "SecondType",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -1670,7 +1608,6 @@
               "id": 66,
               "name": "secondProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1715,7 +1652,6 @@
           "id": 67,
           "name": "ThirdType",
           "kind": 256,
-          "kindString": "Interface",
           "flags": {},
           "comment": {
             "summary": [
@@ -1730,7 +1666,6 @@
               "id": 70,
               "name": "thirdComplexProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1783,7 +1718,6 @@
               "id": 69,
               "name": "thirdIntersectionProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
@@ -1821,7 +1755,6 @@
               "id": 68,
               "name": "thirdUnionProperty",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {},
               "comment": {
                 "summary": [
diff --git a/src/test/converter/variables/specs.json b/src/test/converter/variables/specs.json
index 75e00ff0c..9d3dd514c 100644
--- a/src/test/converter/variables/specs.json
+++ b/src/test/converter/variables/specs.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "array",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "Array",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -30,21 +28,18 @@
               "id": 3,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 4,
                   "name": "new Array",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "typeParameter": [
                     {
                       "id": 5,
                       "name": "T",
                       "kind": 131072,
-                      "kindString": "Type parameter",
                       "flags": {}
                     }
                   ],
@@ -85,7 +80,6 @@
               "id": 6,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {}
             }
           ],
@@ -101,7 +95,6 @@
           "id": 9,
           "name": "Foo",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -116,14 +109,12 @@
               "id": 10,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 11,
                   "name": "new Foo",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -155,7 +146,6 @@
           "id": 12,
           "name": "FooList",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -170,14 +160,12 @@
               "id": 13,
               "name": "constructor",
               "kind": 512,
-              "kindString": "Constructor",
               "flags": {},
               "signatures": [
                 {
                   "id": 14,
                   "name": "new FooList",
                   "kind": 16384,
-                  "kindString": "Constructor signature",
                   "flags": {},
                   "type": {
                     "type": "reference",
@@ -233,7 +221,6 @@
           "id": 7,
           "name": "complex",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -303,7 +290,6 @@
           "id": 8,
           "name": "custom",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -367,14 +353,12 @@
       "id": 15,
       "name": "destructuring",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 22,
           "name": "destructArrayA",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -393,7 +377,6 @@
           "id": 23,
           "name": "destructArrayB",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -412,7 +395,6 @@
           "id": 24,
           "name": "destructArrayC",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -441,7 +423,6 @@
           "id": 28,
           "name": "destructArrayWithIgnoresA",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -460,7 +441,6 @@
           "id": 29,
           "name": "destructArrayWithIgnoresRest",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -488,7 +468,6 @@
           "id": 27,
           "name": "destructArrayWithRest",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -516,7 +495,6 @@
           "id": 25,
           "name": "destructArrayWithRestA",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -535,7 +513,6 @@
           "id": 26,
           "name": "destructArrayWithRestB",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -554,7 +531,6 @@
           "id": 19,
           "name": "destructObjectA",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -573,7 +549,6 @@
           "id": 20,
           "name": "destructObjectB",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -592,7 +567,6 @@
           "id": 21,
           "name": "destructObjectC",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -611,7 +585,6 @@
           "id": 16,
           "name": "drawText",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -626,7 +599,6 @@
               "id": 17,
               "name": "drawText",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -641,7 +613,6 @@
                   "id": 18,
                   "name": "__namedParameters",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -694,14 +665,12 @@
       "id": 30,
       "name": "literal",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 50,
           "name": "callbackReturn",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -719,14 +688,12 @@
               "id": 51,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 58,
                   "name": "error",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -742,7 +709,6 @@
                       "id": 59,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -757,14 +723,12 @@
                           "id": 60,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "parameters": [
                             {
                               "id": 61,
                               "name": "errorCallback",
                               "kind": 32768,
-                              "kindString": "Parameter",
                               "flags": {},
                               "type": {
                                 "type": "reflection",
@@ -772,7 +736,6 @@
                                   "id": 62,
                                   "name": "__type",
                                   "kind": 65536,
-                                  "kindString": "Type literal",
                                   "flags": {},
                                   "sources": [
                                     {
@@ -787,7 +750,6 @@
                                       "id": 63,
                                       "name": "__type",
                                       "kind": 4096,
-                                      "kindString": "Call signature",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -813,7 +775,6 @@
                   "id": 64,
                   "name": "finally",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -829,7 +790,6 @@
                       "id": 65,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -844,14 +804,12 @@
                           "id": 66,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "parameters": [
                             {
                               "id": 67,
                               "name": "finallyCallback",
                               "kind": 32768,
-                              "kindString": "Parameter",
                               "flags": {},
                               "type": {
                                 "type": "reflection",
@@ -859,7 +817,6 @@
                                   "id": 68,
                                   "name": "__type",
                                   "kind": 65536,
-                                  "kindString": "Type literal",
                                   "flags": {},
                                   "sources": [
                                     {
@@ -874,7 +831,6 @@
                                       "id": 69,
                                       "name": "__type",
                                       "kind": 4096,
-                                      "kindString": "Call signature",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -900,7 +856,6 @@
                   "id": 52,
                   "name": "success",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -916,7 +871,6 @@
                       "id": 53,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -931,14 +885,12 @@
                           "id": 54,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "parameters": [
                             {
                               "id": 55,
                               "name": "successCallback",
                               "kind": 32768,
-                              "kindString": "Parameter",
                               "flags": {},
                               "type": {
                                 "type": "reflection",
@@ -946,7 +898,6 @@
                                   "id": 56,
                                   "name": "__type",
                                   "kind": 65536,
-                                  "kindString": "Type literal",
                                   "flags": {},
                                   "sources": [
                                     {
@@ -961,7 +912,6 @@
                                       "id": 57,
                                       "name": "__type",
                                       "kind": 4096,
-                                      "kindString": "Call signature",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -1010,7 +960,6 @@
           "id": 70,
           "name": "objectLiteral",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1036,14 +985,12 @@
               "id": 71,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 89,
                   "name": "[toStringTag]",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1063,7 +1010,6 @@
                   "id": 90,
                   "name": "literal",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1083,7 +1029,6 @@
                   "id": 91,
                   "name": "literal2",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1103,7 +1048,6 @@
                   "id": 87,
                   "name": "valueA",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1123,7 +1067,6 @@
                   "id": 88,
                   "name": "valueB",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1143,7 +1086,6 @@
                   "id": 76,
                   "name": "valueX",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1159,14 +1101,12 @@
                       "id": 77,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 86,
                           "name": "valueA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1189,7 +1129,6 @@
                           "id": 79,
                           "name": "valueY",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1205,7 +1144,6 @@
                               "id": 80,
                               "name": "__type",
                               "kind": 65536,
-                              "kindString": "Type literal",
                               "flags": {},
                               "sources": [
                                 {
@@ -1220,14 +1158,12 @@
                                   "id": 81,
                                   "name": "__type",
                                   "kind": 4096,
-                                  "kindString": "Call signature",
                                   "flags": {},
                                   "parameters": [
                                     {
                                       "id": 82,
                                       "name": "z",
                                       "kind": 32768,
-                                      "kindString": "Parameter",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -1241,14 +1177,12 @@
                                       "id": 83,
                                       "name": "__type",
                                       "kind": 65536,
-                                      "kindString": "Type literal",
                                       "flags": {},
                                       "children": [
                                         {
                                           "id": 84,
                                           "name": "a",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -1268,7 +1202,6 @@
                                           "id": 85,
                                           "name": "b",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -1314,7 +1247,6 @@
                           "id": 78,
                           "name": "valueZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1357,7 +1289,6 @@
                   "id": 73,
                   "name": "valueY",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1373,7 +1304,6 @@
                       "id": 74,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -1388,7 +1318,6 @@
                           "id": 75,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -1404,7 +1333,6 @@
                   "id": 72,
                   "name": "valueZ",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1452,7 +1380,6 @@
           "id": 31,
           "name": "typeLiteral",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "comment": {
             "summary": [
@@ -1476,14 +1403,12 @@
               "id": 32,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 48,
                   "name": "valueA",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isOptional": true
                   },
@@ -1504,7 +1429,6 @@
                   "id": 49,
                   "name": "valueB",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isOptional": true
                   },
@@ -1525,7 +1449,6 @@
                   "id": 37,
                   "name": "valueX",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1541,14 +1464,12 @@
                       "id": 38,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 47,
                           "name": "valueA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1570,7 +1491,6 @@
                           "id": 40,
                           "name": "valueY",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1586,7 +1506,6 @@
                               "id": 41,
                               "name": "__type",
                               "kind": 65536,
-                              "kindString": "Type literal",
                               "flags": {},
                               "sources": [
                                 {
@@ -1601,14 +1520,12 @@
                                   "id": 42,
                                   "name": "__type",
                                   "kind": 4096,
-                                  "kindString": "Call signature",
                                   "flags": {},
                                   "parameters": [
                                     {
                                       "id": 43,
                                       "name": "z",
                                       "kind": 32768,
-                                      "kindString": "Parameter",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -1622,14 +1539,12 @@
                                       "id": 44,
                                       "name": "__type",
                                       "kind": 65536,
-                                      "kindString": "Type literal",
                                       "flags": {},
                                       "children": [
                                         {
                                           "id": 45,
                                           "name": "a",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -1648,7 +1563,6 @@
                                           "id": 46,
                                           "name": "b",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -1692,7 +1606,6 @@
                           "id": 39,
                           "name": "valueZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1733,7 +1646,6 @@
                   "id": 34,
                   "name": "valueY",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1749,7 +1661,6 @@
                       "id": 35,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -1764,7 +1675,6 @@
                           "id": 36,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -1779,7 +1689,6 @@
                   "id": 33,
                   "name": "valueZ",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1842,14 +1751,12 @@
       "id": 92,
       "name": "variable",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 93,
           "name": "myConst",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -1871,7 +1778,6 @@
           "id": 94,
           "name": "myLet",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -1891,7 +1797,6 @@
           "id": 95,
           "name": "myVar",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -1911,7 +1816,6 @@
           "id": 96,
           "name": "x",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -1930,7 +1834,6 @@
           "id": 97,
           "name": "y",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
@@ -1957,7 +1860,6 @@
           "id": 98,
           "name": "z",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
diff --git a/src/test/converter/variables/specs.nodoc.json b/src/test/converter/variables/specs.nodoc.json
index 34a994392..7670840f6 100644
--- a/src/test/converter/variables/specs.nodoc.json
+++ b/src/test/converter/variables/specs.nodoc.json
@@ -8,14 +8,12 @@
       "id": 1,
       "name": "array",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 2,
           "name": "Array",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -38,7 +36,6 @@
               "id": 6,
               "name": "T",
               "kind": 131072,
-              "kindString": "Type parameter",
               "flags": {}
             }
           ],
@@ -54,7 +51,6 @@
           "id": 9,
           "name": "Foo",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -77,7 +73,6 @@
           "id": 12,
           "name": "FooList",
           "kind": 128,
-          "kindString": "Class",
           "flags": {},
           "comment": {
             "summary": [
@@ -114,7 +109,6 @@
           "id": 7,
           "name": "complex",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -184,7 +178,6 @@
           "id": 8,
           "name": "custom",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -248,14 +241,12 @@
       "id": 15,
       "name": "destructuring",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 16,
           "name": "drawText",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
           "sources": [
             {
@@ -270,7 +261,6 @@
               "id": 17,
               "name": "drawText",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "summary": [
@@ -285,7 +275,6 @@
                   "id": 18,
                   "name": "__namedParameters",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -322,14 +311,12 @@
       "id": 30,
       "name": "literal",
       "kind": 2,
-      "kindString": "Module",
       "flags": {},
       "children": [
         {
           "id": 70,
           "name": "objectLiteral",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {
             "isConst": true
           },
@@ -355,14 +342,12 @@
               "id": 71,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 89,
                   "name": "[toStringTag]",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -382,7 +367,6 @@
                   "id": 90,
                   "name": "literal",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -402,7 +386,6 @@
                   "id": 91,
                   "name": "literal2",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -422,7 +405,6 @@
                   "id": 87,
                   "name": "valueA",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -442,7 +424,6 @@
                   "id": 88,
                   "name": "valueB",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -462,7 +443,6 @@
                   "id": 76,
                   "name": "valueX",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -478,14 +458,12 @@
                       "id": 77,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 86,
                           "name": "valueA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -508,7 +486,6 @@
                           "id": 79,
                           "name": "valueY",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -524,7 +501,6 @@
                               "id": 80,
                               "name": "__type",
                               "kind": 65536,
-                              "kindString": "Type literal",
                               "flags": {},
                               "sources": [
                                 {
@@ -539,14 +515,12 @@
                                   "id": 81,
                                   "name": "__type",
                                   "kind": 4096,
-                                  "kindString": "Call signature",
                                   "flags": {},
                                   "parameters": [
                                     {
                                       "id": 82,
                                       "name": "z",
                                       "kind": 32768,
-                                      "kindString": "Parameter",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -560,14 +534,12 @@
                                       "id": 83,
                                       "name": "__type",
                                       "kind": 65536,
-                                      "kindString": "Type literal",
                                       "flags": {},
                                       "children": [
                                         {
                                           "id": 84,
                                           "name": "a",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -587,7 +559,6 @@
                                           "id": 85,
                                           "name": "b",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -633,7 +604,6 @@
                           "id": 78,
                           "name": "valueZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -676,7 +646,6 @@
                   "id": 73,
                   "name": "valueY",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -692,7 +661,6 @@
                       "id": 74,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -707,7 +675,6 @@
                           "id": 75,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -723,7 +690,6 @@
                   "id": 72,
                   "name": "valueZ",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -771,7 +737,6 @@
           "id": 31,
           "name": "typeLiteral",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "comment": {
             "summary": [
@@ -795,14 +760,12 @@
               "id": 32,
               "name": "__type",
               "kind": 65536,
-              "kindString": "Type literal",
               "flags": {},
               "children": [
                 {
                   "id": 48,
                   "name": "valueA",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isOptional": true
                   },
@@ -823,7 +786,6 @@
                   "id": 49,
                   "name": "valueB",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {
                     "isOptional": true
                   },
@@ -844,7 +806,6 @@
                   "id": 37,
                   "name": "valueX",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -860,14 +821,12 @@
                       "id": 38,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "children": [
                         {
                           "id": 47,
                           "name": "valueA",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -889,7 +848,6 @@
                           "id": 40,
                           "name": "valueY",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -905,7 +863,6 @@
                               "id": 41,
                               "name": "__type",
                               "kind": 65536,
-                              "kindString": "Type literal",
                               "flags": {},
                               "sources": [
                                 {
@@ -920,14 +877,12 @@
                                   "id": 42,
                                   "name": "__type",
                                   "kind": 4096,
-                                  "kindString": "Call signature",
                                   "flags": {},
                                   "parameters": [
                                     {
                                       "id": 43,
                                       "name": "z",
                                       "kind": 32768,
-                                      "kindString": "Parameter",
                                       "flags": {},
                                       "type": {
                                         "type": "intrinsic",
@@ -941,14 +896,12 @@
                                       "id": 44,
                                       "name": "__type",
                                       "kind": 65536,
-                                      "kindString": "Type literal",
                                       "flags": {},
                                       "children": [
                                         {
                                           "id": 45,
                                           "name": "a",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -967,7 +920,6 @@
                                           "id": 46,
                                           "name": "b",
                                           "kind": 1024,
-                                          "kindString": "Property",
                                           "flags": {},
                                           "sources": [
                                             {
@@ -1011,7 +963,6 @@
                           "id": 39,
                           "name": "valueZ",
                           "kind": 1024,
-                          "kindString": "Property",
                           "flags": {},
                           "sources": [
                             {
@@ -1052,7 +1003,6 @@
                   "id": 34,
                   "name": "valueY",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
@@ -1068,7 +1018,6 @@
                       "id": 35,
                       "name": "__type",
                       "kind": 65536,
-                      "kindString": "Type literal",
                       "flags": {},
                       "sources": [
                         {
@@ -1083,7 +1032,6 @@
                           "id": 36,
                           "name": "__type",
                           "kind": 4096,
-                          "kindString": "Call signature",
                           "flags": {},
                           "type": {
                             "type": "intrinsic",
@@ -1098,7 +1046,6 @@
                   "id": 33,
                   "name": "valueZ",
                   "kind": 1024,
-                  "kindString": "Property",
                   "flags": {},
                   "sources": [
                     {
diff --git a/src/test/converter2.test.ts b/src/test/converter2.test.ts
index ab29aa4af..a4d1709f8 100644
--- a/src/test/converter2.test.ts
+++ b/src/test/converter2.test.ts
@@ -78,7 +78,7 @@ describe("Converter2", () => {
         } else {
             runTest(
                 name,
-                issueTests[`pre${entry}`],
+                issueTests[`pre${entry.slice(2)}`],
                 join("issues", entry),
                 check as (
                     project: ProjectReflection,
diff --git a/src/test/converter2/issues/gh1980.ts b/src/test/converter2/issues/gh1980.ts
new file mode 100644
index 000000000..10e749133
--- /dev/null
+++ b/src/test/converter2/issues/gh1980.ts
@@ -0,0 +1,6 @@
+/**
+ * {@link   http://example.com   }
+ * {@link   http://example.com  |   with text}
+ * {@link   http://example.com   jsdoc support}
+ */
+export const link = 123;
diff --git a/src/test/converter2/issues/gh1994.ts b/src/test/converter2/issues/gh1994.ts
new file mode 100644
index 000000000..127a4121f
--- /dev/null
+++ b/src/test/converter2/issues/gh1994.ts
@@ -0,0 +1,39 @@
+/**
+ * Has docs
+ */
+export function documented() {}
+
+/**
+ * Some signatures with docs
+ */
+export function documented2(): void;
+export function documented2(x: number): number;
+export function documented2(x?: number) {
+    return x;
+}
+
+export function notDocumented() {}
+
+/** Docs */
+export class Docs {
+    /** Docs */
+    get x() {
+        return 1;
+    }
+    /** Docs */
+    set x(value: number) {
+        throw value;
+    }
+
+    /** Docs */
+    get y() {
+        return 2;
+    }
+    set y(value: number) {
+        throw value;
+    }
+
+    get z() {
+        return 3;
+    }
+}
diff --git a/src/test/converter2/issues/gh1996.ts b/src/test/converter2/issues/gh1996.ts
new file mode 100644
index 000000000..9bd77a2a4
--- /dev/null
+++ b/src/test/converter2/issues/gh1996.ts
@@ -0,0 +1,3 @@
+export const a = () => {};
+
+export function b() {}
diff --git a/src/test/converter2/issues/gh2008.ts b/src/test/converter2/issues/gh2008.ts
new file mode 100644
index 000000000..61c323ae1
--- /dev/null
+++ b/src/test/converter2/issues/gh2008.ts
@@ -0,0 +1,4 @@
+const makeFn = () => () => {};
+
+/** Docs */
+export const myFn = makeFn();
diff --git a/src/test/converter2/issues/gh2012.ts b/src/test/converter2/issues/gh2012.ts
new file mode 100644
index 000000000..f61081847
--- /dev/null
+++ b/src/test/converter2/issues/gh2012.ts
@@ -0,0 +1,6 @@
+export function model(): number {
+    return 1;
+}
+export function Model(): string {
+    return "";
+}
diff --git a/src/test/converter2/validation/interface.ts b/src/test/converter2/validation/interface.ts
new file mode 100644
index 000000000..a057be41c
--- /dev/null
+++ b/src/test/converter2/validation/interface.ts
@@ -0,0 +1,5 @@
+export interface Foo {
+    /** a */
+    method(): void;
+    method(a: string): string;
+}
diff --git a/src/test/issueTests.ts b/src/test/issueTests.ts
index 85e160c31..3198ab47b 100644
--- a/src/test/issueTests.ts
+++ b/src/test/issueTests.ts
@@ -599,6 +599,35 @@ export const issueTests: {
         equal(comments2, ["Comment for a", "Comment for b"]);
     },
 
+    gh1980(project, logger) {
+        const link = query(project, "link");
+        equal(
+            link.comment?.summary.filter((t) => t.kind === "inline-tag"),
+            [
+                {
+                    kind: "inline-tag",
+                    tag: "@link",
+                    target: "http://example.com",
+                    text: "http://example.com",
+                },
+                {
+                    kind: "inline-tag",
+                    tag: "@link",
+                    target: "http://example.com",
+                    text: "with text",
+                },
+                {
+                    kind: "inline-tag",
+                    tag: "@link",
+                    target: "http://example.com",
+                    text: "jsdoc support",
+                },
+            ]
+        );
+        logger.discardDebugMessages();
+        logger.expectNoOtherMessages();
+    },
+
     gh1986(project, logger) {
         const a = query(project, "a");
         equal(
@@ -608,4 +637,45 @@ export const issueTests: {
         logger.discardDebugMessages();
         logger.expectNoOtherMessages();
     },
+
+    pre1994(app) {
+        app.options.setValue("excludeNotDocumented", true);
+    },
+    gh1994(project) {
+        for (const exp of ["documented", "documented2", "Docs.x", "Docs.y"]) {
+            query(project, exp);
+        }
+        for (const rem of ["notDocumented", "Docs.z"]) {
+            ok(!project.getChildByName(rem));
+        }
+
+        const y = query(project, "Docs.y");
+        equal(y.sources?.length, 1);
+        ok(y.getSignature);
+        ok(!y.setSignature);
+    },
+
+    gh1996(project) {
+        const a = query(project, "a");
+        equal(a.signatures![0].sources?.[0].fileName, "gh1996.ts");
+        equal(a.signatures![0].sources?.[0].line, 1);
+        equal(a.signatures![0].sources?.[0].character, 17);
+        const b = query(project, "b");
+        equal(b.signatures![0].sources?.[0].fileName, "gh1996.ts");
+        equal(b.signatures![0].sources?.[0].line, 3);
+        equal(b.signatures![0].sources?.[0].character, 0);
+    },
+
+    gh2008(project) {
+        const fn = query(project, "myFn").signatures![0];
+        equal(Comment.combineDisplayParts(fn.comment?.summary), "Docs");
+    },
+
+    gh2012(project) {
+        project.hasOwnDocument = true;
+        const model = query(project, "model");
+        const Model = query(project, "Model");
+        equal(model.getAlias(), "model");
+        equal(Model.getAlias(), "Model-1");
+    },
 };
diff --git a/src/test/slow/entry-point.test.ts b/src/test/slow/entry-point.test.ts
index 5c1256dcf..adc89454b 100644
--- a/src/test/slow/entry-point.test.ts
+++ b/src/test/slow/entry-point.test.ts
@@ -84,5 +84,6 @@ describe("Entry Points", () => {
         const entryPoints = app.getEntryPoints();
         ok(entryPoints);
         equal(entryPoints.length, 1);
+        equal(entryPoints[0].version, void 0);
     });
 });
diff --git a/src/test/validation.test.ts b/src/test/validation.test.ts
index eba3abdf8..09c8a9d94 100644
--- a/src/test/validation.test.ts
+++ b/src/test/validation.test.ts
@@ -195,4 +195,15 @@ describe("validateDocumentation", () => {
         );
         logger.expectNoOtherMessages();
     });
+
+    it("Should correctly handle interfaces", () => {
+        const project = convertValidationFile("interface.ts");
+        const logger = new TestLogger();
+        validateDocumentation(project, logger, ["Method"]);
+
+        logger.expectMessage(
+            "warn: Foo.method does not have any documentation."
+        );
+        logger.expectNoOtherMessages();
+    });
 });
diff --git a/static/style.css b/static/style.css
index 048427e08..8f6ed2c43 100644
--- a/static/style.css
+++ b/static/style.css
@@ -942,7 +942,7 @@ a.tsd-index-link {
     margin: 2rem 0;
 }
 .tsd-panel-group.tsd-index-group details {
-    margin: 4rem 0;
+    margin: 2rem 0;
 }
 
 #tsd-search {