diff --git a/.eslintignore b/.eslintignore
index abdc60587..b0ff90ab5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
+**/node_modules/*
 bin/*
 cli/wrappers/*
 coverage/*
diff --git a/cli/lib/tsd-jsdoc/publish.js b/cli/lib/tsd-jsdoc/publish.js
index cb4c6eca4..f131e2eb5 100644
--- a/cli/lib/tsd-jsdoc/publish.js
+++ b/cli/lib/tsd-jsdoc/publish.js
@@ -311,7 +311,10 @@ function writeInterface(element) {
 function writeInterfaceBody(element) {
     writeln("{");
     ++indent;
-    element.properties.forEach(writeProperty);
+    if (element.tsType)
+        writeln(element.tsType);
+    else if (element.properties && element.properties.length)
+        element.properties.forEach(writeProperty);
     --indent;
     write("}");
 }
@@ -429,6 +432,9 @@ function handleClass(element, parent) {
     writeln("{");
     ++indent;
 
+    if (element.tsType)
+        writeln(element.tsType);
+
     // constructor
     if (!is_interface && !element.virtual)
         handleFunction(element, parent, true);
diff --git a/cli/targets/static.js b/cli/targets/static.js
index deee1a52e..b3431bee0 100644
--- a/cli/targets/static.js
+++ b/cli/targets/static.js
@@ -68,7 +68,7 @@ function pushComment(lines) {
         return;
     var split = [];
     for (var i = 0; i < lines.length; ++i)
-        if (lines[i] !== null && lines[i].substring(0, 8) !== "@exclude")
+        if (lines[i] != null && lines[i].substring(0, 8) !== "@exclude")
             Array.prototype.push.apply(split, lines[i].split(/\r?\n/g));
     push("/**");
     split.forEach(function(line) {
@@ -79,7 +79,17 @@ function pushComment(lines) {
     push(" */");
 }
 
-function name(name) {
+function exportName(object, asInterface) {
+    var parts = object.fullName.substring(1).split("."),
+        i = 0;
+    while (i < parts.length)
+        parts[i] = escapeName(parts[i++]);
+    if (asInterface)
+        parts[i - 1] = "I" + parts[i - 1];
+    return parts.join(".");
+}
+
+function escapeName(name) {
     if (!name)
         return "$root";
     return cliUtil.reserved(name) ? name + "_" : name;
@@ -97,9 +107,9 @@ function buildNamespace(ref, ns) {
     if (ns.name !== "") {
         push("");
         if (!ref && config.es6)
-            push("export const " + name(ns.name) + " = " + name(ref) + "." + name(ns.name) + " = (() => {");
+            push("export const " + escapeName(ns.name) + " = " + escapeName(ref) + "." + escapeName(ns.name) + " = (() => {");
         else
-            push(name(ref) + "." + name(ns.name) + " = (function() {");
+            push(escapeName(ref) + "." + escapeName(ns.name) + " = (function() {");
         ++indent;
     }
 
@@ -111,10 +121,10 @@ function buildNamespace(ref, ns) {
         push("");
         pushComment([
             ns.comment || "Namespace " + ns.name + ".",
-            "@exports " + ns.fullName.substring(1),
-            "@namespace"
+            "@namespace",
+            ns.parent instanceof protobuf.Root ? "@name " + escapeName(ns.name) : "@memberof " + exportName(ns.parent),
         ]);
-        push((config.es6 ? "const" : "var") + " " + name(ns.name) + " = {};");
+        push((config.es6 ? "const" : "var") + " " + escapeName(ns.name) + " = {};");
     }
 
     ns.nestedArray.forEach(function(nested) {
@@ -125,7 +135,7 @@ function buildNamespace(ref, ns) {
     });
     if (ns.name !== "") {
         push("");
-        push("return " + name(ns.name) + ";");
+        push("return " + escapeName(ns.name) + ";");
         --indent;
         push("})();");
     }
@@ -276,9 +286,9 @@ function buildFunction(type, functionName, gen, scope) {
     if (isCtor) // constructor
         push(lines[0]);
     else if (hasScope) // enclose in an iife
-        push(name(type.name) + "." + functionName + " = (function(" + Object.keys(scope).join(", ") + ") { return " + lines[0]);
+        push(escapeName(type.name) + "." + escapeName(functionName) + " = (function(" + Object.keys(scope).map(escapeName).join(", ") + ") { return " + lines[0]);
     else
-        push(name(type.name) + "." + functionName + " = " + lines[0]);
+        push(escapeName(type.name) + "." + escapeName(functionName) + " = " + lines[0]);
     lines.slice(1, lines.length - 1).forEach(function(line) {
         var prev = indent;
         var i = 0;
@@ -324,10 +334,8 @@ function toJsType(field) {
             type = "Uint8Array";
             break;
         default:
-            if (field.resolve().resolvedType instanceof Enum)
-                type = field.resolvedType.fullName.substring(1); // reference the enum
-            else if (field.resolvedType instanceof Type)
-                type = field.resolvedType.fullName.substring(1) + (config.forceMessage ? "" : "$Properties"); // reference the typedef
+            if (field.resolve().resolvedType)
+                type = exportName(field.resolvedType, !(field.resolvedType instanceof protobuf.Enum || config.forceMessage));
             else
                 type = "*"; // should not happen
             break;
@@ -345,8 +353,8 @@ function buildType(ref, type) {
     if (config.comments) {
         var typeDef = [
             "Properties of " + aOrAn(type.name) + ".",
-            "@typedef " + fullName + "$Properties",
-            "@type {Object}"
+            "@interface I" + escapeName(type.name),
+            type.parent instanceof protobuf.Root ? "@name I" + escapeName(type.name) : "@memberof " + exportName(type.parent)
         ];
         type.fieldsArray.forEach(function(field) {
             var prop = util.safeProp(field.name);
@@ -362,9 +370,9 @@ function buildType(ref, type) {
     pushComment([
         "Constructs a new " + type.name + ".",
         type.comment ? "@classdesc " + type.comment : null,
-        "@exports " + fullName,
         "@constructor",
-        "@param {" + fullName + "$Properties=} [" + (config.beautify ? "properties" : "p") + "] Properties to set"
+        "@param {" + exportName(type, true) + "=} [" + (config.beautify ? "properties" : "p") + "] Properties to set",
+        type.parent instanceof protobuf.Root ? "@name " + escapeName(type.name) : "@memberof " + exportName(type.parent)
     ]);
     buildFunction(type, type.name, Type.generateConstructor(type));
 
@@ -387,19 +395,19 @@ function buildType(ref, type) {
             firstField = false;
         }
         if (field.repeated)
-            push(name(type.name) + ".prototype" + prop + " = $util.emptyArray;"); // overwritten in constructor
+            push(escapeName(type.name) + ".prototype" + prop + " = $util.emptyArray;"); // overwritten in constructor
         else if (field.map)
-            push(name(type.name) + ".prototype" + prop + " = $util.emptyObject;"); // overwritten in constructor
+            push(escapeName(type.name) + ".prototype" + prop + " = $util.emptyObject;"); // overwritten in constructor
         else if (field.long)
-            push(name(type.name) + ".prototype" + prop + " = $util.Long ? $util.Long.fromBits("
+            push(escapeName(type.name) + ".prototype" + prop + " = $util.Long ? $util.Long.fromBits("
                     + JSON.stringify(field.typeDefault.low) + ","
                     + JSON.stringify(field.typeDefault.high) + ","
                     + JSON.stringify(field.typeDefault.unsigned)
                 + ") : " + field.typeDefault.toNumber(field.type.charAt(0) === "u") + ";");
         else if (field.bytes) {
-            push(name(type.name) + ".prototype" + prop + " = $util.newBuffer(" + JSON.stringify(Array.prototype.slice.call(field.typeDefault)) + ");");
+            push(escapeName(type.name) + ".prototype" + prop + " = $util.newBuffer(" + JSON.stringify(Array.prototype.slice.call(field.typeDefault)) + ");");
         } else
-            push(name(type.name) + ".prototype" + prop + " = " + JSON.stringify(field.typeDefault) + ";");
+            push(escapeName(type.name) + ".prototype" + prop + " = " + JSON.stringify(field.typeDefault) + ";");
     });
 
     // virtual oneof fields
@@ -416,10 +424,10 @@ function buildType(ref, type) {
         push("");
         pushComment([
             oneof.comment || type.name + " " + oneof.name + ".",
-            "@name " + fullName + "#" + name(oneof.name),
+            "@name " + fullName + "#" + escapeName(oneof.name),
             "@type {string|undefined}"
         ]);
-        push("Object.defineProperty(" + name(type.name) + ".prototype, " + JSON.stringify(oneof.name) +", {");
+        push("Object.defineProperty(" + escapeName(type.name) + ".prototype, " + JSON.stringify(oneof.name) +", {");
         ++indent;
             push("get: $util.oneOfGetter($oneOfFields = [" + oneof.oneof.map(JSON.stringify).join(", ") + "]),");
             push("set: $util.oneOfSetter($oneOfFields)");
@@ -431,12 +439,12 @@ function buildType(ref, type) {
         push("");
         pushComment([
             "Creates a new " + type.name + " instance using the specified properties.",
-            "@param {" + fullName + "$Properties=} [properties] Properties to set",
-            "@returns {" + fullName + "} " + type.name + " instance"
+            "@param {" + exportName(type, true) + "=} [properties] Properties to set",
+            "@returns {" + exportName(type) + "} " + type.name + " instance"
         ]);
-        push(name(type.name) + ".create = function create(properties) {");
+        push(escapeName(type.name) + ".create = function create(properties) {");
             ++indent;
-            push("return new " + name(type.name) + "(properties);");
+            push("return new " + escapeName(type.name) + "(properties);");
             --indent;
         push("};");
     }
@@ -445,7 +453,7 @@ function buildType(ref, type) {
         push("");
         pushComment([
             "Encodes the specified " + type.name + " message. Does not implicitly {@link " + fullName + ".verify|verify} messages.",
-            "@param {" + fullName + (config.forceMessage ? "" : "$Properties") + "} " + (config.beautify ? "message" : "m") + " " + type.name + " message or plain object to encode",
+            "@param {" + exportName(type, !config.forceMessage) + "} " + (config.beautify ? "message" : "m") + " " + type.name + " message or plain object to encode",
             "@param {$protobuf.Writer} [" + (config.beautify ? "writer" : "w") + "] Writer to encode to",
             "@returns {$protobuf.Writer} Writer"
         ]);
@@ -455,11 +463,11 @@ function buildType(ref, type) {
             push("");
             pushComment([
                 "Encodes the specified " + type.name + " message, length delimited. Does not implicitly {@link " + fullName + ".verify|verify} messages.",
-                "@param {" + fullName + (config.forceMessage ? "" : "$Properties") + "} message " + type.name + " message or plain object to encode",
+                "@param {" + exportName(type, !config.forceMessage) + "} message " + type.name + " message or plain object to encode",
                 "@param {$protobuf.Writer} [writer] Writer to encode to",
                 "@returns {$protobuf.Writer} Writer"
             ]);
-            push(name(type.name) + ".encodeDelimited = function encodeDelimited(message, writer) {");
+            push(escapeName(type.name) + ".encodeDelimited = function encodeDelimited(message, writer) {");
             ++indent;
             push("return this.encode(message, writer).ldelim();");
             --indent;
@@ -488,7 +496,7 @@ function buildType(ref, type) {
                 "@throws {Error} If the payload is not a reader or valid buffer",
                 "@throws {$protobuf.util.ProtocolError} If required fields are missing"
             ]);
-            push(name(type.name) + ".decodeDelimited = function decodeDelimited(reader) {");
+            push(escapeName(type.name) + ".decodeDelimited = function decodeDelimited(reader) {");
             ++indent;
                 push("if (!(reader instanceof $Reader))");
                 ++indent;
@@ -523,7 +531,7 @@ function buildType(ref, type) {
         pushComment([
             "Creates a plain object from " + aOrAn(type.name) + " message. Also converts values to other types if specified.",
             "@param {" + fullName + "} " + (config.beautify ? "message" : "m") + " " + type.name,
-            "@param {$protobuf.ConversionOptions} [" + (config.beautify ? "options" : "o") + "] Conversion options",
+            "@param {$protobuf.IConversionOptions} [" + (config.beautify ? "options" : "o") + "] Conversion options",
             "@returns {Object.<string,*>} Plain object"
         ]);
         buildFunction(type, "toObject", protobuf.converter.toObject(type));
@@ -531,10 +539,10 @@ function buildType(ref, type) {
         push("");
         pushComment([
             "Creates a plain object from this " + type.name + " message. Also converts values to other types if specified.",
-            "@param {$protobuf.ConversionOptions} [options] Conversion options",
+            "@param {$protobuf.IConversionOptions} [options] Conversion options",
             "@returns {Object.<string,*>} Plain object"
         ]);
-        push(name(type.name) + ".prototype.toObject = function toObject(options) {");
+        push(escapeName(type.name) + ".prototype.toObject = function toObject(options) {");
         ++indent;
             push("return this.constructor.toObject(this, options);");
         --indent;
@@ -545,7 +553,7 @@ function buildType(ref, type) {
             "Converts this " + type.name + " to JSON.",
             "@returns {Object.<string,*>} JSON object"
         ]);
-        push(name(type.name) + ".prototype.toJSON = function toJSON() {");
+        push(escapeName(type.name) + ".prototype.toJSON = function toJSON() {");
         ++indent;
             push("return this.constructor.toObject(this, $protobuf.util.toJSONOptions);");
         --indent;
@@ -554,26 +562,25 @@ function buildType(ref, type) {
 }
 
 function buildService(ref, service) {
-    var fullName = service.fullName.substring(1);
 
     push("");
     pushComment([
         "Constructs a new " + service.name + " service.",
         service.comment ? "@classdesc " + service.comment : null,
-        "@exports " + fullName,
         "@extends $protobuf.rpc.Service",
         "@constructor",
         "@param {$protobuf.RPCImpl} rpcImpl RPC implementation",
         "@param {boolean} [requestDelimited=false] Whether requests are length-delimited",
-        "@param {boolean} [responseDelimited=false] Whether responses are length-delimited"
+        "@param {boolean} [responseDelimited=false] Whether responses are length-delimited",
+        service.parent instanceof protobuf.Root ? "@name " + escapeName(service.name) : "@memberof " + exportName(service.parent)
     ]);
-    push("function " + name(service.name) + "(rpcImpl, requestDelimited, responseDelimited) {");
+    push("function " + escapeName(service.name) + "(rpcImpl, requestDelimited, responseDelimited) {");
     ++indent;
     push("$protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited);");
     --indent;
     push("}");
     push("");
-    push("(" + name(service.name) + ".prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = " + name(service.name) + ";");
+    push("(" + escapeName(service.name) + ".prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = " + escapeName(service.name) + ";");
 
     if (config.create) {
         push("");
@@ -582,9 +589,9 @@ function buildService(ref, service) {
             "@param {$protobuf.RPCImpl} rpcImpl RPC implementation",
             "@param {boolean} [requestDelimited=false] Whether requests are length-delimited",
             "@param {boolean} [responseDelimited=false] Whether responses are length-delimited",
-            "@returns {" + name(service.name) + "} RPC service. Useful where requests and/or responses are streamed."
+            "@returns {" + escapeName(service.name) + "} RPC service. Useful where requests and/or responses are streamed."
         ]);
-        push(name(service.name) + ".create = function create(rpcImpl, requestDelimited, responseDelimited) {");
+        push(escapeName(service.name) + ".create = function create(rpcImpl, requestDelimited, responseDelimited) {");
             ++indent;
             push("return new this(rpcImpl, requestDelimited, responseDelimited);");
             --indent;
@@ -595,9 +602,9 @@ function buildService(ref, service) {
         method.resolve();
         var lcName = method.name.substring(0, 1).toLowerCase() + method.name.substring(1);
         push("");
-        var cbName = name(service.name) + "_" + name(lcName) + "_Callback";
+        var cbName = escapeName(service.name) + "_" + escapeName(lcName) + "_Callback";
         pushComment([
-            "Callback as used by {@link " + name(service.name) + "#" + name(lcName) + "}.",
+            "Callback as used by {@link " + escapeName(service.name) + "#" + escapeName(lcName) + "}.",
             // This is a more specialized version of protobuf.rpc.ServiceCallback
             "@typedef " + cbName,
             "@type {function}",
@@ -607,51 +614,43 @@ function buildService(ref, service) {
         push("");
         pushComment([
             method.comment || "Calls " + method.name + ".",
-            "@param {" + method.resolvedRequestType.fullName.substring(1) + "|Object.<string,*>} request " + method.resolvedRequestType.name + " message or plain object",
+            "@param {" + exportName(method.resolvedRequestType, !config.forceMessage) + "} request " + method.resolvedRequestType.name + " message or plain object",
             "@param {" + cbName + "} callback Node-style callback called with the error, if any, and " + method.resolvedResponseType.name,
             "@returns {undefined}"
         ]);
-        push(name(service.name) + ".prototype" + util.safeProp(lcName) + " = function " + name(lcName) + "(request, callback) {");
+        push(escapeName(service.name) + ".prototype" + util.safeProp(lcName) + " = function " + escapeName(lcName) + "(request, callback) {");
             ++indent;
-            push("return this.rpcCall(" + name(lcName) + ", $root" + method.resolvedRequestType.fullName + ", $root" + method.resolvedResponseType.fullName + ", request, callback);");
+            push("return this.rpcCall(" + escapeName(lcName) + ", $root" + method.resolvedRequestType.fullName + ", $root" + method.resolvedResponseType.fullName + ", request, callback);");
             --indent;
         push("};");
         if (config.comments)
             push("");
         pushComment([
             method.comment || "Calls " + method.name + ".",
-            "@name " + name(service.name) + "#" + lcName,
+            "@name " + escapeName(service.name) + "#" + lcName,
             "@function",
-            "@param {" + method.resolvedRequestType.fullName.substring(1) + "|Object.<string,*>} request " + method.resolvedRequestType.name + " message or plain object",
-            "@returns {Promise<"+method.resolvedResponseType.fullName.substring(1)+">} Promise",
+            "@param {" + exportName(method.resolvedRequestType, !config.forceMessage) + "} request " + method.resolvedRequestType.name + " message or plain object",
+            "@returns {Promise<" + exportName(method.resolvedResponseType) + ">} Promise",
             "@variation 2"
         ]);
     });
 }
 
 function buildEnum(ref, enm) {
-    var parentFullName = enm.parent.fullName.substring(1);
+
     push("");
     var comment = [
         enm.comment || enm.name + " enum.",
+        "@name " + escapeName(enm.name),
+        "@enum {number}",
+        enm.parent instanceof protobuf.Root ? "@name " + escapeName(enm.name) : "@memberof " + exportName(enm.parent)
     ];
-    if (parentFullName.length) // member
-        comment.push(
-            "@name " + name(enm.name),
-            "@memberof " + parentFullName,
-            "@enum {number}"
-        );
-    else // export
-        comment.push(
-            "@exports " + name(enm.name),
-            "@enum {number}"
-        );
     Object.keys(enm.values).forEach(function(key) {
         var val = enm.values[key];
         comment.push("@property {number} " + key + "=" + val + " " + (enm.comments[key] || key + " value"));
     });
     pushComment(comment);
-    push(name(ref) + "." + name(enm.name) + " = (function() {");
+    push(escapeName(ref) + "." + escapeName(enm.name) + " = (function() {");
     ++indent;
         push((config.es6 ? "const" : "var") + " valuesById = {}, values = Object.create(valuesById);");
         var aliased = [];
diff --git a/config/tslint.json b/config/tslint.json
index 6005e6f92..7af59004c 100644
--- a/config/tslint.json
+++ b/config/tslint.json
@@ -4,7 +4,8 @@
         "array-type": [ true, "array" ],
         "no-namespace": false,
         "interface-name": [ false ],
-        "interface-over-type-literal": false,
+        "interface-over-type-literal": true,
+        "no-empty-interface": false,
         "max-line-length": [ false ],
         "trailing-comma": [ true, "never" ],
         "variable-name": [ false ],
diff --git a/ext/descriptor/README.md b/ext/descriptor/README.md
index 920fcd488..d78ef79d0 100644
--- a/ext/descriptor/README.md
+++ b/ext/descriptor/README.md
@@ -34,39 +34,39 @@ API
 
 The extension adds `.fromDescriptor(descriptor[, syntax])` and `#toDescriptor([syntax])` methods to reflection objects and exports the `.google.protobuf` namespace of the internally used `Root` instance containing the following types present in descriptor.proto:
 
-| Descriptor type                | protobuf.js type | Remarks
-|--------------------------------|------------------|---------
-| **FileDescriptorSet**          | Root             |
-| FileDescriptorProto            |                  | dependencies are not supported
-| FileOptions                    |                  |
-| FileOptions_OptimizeMode       |                  |
-| SourceCodeInfo                 |                  | not supported
-| SourceCodeInfo_Location        |                  |
-| GeneratedCodeInfo              |                  | not supported
-| GeneratedCodeInfo_Annotation   |                  |
-| **DescriptorProto**            | Type             |
-| MessageOptions                 |                  |
-| DescriptorProto_ExtensionRange |                  |
-| DescriptorProto_ReservedRange  |                  |
-| **FieldDescriptorProto**       | Field            |
-| FieldDescriptorProto_Label     |                  |
-| FieldDescriptorProto_Type      |                  |
-| FieldOptions                   |                  |
-| FieldOptions_CType             |                  |
-| FieldOptions_JSType            |                  |
-| **OneofDescriptorProto**       | OneOf            |
-| OneofOptions                   |                  |
-| **EnumDescriptorProto**        | Enum             |
-| EnumOptions                    |                  |
-| EnumValueDescriptorProto       |                  |
-| EnumValueOptions               |                  | not supported
-| **ServiceDescriptorProto**     | Service          |
-| ServiceOptions                 |                  |
-| **MethodDescriptorProto**      | Method           |
-| MethodOptions                  |                  |
-| UninterpretedOption            |                  | not supported
-| UninterpretedOption_NamePart   |                  |
+| Descriptor type               | protobuf.js type | Remarks
+|-------------------------------|------------------|---------
+| **FileDescriptorSet**         | Root             |
+| FileDescriptorProto           |                  | dependencies are not supported
+| FileOptions                   |                  |
+| FileOptionsOptimizeMode       |                  |
+| SourceCodeInfo                |                  | not supported
+| SourceCodeInfoLocation        |                  |
+| GeneratedCodeInfo             |                  | not supported
+| GeneratedCodeInfoAnnotation   |                  |
+| **DescriptorProto**           | Type             |
+| MessageOptions                |                  |
+| DescriptorProtoExtensionRange |                  |
+| DescriptorProtoReservedRange  |                  |
+| **FieldDescriptorProto**      | Field            |
+| FieldDescriptorProtoLabel     |                  |
+| FieldDescriptorProtoType      |                  |
+| FieldOptions                  |                  |
+| FieldOptionsCType             |                  |
+| FieldOptionsJSType            |                  |
+| **OneofDescriptorProto**      | OneOf            |
+| OneofOptions                  |                  |
+| **EnumDescriptorProto**       | Enum             |
+| EnumOptions                   |                  |
+| EnumValueDescriptorProto      |                  |
+| EnumValueOptions              |                  | not supported
+| **ServiceDescriptorProto**    | Service          |
+| ServiceOptions                |                  |
+| **MethodDescriptorProto**     | Method           |
+| MethodOptions                 |                  |
+| UninterpretedOption           |                  | not supported
+| UninterpretedOptionNamePart   |                  |
 
 Note that not all features of descriptor.proto translate perfectly to a protobuf.js root instance. A root instance has only limited knowlege of packages or individual files for example, which is then compensated by guessing and generating fictional file names.
 
-When using TypeScript, the respective `...$Properties` types can be used to reference specific message types (i.e. `protobuf.Message<DescriptorProto$Properties>`).
+When using TypeScript, the respective interface types can be used to reference specific message instances (i.e. `protobuf.Message<IDescriptorProto>`).
diff --git a/ext/descriptor/index.d.ts b/ext/descriptor/index.d.ts
index 31ec94075..fa2e4610b 100644
--- a/ext/descriptor/index.d.ts
+++ b/ext/descriptor/index.d.ts
@@ -1,31 +1,31 @@
 import * as $protobuf from "../..";
 
-type FileDescriptorSet$Properties = {
-    file: FileDescriptorProto$Properties[];
-};
+export interface IFileDescriptorSet {
+    file: IFileDescriptorProto[];
+}
 
-type FileDescriptorProto$Properties = {
+export interface IFileDescriptorProto {
     name?: string;
     package?: string;
     dependency?: any;
     publicDependency?: any;
     weakDependency?: any;
-    messageType?: DescriptorProto$Properties[];
-    enumType?: EnumDescriptorProto$Properties[];
-    service?: ServiceDescriptorProto$Properties[];
-    extension?: FieldDescriptorProto$Properties[];
-    options?: FileOptions$Properties;
+    messageType?: IDescriptorProto[];
+    enumType?: IEnumDescriptorProto[];
+    service?: IServiceDescriptorProto[];
+    extension?: IFieldDescriptorProto[];
+    options?: IFileOptions;
     sourceCodeInfo?: any;
     syntax?: string;
-};
+}
 
-type FileOptions$Properties = {
+export interface IFileOptions {
     javaPackage?: string;
     javaOuterClassname?: string;
     javaMultipleFiles?: boolean;
     javaGenerateEqualsAndHash?: boolean;
     javaStringCheckUtf8?: boolean;
-    optimizeFor?: FileOptions$OptimizeMode;
+    optimizeFor?: IFileOptionsOptimizeMode;
     goPackage?: string;
     ccGenericServices?: boolean;
     javaGenericServices?: boolean;
@@ -34,105 +34,105 @@ type FileOptions$Properties = {
     ccEnableArenas?: boolean;
     objcClassPrefix?: string;
     csharpNamespace?: string;
-};
+}
 
-type FileOptions$OptimizeMode = number;
+type IFileOptionsOptimizeMode = number;
 
-type DescriptorProto$Properties = {
+export interface IDescriptorProto {
     name?: string;
-    field?: FieldDescriptorProto$Properties[];
-    extension?: FieldDescriptorProto$Properties[];
-    nestedType?: DescriptorProto$Properties[];
-    enumType?: EnumDescriptorProto$Properties[];
-    extensionRange?: ExtensionRange$Properties[];
-    oneofDecl?: OneofDescriptorProto$Properties[];
-    options?: MessageOptions$Properties;
-    reservedRange?: ReservedRange$Properties[];
+    field?: IFieldDescriptorProto[];
+    extension?: IFieldDescriptorProto[];
+    nestedType?: IDescriptorProto[];
+    enumType?: IEnumDescriptorProto[];
+    extensionRange?: IDescriptorProtoExtensionRange[];
+    oneofDecl?: IOneofDescriptorProto[];
+    options?: IMessageOptions;
+    reservedRange?: IDescriptorProtoReservedRange[];
     reservedName?: string[];
-};
+}
 
-type MessageOptions$Properties = {
+export interface IMessageOptions {
     mapEntry?: boolean;
-};
+}
 
-type ExtensionRange$Properties = {
+export interface IDescriptorProtoExtensionRange {
     start?: number;
     end?: number;
-};
+}
 
-type ReservedRange$Properties = {
+export interface IDescriptorProtoReservedRange {
     start?: number;
     end?: number;
-};
+}
 
-type FieldDescriptorProto$Properties = {
+export interface IFieldDescriptorProto {
     name?: string;
     number?: number;
-    label?: FieldDescriptorProto$Label;
-    type?: FieldDescriptorProto$Type;
+    label?: IFieldDescriptorProtoLabel;
+    type?: IFieldDescriptorProtoType;
     typeName?: string;
     extendee?: string;
     defaultValue?: string;
     oneofIndex?: number;
     jsonName?: any;
-    options?: FieldOptions$Properties;
-};
+    options?: IFieldOptionsProperties;
+}
 
-type FieldDescriptorProto$Label = number;
+type IFieldDescriptorProtoLabel = number;
 
-type FieldDescriptorProto$Type = number;
+type IFieldDescriptorProtoType = number;
 
-type FieldOptions$Properties = {
+export interface IFieldOptions {
     packed?: boolean;
-    jstype?: FieldOptions$JSType;
-};
+    jstype?: IFieldOptionsJSType;
+}
 
-type FieldOptions$JSType = number;
+type IFieldOptionsJSType = number;
 
-type EnumDescriptorProto$Properties = {
+export interface IEnumDescriptorProto {
     name?: string;
-    value?: EnumValueDescriptorProto$Properties[];
-    options?: EnumOptions$Properties;
-};
+    value?: IEnumValueDescriptorProto[];
+    options?: IEnumOptions;
+}
 
-type EnumValueDescriptorProto$Properties = {
+export interface IEnumValueDescriptorProto {
     name?: string;
     number?: number;
     options?: any;
-};
+}
 
-type EnumOptions$Properties = {
+export interface IEnumOptions {
     allowAlias?: boolean;
     deprecated?: boolean;
-};
+}
 
-type OneofDescriptorProto$Properties = {
+export interface IOneofDescriptorProto {
     name?: string;
     options?: any;
-};
+}
 
-type ServiceDescriptorProto$Properties = {
+export interface IServiceDescriptorProto {
     name?: string;
-    method?: MethodDescriptorProto$Properties[];
-    options?: ServiceOptions$Properties;
-};
+    method?: IMethodDescriptorProto[];
+    options?: IServiceOptions;
+}
 
-type ServiceOptions$Properties = {
+export interface IServiceOptions {
     deprecated?: boolean;
-};
+}
 
-type MethodDescriptorProto$Properties = {
+export interface IMethodDescriptorProto {
     name?: string;
     inputType?: string;
     outputType?: string;
-    options?: MethodOptions$Properties;
+    options?: IMethodOptions;
     clientStreaming?: boolean;
     serverStreaming?: boolean;
-};
+}
 
-type MethodOptions$Properties = {
+export interface IMethodOptions {
     deprecated?: boolean;
-};
+}
 
 export const FileDescriptorSet: $protobuf.Type;
 
@@ -140,15 +140,15 @@ export const FileDescriptorProto: $protobuf.Type;
 
 export const DescriptorProto: $protobuf.Type;
 
-export const DescriptorProto_ExtensionRange: $protobuf.Type;
+export const DescriptorProtoExtensionRange: $protobuf.Type;
 
-export const DescriptorProto_ReservedRange: $protobuf.Type;
+export const DescriptorProtoReservedRange: $protobuf.Type;
 
 export const FieldDescriptorProto: $protobuf.Type;
 
-export const FieldDescriptorProto_Label: $protobuf.Enum;
+export const FieldDescriptorProtoLabel: $protobuf.Enum;
 
-export const FieldDescriptorProto_Type: $protobuf.Enum;
+export const FieldDescriptorProtoType: $protobuf.Enum;
 
 export const OneofDescriptorProto: $protobuf.Type;
 
@@ -162,15 +162,15 @@ export const MethodDescriptorProto: $protobuf.Type;
 
 export const FileOptions: $protobuf.Type;
 
-export const FileOptions_OptimizeMode: $protobuf.Enum;
+export const FileOptionsOptimizeMode: $protobuf.Enum;
 
 export const MessageOptions: $protobuf.Type;
 
 export const FieldOptions: $protobuf.Type;
 
-export const FieldOptions_CType: $protobuf.Enum;
+export const FieldOptionsCType: $protobuf.Enum;
 
-export const FieldOptions_JSType: $protobuf.Enum;
+export const FieldOptionsJSType: $protobuf.Enum;
 
 export const OneofOptions: $protobuf.Type;
 
@@ -184,12 +184,12 @@ export const MethodOptions: $protobuf.Type;
 
 export const UninterpretedOption: $protobuf.Type;
 
-export const UninterpretedOption_NamePart: $protobuf.Type;
+export const UninterpretedOptionNamePart: $protobuf.Type;
 
 export const SourceCodeInfo: $protobuf.Type;
 
-export const SourceCodeInfo_Location: $protobuf.Type;
+export const SourceCodeInfoLocation: $protobuf.Type;
 
 export const GeneratedCodeInfo: $protobuf.Type;
 
-export const GeneratedCodeInfo_Annotation: $protobuf.Type;
+export const GeneratedCodeInfoAnnotation: $protobuf.Type;
diff --git a/ext/descriptor/index.js b/ext/descriptor/index.js
index 1e3291af8..fb597556e 100644
--- a/ext/descriptor/index.js
+++ b/ext/descriptor/index.js
@@ -16,39 +16,36 @@ var Namespace = $protobuf.Namespace,
 
 /**
  * Properties of a FileDescriptorSet message.
- * @typedef FileDescriptorSet$Properties
- * @type {Object}
- * @property {FileDescriptorProto$Properties[]} file Files
+ * @interface IFileDescriptorSet
+ * @property {IFileDescriptorProto[]} file Files
  */
 
 /**
  * Properties of a FileDescriptorProto message.
- * @typedef FileDescriptorProto$Properties
- * @type {Object}
+ * @interface IFileDescriptorProto
  * @property {string} [name] File name
  * @property {string} [package] Package
  * @property {*} [dependency] Not supported
  * @property {*} [publicDependency] Not supported
  * @property {*} [weakDependency] Not supported
- * @property {DescriptorProto$Properties[]} [messageType] Nested message types
- * @property {EnumDescriptorProto$Properties[]} [enumType] Nested enums
- * @property {ServiceDescriptorProto$Properties[]} [service] Nested services
- * @property {FieldDescriptorProto$Properties[]} [extension] Nested extension fields
- * @property {FileOptions$Properties} [options] Options
+ * @property {IDescriptorProto[]} [messageType] Nested message types
+ * @property {IEnumDescriptorProto[]} [enumType] Nested enums
+ * @property {IServiceDescriptorProto[]} [service] Nested services
+ * @property {IFieldDescriptorProto[]} [extension] Nested extension fields
+ * @property {IFileOptions} [options] Options
  * @property {*} [sourceCodeInfo] Not supported
  * @property {string} [syntax="proto2"] Syntax
  */
 
 /**
  * Properties of a FileOptions message.
- * @typedef FileOptions$Properties
- * @type {Object}
+ * @interface IFileOptions
  * @property {string} [javaPackage]
  * @property {string} [javaOuterClassname]
  * @property {boolean} [javaMultipleFiles]
  * @property {boolean} [javaGenerateEqualsAndHash]
  * @property {boolean} [javaStringCheckUtf8]
- * @property {FileOptions$OptimizeMode} [optimizeFor=1]
+ * @property {IFileOptionsOptimizeMode} [optimizeFor=1]
  * @property {string} [goPackage]
  * @property {boolean} [ccGenericServices]
  * @property {boolean} [javaGenericServices]
@@ -61,7 +58,7 @@ var Namespace = $protobuf.Namespace,
 
 /**
  * Values of he FileOptions.OptimizeMode enum.
- * @typedef FileOptions$OptimizeMode
+ * @typedef IFileOptionsOptimizeMode
  * @type {number}
  * @property {number} SPEED=1
  * @property {number} CODE_SIZE=2
@@ -70,7 +67,7 @@ var Namespace = $protobuf.Namespace,
 
 /**
  * Creates a root from a descriptor set.
- * @param {FileDescriptorSet$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IFileDescriptorSet|Reader|Uint8Array} descriptor Descriptor
  * @returns {Root} Root instance
  */
 Root.fromDescriptor = function fromDescriptor(descriptor) {
@@ -113,7 +110,7 @@ Root.fromDescriptor = function fromDescriptor(descriptor) {
 
 /**
  * Converts a root to a descriptor set.
- * @returns {Message<FileDescriptorSet$Properties>} Descriptor
+ * @returns {Message<IFileDescriptorSet>} Descriptor
  * @param {string} [syntax="proto2"] Syntax
  */
 Root.prototype.toDescriptor = function toDescriptor(syntax) {
@@ -157,39 +154,35 @@ function Root_toDescriptorRecursive(ns, files, syntax) {
 
 /**
  * Properties of a DescriptorProto message.
- * @typedef DescriptorProto$Properties
- * @type {Object}
+ * @interface IDescriptorProto
  * @property {string} [name] Message type name
- * @property {FieldDescriptorProto$Properties[]} [field] Fields
- * @property {FieldDescriptorProto$Properties[]} [extension] Extension fields
- * @property {DescriptorProto$Properties[]} [nestedType] Nested message types
- * @property {EnumDescriptorProto$Properties[]} [enumType] Nested enums
- * @property {ExtensionRange$Properties[]} [extensionRange] Extension ranges
- * @property {OneofDescriptorProto$Properties[]} [oneofDecl] Oneofs
- * @property {MessageOptions$Properties} [options] Not supported
- * @property {ReservedRange$Properties[]} [reservedRange] Reserved ranges
+ * @property {IFieldDescriptorProto[]} [field] Fields
+ * @property {IFieldDescriptorProto[]} [extension] Extension fields
+ * @property {IDescriptorProto[]} [nestedType] Nested message types
+ * @property {IEnumDescriptorProto[]} [enumType] Nested enums
+ * @property {IDescriptorProtoExtensionRange[]} [extensionRange] Extension ranges
+ * @property {IOneofDescriptorProto[]} [oneofDecl] Oneofs
+ * @property {IMessageOptions} [options] Not supported
+ * @property {IDescriptorProtoReservedRange[]} [reservedRange] Reserved ranges
  * @property {string[]} [reservedName] Reserved names
  */
 
 /**
  * Properties of a MessageOptions message.
- * @typedef MessageOptions$Properties
- * @type {Object}
+ * @interface IMessageOptions
  * @property {boolean} [mapEntry=false] Whether this message is a map entry
  */
 
 /**
  * Properties of an ExtensionRange message.
- * @typedef ExtensionRange$Properties
- * @type {Object}
+ * @interface IDescriptorProtoExtensionRange
  * @property {number} [start] Start field id
  * @property {number} [end] End field id
  */
 
 /**
  * Properties of a ReservedRange message.
- * @typedef ReservedRange$Properties
- * @type {Object}
+ * @interface IDescriptorProtoReservedRange
  * @property {number} [start] Start field id
  * @property {number} [end] End field id
  */
@@ -198,7 +191,7 @@ var unnamedMessageIndex = 0;
 
 /**
  * Creates a type from a descriptor.
- * @param {DescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @param {string} [syntax="proto2"] Syntax
  * @returns {Type} Type instance
  */
@@ -254,7 +247,7 @@ Type.fromDescriptor = function fromDescriptor(descriptor, syntax) {
 
 /**
  * Converts a type to a descriptor.
- * @returns {Message<DescriptorProto$Properties>} Descriptor
+ * @returns {Message<IDescriptorProto>} Descriptor
  * @param {string} [syntax="proto2"] Syntax
  */
 Type.prototype.toDescriptor = function toDescriptor(syntax) {
@@ -310,23 +303,22 @@ Type.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Properties of a FieldDescriptorProto message.
- * @typedef FieldDescriptorProto$Properties
- * @type {Object}
+ * @interface IFieldDescriptorProto
  * @property {string} [name] Field name
  * @property {number} [number] Field id
- * @property {FieldDescriptorProto$Label} [label] Field rule
- * @property {FieldDescriptorProto$Type} [type] Field basic type
+ * @property {IFieldDescriptorProtoLabel} [label] Field rule
+ * @property {IFieldDescriptorProtoType} [type] Field basic type
  * @property {string} [typeName] Field type name
  * @property {string} [extendee] Extended type name
  * @property {string} [defaultValue] Literal default value
  * @property {number} [oneofIndex] Oneof index if part of a oneof
  * @property {*} [jsonName] Not supported
- * @property {FieldOptions$Properties} [options] Field options
+ * @property {IFieldOptionsProperties} [options] Field options
  */
 
 /**
  * Values of the FieldDescriptorProto.Label enum.
- * @typedef FieldDescriptorProto$Label
+ * @typedef IFieldDescriptorProtoLabel
  * @type {number}
  * @property {number} LABEL_OPTIONAL=1
  * @property {number} LABEL_REQUIRED=2
@@ -335,7 +327,7 @@ Type.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Values of the FieldDescriptorProto.Type enum.
- * @typedef FieldDescriptorProto$Type
+ * @typedef IFieldDescriptorProtoType
  * @type {number}
  * @property {number} TYPE_DOUBLE=1
  * @property {number} TYPE_FLOAT=2
@@ -359,15 +351,14 @@ Type.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Properties of a FieldOptions message.
- * @typedef FieldOptions$Properties
- * @type {Object}
+ * @interface IFieldOptions
  * @property {boolean} [packed] Whether packed or not (defaults to `false` for proto2 and `true` for proto3)
- * @property {FieldOptions$JSType} [jstype] JavaScript value type (not used by protobuf.js)
+ * @property {IFieldOptionsJSType} [jstype] JavaScript value type (not used by protobuf.js)
  */
 
 /**
  * Values of the FieldOptions.JSType enum.
- * @typedef FieldOptions$JSType
+ * @typedef IFieldOptionsJSType
  * @type {number}
  * @property {number} JS_NORMAL=0
  * @property {number} JS_STRING=1
@@ -376,7 +367,7 @@ Type.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Creates a field from a descriptor.
- * @param {FieldDescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @param {string} [syntax="proto2"] Syntax
  * @returns {Field} Field instance
  */
@@ -447,7 +438,7 @@ Field.fromDescriptor = function fromDescriptor(descriptor, syntax) {
 
 /**
  * Converts a field to a descriptor.
- * @returns {Message<FieldDescriptorProto$Properties>} Descriptor
+ * @returns {Message<IFieldDescriptorProto>} Descriptor
  * @param {string} [syntax="proto2"] Syntax
  */
 Field.prototype.toDescriptor = function toDescriptor(syntax) {
@@ -506,17 +497,15 @@ Field.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Properties of an EnumDescriptorProto message.
- * @typedef EnumDescriptorProto$Properties
- * @type {Object}
+ * @interface IEnumDescriptorProto
  * @property {string} [name] Enum name
- * @property {EnumValueDescriptorProto$Properties[]} [value] Enum values
- * @property {EnumOptions$Properties} [options] Enum options
+ * @property {IEnumValueDescriptorProto[]} [value] Enum values
+ * @property {IEnumOptions} [options] Enum options
  */
 
 /**
  * Properties of an EnumValueDescriptorProto message.
- * @typedef EnumValueDescriptorProto$Properties
- * @type {Object}
+ * @interface IEnumValueDescriptorProto
  * @property {string} [name] Name
  * @property {number} [number] Value
  * @property {*} [options] Not supported
@@ -524,8 +513,7 @@ Field.prototype.toDescriptor = function toDescriptor(syntax) {
 
 /**
  * Properties of an EnumOptions message.
- * @typedef EnumOptions$Properties
- * @type {Object}
+ * @interface IEnumOptions
  * @property {boolean} [allowAlias] Whether aliases are allowed
  * @property {boolean} [deprecated]
  */
@@ -534,7 +522,7 @@ var unnamedEnumIndex = 0;
 
 /**
  * Creates an enum from a descriptor.
- * @param {EnumDescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IEnumDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @returns {Enum} Enum instance
  */
 Enum.fromDescriptor = function fromDescriptor(descriptor) {
@@ -561,7 +549,7 @@ Enum.fromDescriptor = function fromDescriptor(descriptor) {
 
 /**
  * Converts an enum to a descriptor.
- * @returns {Message<EnumDescriptorProto$Properties>} Descriptor
+ * @returns {Message<IEnumDescriptorProto>} Descriptor
  */
 Enum.prototype.toDescriptor = function toDescriptor() {
 
@@ -581,8 +569,7 @@ Enum.prototype.toDescriptor = function toDescriptor() {
 
 /**
  * Properties of a OneofDescriptorProto message.
- * @typedef OneofDescriptorProto$Properties
- * @type {Object}
+ * @interface IOneofDescriptorProto
  * @property {string} [name] Oneof name
  * @property {*} [options] Not supported
  */
@@ -591,7 +578,7 @@ var unnamedOneofIndex = 0;
 
 /**
  * Creates a oneof from a descriptor.
- * @param {OneofDescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IOneofDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @returns {OneOf} OneOf instance
  */
 OneOf.fromDescriptor = function fromDescriptor(descriptor) {
@@ -609,7 +596,7 @@ OneOf.fromDescriptor = function fromDescriptor(descriptor) {
 
 /**
  * Converts a oneof to a descriptor.
- * @returns {Message<OneofDescriptorProto$Properties>} Descriptor
+ * @returns {Message<IOneofDescriptorProto>} Descriptor
  */
 OneOf.prototype.toDescriptor = function toDescriptor() {
     return exports.OneofDescriptorProto.create({
@@ -622,17 +609,15 @@ OneOf.prototype.toDescriptor = function toDescriptor() {
 
 /**
  * Properties of a ServiceDescriptorProto message.
- * @typedef ServiceDescriptorProto$Properties
- * @type {Object}
+ * @interface IServiceDescriptorProto
  * @property {string} [name] Service name
- * @property {MethodDescriptorProto$Properties[]} [method] Methods
- * @property {ServiceOptions$Properties} [options] Options
+ * @property {IMethodDescriptorProto[]} [method] Methods
+ * @property {IServiceOptions} [options] Options
  */
 
 /**
  * Properties of a ServiceOptions message.
- * @typedef ServiceOptions$Properties
- * @type {Object}
+ * @interface IServiceOptions
  * @property {boolean} [deprecated]
  */
 
@@ -640,7 +625,7 @@ var unnamedServiceIndex = 0;
 
 /**
  * Creates a service from a descriptor.
- * @param {ServiceDescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IServiceDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @returns {Service} Service instance
  */
 Service.fromDescriptor = function fromDescriptor(descriptor) {
@@ -659,7 +644,7 @@ Service.fromDescriptor = function fromDescriptor(descriptor) {
 
 /**
  * Converts a service to a descriptor.
- * @returns {Message<ServiceDescriptorProto$Properties>} Descriptor
+ * @returns {Message<IServiceDescriptorProto>} Descriptor
  */
 Service.prototype.toDescriptor = function toDescriptor() {
 
@@ -679,20 +664,18 @@ Service.prototype.toDescriptor = function toDescriptor() {
 
 /**
  * Properties of a MethodDescriptorProto message.
- * @typedef MethodDescriptorProto$Properties
- * @type {Object}
+ * @interface IMethodDescriptorProto
  * @property {string} [name] Method name
  * @property {string} [inputType] Request type name
  * @property {string} [outputType] Response type name
- * @property {MethodOptions$Properties} [options] Not supported
+ * @property {IMethodOptions} [options] Not supported
  * @property {boolean} [clientStreaming=false] Whether requests are streamed
  * @property {boolean} [serverStreaming=false] Whether responses are streamed
  */
 
 /**
  * Properties of a MethodOptions message.
- * @typedef MethodOptions$Properties
- * @type {Object}
+ * @interface IMethodOptions
  * @property {boolean} [deprecated]
  */
 
@@ -700,7 +683,7 @@ var unnamedMethodIndex = 0;
 
 /**
  * Creates a method from a descriptor.
- * @param {MethodDescriptorProto$Properties|Reader|Uint8Array} descriptor Descriptor
+ * @param {IMethodDescriptorProto|Reader|Uint8Array} descriptor Descriptor
  * @returns {Method} Reflected method instance
  */
 Method.fromDescriptor = function fromDescriptor(descriptor) {
@@ -723,7 +706,7 @@ Method.fromDescriptor = function fromDescriptor(descriptor) {
 
 /**
  * Converts a method to a descriptor.
- * @returns {Message<MethodDescriptorProto$Properties>} Descriptor
+ * @returns {Message<IMethodDescriptorProto>} Descriptor
  */
 Method.prototype.toDescriptor = function toDescriptor() {
     return exports.MethodDescriptorProto.create({
@@ -897,21 +880,21 @@ function underScore(str) {
 
 /**
  * Reflected descriptor proto extension range.
- * @name DescriptorProto_ExtensionRange
+ * @name DescriptorProtoExtensionRange
  * @type {Type}
  * @const
  * @tstype $protobuf.Type
  */
-exports.DescriptorProto_ExtensionRange = exports.DescriptorProto.ExtensionRange;
+exports.DescriptorProtoExtensionRange = exports.DescriptorProto.ExtensionRange;
 
 /**
  * Reflected descriptor proto reserved range.
- * @name DescriptorProto_ReservedRange
+ * @name DescriptorProtoReservedRange
  * @type {Type}
  * @const
  * @tstype $protobuf.Type
  */
-exports.DescriptorProto_ReservedRange = exports.DescriptorProto.ReservedRange;
+exports.DescriptorProtoReservedRange = exports.DescriptorProto.ReservedRange;
 
 /**
  * Reflected field descriptor proto.
@@ -923,21 +906,21 @@ exports.DescriptorProto_ReservedRange = exports.DescriptorProto.ReservedRange;
 
 /**
  * Reflected field descriptor proto label.
- * @name FieldDescriptorProto_Label
+ * @name FieldDescriptorProtoLabel
  * @type {Enum}
  * @const
  * @tstype $protobuf.Enum
  */
-exports.FieldDescriptorProto_Label = exports.FieldDescriptorProto.Label;
+exports.FieldDescriptorProtoLabel = exports.FieldDescriptorProto.Label;
 
 /**
  * Reflected field descriptor proto type.
- * @name FieldDescriptorProto_Type
+ * @name FieldDescriptorProtoType
  * @type {Enum}
  * @const
  * @tstype $protobuf.Enum
  */
-exports.FieldDescriptorProto_Type = exports.FieldDescriptorProto.Type;
+exports.FieldDescriptorProtoType = exports.FieldDescriptorProto.Type;
 
 /**
  * Reflected oneof descriptor proto.
@@ -989,12 +972,12 @@ exports.FieldDescriptorProto_Type = exports.FieldDescriptorProto.Type;
 
 /**
  * Reflected file options optimize mode.
- * @name FileOptions_OptimizeMode
+ * @name FileOptionsOptimizeMode
  * @type {Type}
  * @const
  * @tstype $protobuf.Enum
  */
-exports.FileOptions_OptimizeMode = exports.FileOptions.OptimizeMode;
+exports.FileOptionsOptimizeMode = exports.FileOptions.OptimizeMode;
 
 /**
  * Reflected message options.
@@ -1014,21 +997,21 @@ exports.FileOptions_OptimizeMode = exports.FileOptions.OptimizeMode;
 
 /**
  * Reflected field options c-type.
- * @name FieldOptions_CType
+ * @name FieldOptionsCType
  * @type {Enum}
  * @const
  * @tstype $protobuf.Enum
  */
-exports.FieldOptions_CType = exports.FieldOptions.CType;
+exports.FieldOptionsCType = exports.FieldOptions.CType;
 
 /**
  * Reflected field options js-type.
- * @name FieldOptions_JSType
+ * @name FieldOptionsJSType
  * @type {Enum}
  * @const
  * @tstype $protobuf.Enum
  */
-exports.FieldOptions_JSType = exports.FieldOptions.JSType;
+exports.FieldOptionsJSType = exports.FieldOptions.JSType;
 
 /**
  * Reflected oneof options.
@@ -1080,12 +1063,12 @@ exports.FieldOptions_JSType = exports.FieldOptions.JSType;
 
 /**
  * Reflected uninterpreted option name part.
- * @name UninterpretedOption_NamePart
+ * @name UninterpretedOptionNamePart
  * @type {Type}
  * @const
  * @tstype $protobuf.Type
  */
-exports.UninterpretedOption_NamePart = exports.UninterpretedOption.NamePart;
+exports.UninterpretedOptionNamePart = exports.UninterpretedOption.NamePart;
 
 /**
  * Reflected source code info.
@@ -1097,12 +1080,12 @@ exports.UninterpretedOption_NamePart = exports.UninterpretedOption.NamePart;
 
 /**
  * Reflected source code info location.
- * @name SourceCodeInfo_Location
+ * @name SourceCodeInfoLocation
  * @type {Type}
  * @const
  * @tstype $protobuf.Type
  */
-exports.SourceCodeInfo_Location = exports.SourceCodeInfo.Location;
+exports.SourceCodeInfoLocation = exports.SourceCodeInfo.Location;
 
 /**
  * Reflected generated code info.
@@ -1114,9 +1097,9 @@ exports.SourceCodeInfo_Location = exports.SourceCodeInfo.Location;
 
 /**
  * Reflected generated code info annotation.
- * @name GeneratedCodeInfo_Annotation
+ * @name GeneratedCodeInfoAnnotation
  * @type {Type}
  * @const
  * @tstype $protobuf.Type
  */
-exports.GeneratedCodeInfo_Annotation = exports.GeneratedCodeInfo.Annotation;
+exports.GeneratedCodeInfoAnnotation = exports.GeneratedCodeInfo.Annotation;
diff --git a/index.d.ts b/index.d.ts
index 8fb6acb99..c68165b67 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -21,6 +21,181 @@ export as namespace protobuf;
  */
 export function common(name: string, json: { [k: string]: any }): void;
 
+/**
+ * Properties of a google.protobuf.Any message.
+ * @interface IAny
+ * @type {Object}
+ * @property {string} [typeUrl]
+ * @property {Uint8Array} [bytes]
+ */
+export interface IAny {
+    typeUrl?: string;
+    bytes?: Uint8Array;
+}
+
+/**
+ * Properties of a google.protobuf.Duration message.
+ * @interface IDuration
+ * @type {Object}
+ * @property {number|Long} [seconds]
+ * @property {number} [nanos]
+ */
+export interface IDuration {
+    seconds?: (number|Long);
+    nanos?: number;
+}
+
+/**
+ * Properties of a google.protobuf.Timestamp message.
+ * @interface ITimestamp
+ * @type {Object}
+ * @property {number|Long} [seconds]
+ * @property {number} [nanos]
+ */
+export interface ITimestamp {
+    seconds?: (number|Long);
+    nanos?: number;
+}
+
+/**
+ * Properties of a google.protobuf.Empty message.
+ * @interface IEmpty
+ */
+export interface IEmpty {
+}
+
+/**
+ * Properties of a google.protobuf.Struct message.
+ * @interface IStruct
+ * @type {Object}
+ * @property {Object.<string,IValue>} [fields]
+ */
+export interface IStruct {
+    fields?: { [k: string]: IValue };
+}
+
+/**
+ * Properties of a google.protobuf.Value message.
+ * @interface IValue
+ * @type {Object}
+ * @property {string} [kind]
+ * @property {0} [nullValue]
+ * @property {number} [numberValue]
+ * @property {string} [stringValue]
+ * @property {boolean} [boolValue]
+ * @property {IStruct} [structValue]
+ * @property {IListValue} [listValue]
+ */
+export interface IValue {
+    kind?: string;
+    nullValue?: 0;
+    numberValue?: number;
+    stringValue?: string;
+    boolValue?: boolean;
+    structValue?: IStruct;
+    listValue?: IListValue;
+}
+
+/**
+ * Properties of a google.protobuf.ListValue message.
+ * @interface IListValue
+ * @type {Object}
+ * @property {Array.<IValue>} [values]
+ */
+export interface IListValue {
+    values?: IValue[];
+}
+
+/**
+ * Properties of a google.protobuf.DoubleValue message.
+ * @interface IDoubleValue
+ * @type {Object}
+ * @property {number} [value]
+ */
+export interface IDoubleValue {
+    value?: number;
+}
+
+/**
+ * Properties of a google.protobuf.FloatValue message.
+ * @interface IFloatValue
+ * @type {Object}
+ * @property {number} [value]
+ */
+export interface IFloatValue {
+    value?: number;
+}
+
+/**
+ * Properties of a google.protobuf.Int64Value message.
+ * @interface IInt64Value
+ * @type {Object}
+ * @property {number|Long} [value]
+ */
+export interface IInt64Value {
+    value?: (number|Long);
+}
+
+/**
+ * Properties of a google.protobuf.UInt64Value message.
+ * @interface IUInt64Value
+ * @type {Object}
+ * @property {number|Long} [value]
+ */
+export interface IUInt64Value {
+    value?: (number|Long);
+}
+
+/**
+ * Properties of a google.protobuf.Int32Value message.
+ * @interface IInt32Value
+ * @type {Object}
+ * @property {number} [value]
+ */
+export interface IInt32Value {
+    value?: number;
+}
+
+/**
+ * Properties of a google.protobuf.UInt32Value message.
+ * @interface IUInt32Value
+ * @type {Object}
+ * @property {number} [value]
+ */
+export interface IUInt32Value {
+    value?: number;
+}
+
+/**
+ * Properties of a google.protobuf.BoolValue message.
+ * @interface IBoolValue
+ * @type {Object}
+ * @property {boolean} [value]
+ */
+export interface IBoolValue {
+    value?: boolean;
+}
+
+/**
+ * Properties of a google.protobuf.StringValue message.
+ * @interface IStringValue
+ * @type {Object}
+ * @property {string} [value]
+ */
+export interface IStringValue {
+    value?: string;
+}
+
+/**
+ * Properties of a google.protobuf.BytesValue message.
+ * @interface IBytesValue
+ * @type {Object}
+ * @property {Uint8Array} [value]
+ */
+export interface IBytesValue {
+    value?: Uint8Array;
+}
+
 /**
  * Runtime message from/to plain object converters.
  * @namespace
@@ -99,17 +274,17 @@ export class Enum extends ReflectionObject {
     /**
      * Constructs an enum from an enum descriptor.
      * @param {string} name Enum name
-     * @param {EnumDescriptor} json Enum descriptor
+     * @param {IEnum} json Enum descriptor
      * @returns {Enum} Created enum
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: EnumDescriptor): Enum;
+    public static fromJSON(name: string, json: IEnum): Enum;
 
     /**
      * Converts this enum to an enum descriptor.
-     * @returns {EnumDescriptor} Enum descriptor
+     * @returns {IEnum} Enum descriptor
      */
-    public toJSON(): EnumDescriptor;
+    public toJSON(): IEnum;
 
     /**
      * Adds a value to this enum.
@@ -132,10 +307,16 @@ export class Enum extends ReflectionObject {
     public remove(name: string): Enum;
 }
 
-type EnumDescriptor = {
+/**
+ * Enum descriptor.
+ * @interface IEnum
+ * @property {Object.<string,number>} values Enum values
+ * @property {Object.<string,*>} [options] Enum options
+ */
+export interface IEnum {
     values: { [k: string]: number };
     options?: { [k: string]: any };
-};
+}
 
 /**
  * Constructs a new message field instance. Note that {@link MapField|map fields} have their own class.
@@ -170,11 +351,11 @@ export class Field extends FieldBase {
     /**
      * Constructs a field from a field descriptor.
      * @param {string} name Field name
-     * @param {FieldDescriptor} json Field descriptor
+     * @param {IField} json Field descriptor
      * @returns {Field} Created field
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: FieldDescriptor): Field;
+    public static fromJSON(name: string, json: IField): Field;
 
     /**
      * Determines whether this field is packed. Only relevant when repeated and working with proto2.
@@ -202,13 +383,13 @@ export class Field extends FieldBase {
      * @name Field.d
      * @function
      * @param {number} fieldId Field id
-     * @param {Constructor<T>} fieldType Field type
+     * @param {Constructor<T>|string} fieldType Field type
      * @param {"optional"|"required"|"repeated"} [fieldRule="optional"] Field rule
      * @returns {FieldDecorator} Decorator function
      * @template T extends Message<T>
      * @variation 2
      */
-    public static d<T extends Message<T>>(fieldId: number, fieldType: Constructor<T>, fieldRule?: ("optional"|"required"|"repeated")): FieldDecorator;
+    public static d<T extends Message<T>>(fieldId: number, fieldType: (Constructor<T>|string), fieldRule?: ("optional"|"required"|"repeated")): FieldDecorator;
 }
 
 /**
@@ -345,9 +526,9 @@ export class FieldBase extends ReflectionObject {
 
     /**
      * Converts this field to a field descriptor.
-     * @returns {FieldDescriptor} Field descriptor
+     * @returns {IField} Field descriptor
      */
-    public toJSON(): FieldDescriptor;
+    public toJSON(): IField;
 
     /**
      * Resolves this field's type references.
@@ -357,20 +538,30 @@ export class FieldBase extends ReflectionObject {
     public resolve(): Field;
 }
 
-type FieldDescriptor = {
+/**
+ * Field descriptor.
+ * @interface IField
+ * @property {string} [rule="optional"] Field rule
+ * @property {string} type Field type
+ * @property {number} id Field id
+ * @property {Object.<string,*>} [options] Field options
+ */
+export interface IField {
     rule?: string;
     type: string;
     id: number;
     options?: { [k: string]: any };
-};
+}
 
-type ExtensionFieldDescriptor = {
-    rule?: string;
-    type: string;
-    id: number;
+/**
+ * Extension field descriptor.
+ * @interface IExtensionField
+ * @extends IField
+ * @property {string} extend Extended type
+ */
+export interface IExtensionField extends IField {
     extend: string;
-    options?: { [k: string]: any };
-};
+}
 
 type FieldDecorator = (prototype: object, fieldName: string) => void;
 
@@ -501,17 +692,17 @@ export class MapField extends FieldBase {
     /**
      * Constructs a map field from a map field descriptor.
      * @param {string} name Field name
-     * @param {MapFieldDescriptor} json Map field descriptor
+     * @param {IMapField} json Map field descriptor
      * @returns {MapField} Created map field
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: MapFieldDescriptor): MapField;
+    public static fromJSON(name: string, json: IMapField): MapField;
 
     /**
      * Converts this map field to a map field descriptor.
-     * @returns {MapFieldDescriptor} Map field descriptor
+     * @returns {IMapField} Map field descriptor
      */
-    public toJSON(): MapFieldDescriptor;
+    public toJSON(): IMapField;
 
     /**
      * Map field decorator (TypeScript).
@@ -526,20 +717,25 @@ export class MapField extends FieldBase {
     public static d<T extends { [key: string]: number | Long | string | boolean | Uint8Array | Buffer | number[] | Message<{}> }>(fieldId: number, fieldKeyType: ("int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"), fieldValueType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"|"bytes"|object|Constructor<{}>)): FieldDecorator;
 }
 
-type MapFieldDescriptor = {
+/**
+ * Map field descriptor.
+ * @interface IMapField
+ * @extends {IField}
+ * @property {string} keyType Key type
+ */
+export interface IMapField extends IField {
     keyType: string;
-    type: string;
-    id: number;
-    options?: { [k: string]: any };
-};
+}
 
-type ExtensionMapFieldDescriptor = {
-    keyType: string;
-    type: string;
-    id: number;
+/**
+ * Extension map field descriptor.
+ * @interface IExtensionMapField
+ * @extends IMapField
+ * @property {string} extend Extended type
+ */
+export interface IExtensionMapField extends IMapField {
     extend: string;
-    options?: { [k: string]: any };
-};
+}
 
 /**
  * Constructs a new message instance.
@@ -647,19 +843,19 @@ export class Message<T extends object> {
     /**
      * Creates a plain object from a message of this type. Also converts values to other types if specified.
      * @param {T} message Message instance
-     * @param {ConversionOptions} [options] Conversion options
+     * @param {IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      * @template T extends Message<T>
      * @this Constructor<T>
      */
-    public static toObject<T extends Message<T>>(this: Constructor<T>, message: T, options?: ConversionOptions): { [k: string]: any };
+    public static toObject<T extends Message<T>>(this: Constructor<T>, message: T, options?: IConversionOptions): { [k: string]: any };
 
     /**
      * Creates a plain object from this message. Also converts values to other types if specified.
-     * @param {ConversionOptions} [options] Conversion options
+     * @param {IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
-    public toObject(options?: ConversionOptions): { [k: string]: any };
+    public toObject(options?: IConversionOptions): { [k: string]: any };
 
     /**
      * Converts this message to JSON.
@@ -743,27 +939,37 @@ export class Method extends ReflectionObject {
     /**
      * Constructs a method from a method descriptor.
      * @param {string} name Method name
-     * @param {MethodDescriptor} json Method descriptor
+     * @param {IMethod} json Method descriptor
      * @returns {Method} Created method
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: MethodDescriptor): Method;
+    public static fromJSON(name: string, json: IMethod): Method;
 
     /**
      * Converts this method to a method descriptor.
-     * @returns {MethodDescriptor} Method descriptor
+     * @returns {IMethod} Method descriptor
      */
-    public toJSON(): MethodDescriptor;
+    public toJSON(): IMethod;
 }
 
-type MethodDescriptor = {
+/**
+ * Method descriptor.
+ * @interface IMethod
+ * @property {string} [type="rpc"] Method type
+ * @property {string} requestType Request type
+ * @property {string} responseType Response type
+ * @property {boolean} [requestStream=false] Whether requests are streamed
+ * @property {boolean} [responseStream=false] Whether responses are streamed
+ * @property {Object.<string,*>} [options] Method options
+ */
+export interface IMethod {
     type?: string;
     requestType: string;
     responseType: string;
     requestStream?: boolean;
     responseStream?: boolean;
     options?: { [k: string]: any };
-};
+}
 
 /**
  * Constructs a new namespace instance.
@@ -836,16 +1042,16 @@ export abstract class NamespaceBase extends ReflectionObject {
 
     /**
      * Converts this namespace to a namespace descriptor.
-     * @returns {NamespaceBaseDescriptor} Namespace descriptor
+     * @returns {INamespace} Namespace descriptor
      */
-    public toJSON(): NamespaceBaseDescriptor;
+    public toJSON(): INamespace;
 
     /**
      * Adds nested objects to this namespace from nested object descriptors.
-     * @param {Object.<string,AnyNestedDescriptor>} nestedJson Any nested object descriptors
+     * @param {Object.<string,AnyNestedObject>} nestedJson Any nested object descriptors
      * @returns {Namespace} `this`
      */
-    public addJSON(nestedJson: { [k: string]: AnyNestedDescriptor }): Namespace;
+    public addJSON(nestedJson: { [k: string]: AnyNestedObject }): Namespace;
 
     /**
      * Gets the nested object of the specified name.
@@ -896,7 +1102,7 @@ export abstract class NamespaceBase extends ReflectionObject {
     public resolveAll(): Namespace;
 
     /**
-     * Looks up the reflection object at the specified path, relative to this namespace.
+     * Recursively looks up the reflection object matching the specified path in the scope of this namespace.
      * @param {string|string[]} path Path to look up
      * @param {*|Array.<*>} filterTypes Filter types, any combination of the constructors of `protobuf.Type`, `protobuf.Enum`, `protobuf.Service` etc.
      * @param {boolean} [parentAlreadyChecked=false] If known, whether the parent has already been checked
@@ -952,19 +1158,20 @@ export abstract class NamespaceBase extends ReflectionObject {
     public lookupService(path: (string|string[])): Service;
 }
 
-type NamespaceDescriptor = {
-    options?: { [k: string]: any };
-    nested: { [k: string]: AnyNestedDescriptor };
-};
-
-type NamespaceBaseDescriptor = {
+/**
+ * Namespace descriptor.
+ * @interface INamespace
+ * @property {Object.<string,*>} [options] Namespace options
+ * @property {Object.<string,AnyNestedObject>} [nested] Nested object descriptors
+ */
+export interface INamespace {
     options?: { [k: string]: any };
-    nested?: { [k: string]: AnyNestedDescriptor };
-};
+    nested?: { [k: string]: AnyNestedObject };
+}
 
-type AnyExtensionFieldDescriptor = (ExtensionFieldDescriptor|ExtensionMapFieldDescriptor);
+type AnyExtensionField = (IExtensionField|IExtensionMapField);
 
-type AnyNestedDescriptor = (EnumDescriptor|TypeDescriptor|ServiceDescriptor|AnyExtensionFieldDescriptor|NamespaceDescriptor);
+type AnyNestedObject = (IEnum|IType|IService|AnyExtensionField|INamespace);
 
 /**
  * Constructs a new reflection object instance.
@@ -1124,17 +1331,17 @@ export class OneOf extends ReflectionObject {
     /**
      * Constructs a oneof from a oneof descriptor.
      * @param {string} name Oneof name
-     * @param {OneOfDescriptor} json Oneof descriptor
+     * @param {IOneOf} json Oneof descriptor
      * @returns {OneOf} Created oneof
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: OneOfDescriptor): OneOf;
+    public static fromJSON(name: string, json: IOneOf): OneOf;
 
     /**
      * Converts this oneof to a oneof descriptor.
-     * @returns {OneOfDescriptor} Oneof descriptor
+     * @returns {IOneOf} Oneof descriptor
      */
-    public toJSON(): OneOfDescriptor;
+    public toJSON(): IOneOf;
 
     /**
      * Adds a field to this oneof and removes it from its current parent, if any.
@@ -1160,41 +1367,69 @@ export class OneOf extends ReflectionObject {
     public static d<T extends string>(...fieldNames: string[]): OneOfDecorator;
 }
 
-type OneOfDescriptor = {
+/**
+ * Oneof descriptor.
+ * @interface IOneOf
+ * @property {Array.<string>} oneof Oneof field names
+ * @property {Object.<string,*>} [options] Oneof options
+ */
+export interface IOneOf {
     oneof: string[];
     options?: { [k: string]: any };
-};
+}
 
 type OneOfDecorator = (prototype: object, oneofName: string) => void;
 
-type ParserResult = { [k: string]: any };
+/**
+ * Result object returned from {@link parse}.
+ * @interface IParserResult
+ * @property {string|undefined} package Package name, if declared
+ * @property {string[]|undefined} imports Imports, if any
+ * @property {string[]|undefined} weakImports Weak imports, if any
+ * @property {string|undefined} syntax Syntax, if specified (either `"proto2"` or `"proto3"`)
+ * @property {Root} root Populated root instance
+ */
+export interface IParserResult {
+    package: (string|undefined);
+    imports: (string[]|undefined);
+    weakImports: (string[]|undefined);
+    syntax: (string|undefined);
+    root: Root;
+}
 
-type ParseOptions = { [k: string]: any };
+/**
+ * Options modifying the behavior of {@link parse}.
+ * @interface IParseOptions
+ * @property {boolean} [keepCase=false] Keeps field casing instead of converting to camel case
+ */
+export interface IParseOptions {
+    keepCase?: boolean;
+}
 
 /**
  * Parses the given .proto source and returns an object with the parsed contents.
  * @function
  * @param {string} source Source contents
  * @param {Root} root Root to populate
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
- * @returns {ParserResult} Parser result
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
  * @property {string} filename=null Currently processing file name for error reporting, if known
- * @property {ParseOptions} defaults Default {@link ParseOptions}
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
  */
-export function parse(source: string, root: Root, options?: ParseOptions): ParserResult;
+export function parse(source: string, root: Root, options?: IParseOptions): IParserResult;
 
 /**
  * Parses the given .proto source and returns an object with the parsed contents.
  * @name parse
  * @function
  * @param {string} source Source contents
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
- * @returns {ParserResult} Parser result
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
  * @property {string} filename=null Currently processing file name for error reporting, if known
- * @property {ParseOptions} defaults Default {@link ParseOptions}
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
  * @variation 2
  */
-export function parse(source: string, options?: ParseOptions): ParserResult;
+export function parse(source: string, options?: IParseOptions): IParserResult;
 
 /**
  * Constructs a new reader instance using the specified buffer.
@@ -1423,11 +1658,11 @@ export class Root extends NamespaceBase {
 
     /**
      * Loads a namespace descriptor into a root namespace.
-     * @param {NamespaceDescriptor} json Nameespace descriptor
+     * @param {INamespace} json Nameespace descriptor
      * @param {Root} [root] Root namespace, defaults to create a new one if omitted
      * @returns {Root} Root namespace
      */
-    public static fromJSON(json: NamespaceDescriptor, root?: Root): Root;
+    public static fromJSON(json: INamespace, root?: Root): Root;
 
     /**
      * Resolves the path of an imported file, relative to the importing origin.
@@ -1442,33 +1677,33 @@ export class Root extends NamespaceBase {
     /**
      * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
      * @param {string|string[]} filename Names of one or multiple files to load
-     * @param {ParseOptions} options Parse options
+     * @param {IParseOptions} options Parse options
      * @param {LoadCallback} callback Callback function
      * @returns {undefined}
      */
-    public load(filename: (string|string[]), options: ParseOptions, callback: LoadCallback): void;
+    public load(filename: (string|string[]), options: IParseOptions, callback: LoadCallback): void;
 
     /**
      * Loads one or multiple .proto or preprocessed .json files into this root namespace and returns a promise.
      * @name Root#load
      * @function
      * @param {string|string[]} filename Names of one or multiple files to load
-     * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+     * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
      * @returns {Promise<Root>} Promise
      * @variation 3
      */
-    public load(filename: (string|string[]), options?: ParseOptions): Promise<Root>;
+    public load(filename: (string|string[]), options?: IParseOptions): Promise<Root>;
 
     /**
      * Synchronously loads one or multiple .proto or preprocessed .json files into this root namespace (node only).
      * @name Root#loadSync
      * @function
      * @param {string|string[]} filename Names of one or multiple files to load
-     * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+     * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
      * @returns {Root} Root namespace
      * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid
      */
-    public loadSync(filename: (string|string[]), options?: ParseOptions): Root;
+    public loadSync(filename: (string|string[]), options?: IParseOptions): Root;
 }
 
 /**
@@ -1597,17 +1832,17 @@ export class Service extends NamespaceBase {
     /**
      * Constructs a service from a service descriptor.
      * @param {string} name Service name
-     * @param {ServiceDescriptor} json Service descriptor
+     * @param {IService} json Service descriptor
      * @returns {Service} Created service
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: ServiceDescriptor): Service;
+    public static fromJSON(name: string, json: IService): Service;
 
     /**
      * Converts this service to a service descriptor.
-     * @returns {ServiceDescriptor} Service descriptor
+     * @returns {IService} Service descriptor
      */
-    public toJSON(): ServiceDescriptor;
+    public toJSON(): IService;
 
     /**
      * Methods of this service as an array for iteration.
@@ -1627,21 +1862,54 @@ export class Service extends NamespaceBase {
     public create(rpcImpl: RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): rpc.Service;
 }
 
-type ServiceDescriptor = {
-    options?: { [k: string]: any };
-    methods: { [k: string]: MethodDescriptor };
-    nested?: { [k: string]: AnyNestedDescriptor };
-};
+/**
+ * Service descriptor.
+ * @interface IService
+ * @extends INamespace
+ * @property {Object.<string,IMethod>} methods Method descriptors
+ */
+export interface IService extends INamespace {
+    methods: { [k: string]: IMethod };
+}
+
+type TokenizerHandleLine = () => number;
+
+type TokenizerHandleNext = () => string;
 
-type TokenizerHandle = { [k: string]: any };
+type TokenizerHandlePeek = () => string;
+
+type TokenizerHandlePush = (token: string) => void;
+
+type TokenizerHandleSkip = (expected: string, optional?: boolean) => boolean;
+
+type TokenizerHandleCmnt = (line?: number) => string;
+
+/**
+ * Handle object returned from {@link tokenize}.
+ * @interface ITokenizerHandle
+ * @property {TokenizerHandleLine} line Gets the current line number
+ * @property {TokenizerHandleNext} next Gets the next token and advances (`null` on eof)
+ * @property {TokenizerHandlePeek} peek Peeks for the next token (`null` on eof)
+ * @property {TokenizerHandlePush} push Pushes a token back to the stack
+ * @property {TokenizerHandleSkip} skip Skips a token, returns its presence and advances or, if non-optional and not present, throws
+ * @property {TokenizerHandleCmnt} cmnt Gets the comment on the previous line or the line comment on the specified line, if any
+ */
+export interface ITokenizerHandle {
+    line: TokenizerHandleLine;
+    next: TokenizerHandleNext;
+    peek: TokenizerHandlePeek;
+    push: TokenizerHandlePush;
+    skip: TokenizerHandleSkip;
+    cmnt: TokenizerHandleCmnt;
+}
 
 /**
  * Tokenizes the given .proto source and returns an object with useful utility functions.
  * @param {string} source Source contents
- * @returns {TokenizerHandle} Tokenizer handle
+ * @returns {ITokenizerHandle} Tokenizer handle
  * @property {function(string):string} unescape Unescapes a string
  */
-export function tokenize(source: string): TokenizerHandle;
+export function tokenize(source: string): ITokenizerHandle;
 
 /**
  * Constructs a new reflected message type instance.
@@ -1729,16 +1997,16 @@ export class Type extends NamespaceBase {
     /**
      * Creates a message type from a message type descriptor.
      * @param {string} name Message name
-     * @param {TypeDescriptor} json Message type descriptor
+     * @param {IType} json Message type descriptor
      * @returns {Type} Created message type
      */
-    public static fromJSON(name: string, json: TypeDescriptor): Type;
+    public static fromJSON(name: string, json: IType): Type;
 
     /**
      * Converts this message type to a message type descriptor.
-     * @returns {TypeDescriptor} Message type descriptor
+     * @returns {IType} Message type descriptor
      */
-    public toJSON(): TypeDescriptor;
+    public toJSON(): IType;
 
     /**
      * Adds a nested object to this type.
@@ -1837,10 +2105,10 @@ export class Type extends NamespaceBase {
     /**
      * Creates a plain object from a message of this type. Also converts values to other types if specified.
      * @param {Message<{}>} message Message instance
-     * @param {ConversionOptions} [options] Conversion options
+     * @param {IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
-    public toObject(message: Message<{}>, options?: ConversionOptions): { [k: string]: any };
+    public toObject(message: Message<{}>, options?: IConversionOptions): { [k: string]: any };
 
     /**
      * Type decorator (TypeScript).
@@ -1851,17 +2119,43 @@ export class Type extends NamespaceBase {
     public static d<T extends Message<T>>(typeName?: string): TypeDecorator<T>;
 }
 
-type TypeDescriptor = {
-    options?: { [k: string]: any };
-    oneofs?: { [k: string]: OneOfDescriptor };
-    fields: { [k: string]: FieldDescriptor };
+/**
+ * Message type descriptor.
+ * @interface IType
+ * @extends INamespace
+ * @property {Object.<string,IOneOf>} [oneofs] Oneof descriptors
+ * @property {Object.<string,IField>} fields Field descriptors
+ * @property {number[][]} [extensions] Extension ranges
+ * @property {number[][]} [reserved] Reserved ranges
+ * @property {boolean} [group=false] Whether a legacy group or not
+ */
+export interface IType extends INamespace {
+    oneofs?: { [k: string]: IOneOf };
+    fields: { [k: string]: IField };
     extensions?: number[][];
     reserved?: number[][];
     group?: boolean;
-    nested?: { [k: string]: AnyNestedDescriptor };
-};
+}
 
-type ConversionOptions = {
+/**
+ * Conversion options as used by {@link Type#toObject} and {@link Message.toObject}.
+ * @interface IConversionOptions
+ * @property {*} [longs] Long conversion type.
+ * Valid values are `String` and `Number` (the global types).
+ * Defaults to copy the present value, which is a possibly unsafe number without and a {@link Long} with a long library.
+ * @property {*} [enums] Enum value conversion type.
+ * Only valid value is `String` (the global type).
+ * Defaults to copy the present value, which is the numeric id.
+ * @property {*} [bytes] Bytes value conversion type.
+ * Valid values are `Array` and (a base64 encoded) `String` (the global types).
+ * Defaults to copy the present value, which usually is a Buffer under node and an Uint8Array in the browser.
+ * @property {boolean} [defaults=false] Also sets default values on the resulting object
+ * @property {boolean} [arrays=false] Sets empty arrays for missing repeated fields even if `defaults=false`
+ * @property {boolean} [objects=false] Sets empty objects for missing map fields even if `defaults=false`
+ * @property {boolean} [oneofs=false] Includes virtual oneof properties set to the present field's name, if any
+ * @property {boolean} [json=false] Performs additional JSON compatibility conversions, i.e. NaN and Infinity to strings
+ */
+export interface IConversionOptions {
     longs?: any;
     enums?: any;
     bytes?: any;
@@ -1870,7 +2164,7 @@ type ConversionOptions = {
     objects?: boolean;
     oneofs?: boolean;
     json?: boolean;
-};
+}
 
 type TypeDecorator<T extends Message<T>> = (target: Constructor<T>) => void;
 
@@ -2043,9 +2337,18 @@ export namespace types {
     };
 }
 
-type Constructor<T extends object> = { new(...params: any[]): T };
+/**
+ * Constructor type.
+ * @interface Constructor
+ * @extends Function
+ * @template T
+ * @tstype new(...params: any[]): T; prototype: T;
+ */
+export interface Constructor<T> extends Function {
+    new(...params: any[]): T; prototype: T;
+}
 
-type Properties<T extends object> = { [P in keyof T]?: T[P] } & { [key: string]: any };
+type Properties<T> = { [P in keyof T]?: T[P] };
 
 type OneOfGetter = () => (string|undefined);
 
@@ -2385,10 +2688,10 @@ export namespace util {
      * - Repeated fields become arrays
      * - NaN and Infinity for float and double fields become strings
      *
-     * @type {ConversionOptions}
+     * @type {IConversionOptions}
      * @see https://developers.google.com/protocol-buffers/docs/proto3?hl=en#json
      */
-    let toJSONOptions: ConversionOptions;
+    let toJSONOptions: IConversionOptions;
 
     /**
      * Node's fs module if available.
@@ -2403,6 +2706,13 @@ export namespace util {
      */
     function toArray(object: { [k: string]: any }): any[];
 
+    /**
+     * Converts an array of keys immediately followed by their respective value to an object, omitting undefined values.
+     * @param {Array.<*>} array Array to convert
+     * @returns {Object.<string,*>} Converted object
+     */
+    function toObject(array: any[]): { [k: string]: any };
+
     /**
      * Returns a safe property accessor for the specified properly name.
      * @param {string} prop Property name
@@ -2652,11 +2962,11 @@ export namespace util {
      * Fetches the contents of a file.
      * @memberof util
      * @param {string} filename File path or url
-     * @param {FetchOptions} options Fetch options
+     * @param {IFetchOptions} options Fetch options
      * @param {FetchCallback} callback Callback function
      * @returns {undefined}
      */
-    function fetch(filename: string, options: FetchOptions, callback: FetchCallback): void;
+    function fetch(filename: string, options: IFetchOptions, callback: FetchCallback): void;
 
     /**
      * Fetches the contents of a file.
@@ -2674,11 +2984,11 @@ export namespace util {
      * @name util.fetch
      * @function
      * @param {string} path File path or url
-     * @param {FetchOptions} [options] Fetch options
+     * @param {IFetchOptions} [options] Fetch options
      * @returns {Promise<string|Uint8Array>} Promise
      * @variation 3
      */
-    function fetch(path: string, options?: FetchOptions): Promise<(string|Uint8Array)>;
+    function fetch(path: string, options?: IFetchOptions): Promise<(string|Uint8Array)>;
 
     /**
      * Requires a module only if available.
@@ -2773,19 +3083,25 @@ export function verifier(mtype: Type): Codegen;
 
 /**
  * Wrappers for common types.
- * @type {Object.<string,Wrapper>}
+ * @type {Object.<string,IWrapper>}
  * @const
  */
-export const wrappers: { [k: string]: Wrapper };
+export const wrappers: { [k: string]: IWrapper };
 
 type WrapperFromObjectConverter = (this: Type, object: { [k: string]: any }) => Message<{}>;
 
-type WrapperToObjectConverter = (this: Type, message: Message<{}>, options?: ConversionOptions) => { [k: string]: any };
+type WrapperToObjectConverter = (this: Type, message: Message<{}>, options?: IConversionOptions) => { [k: string]: any };
 
-type Wrapper = {
+/**
+ * Common type wrapper part of {@link wrappers}.
+ * @interface IWrapper
+ * @property {WrapperFromObjectConverter} [fromObject] From object converter
+ * @property {WrapperToObjectConverter} [toObject] To object converter
+ */
+export interface IWrapper {
     fromObject?: WrapperFromObjectConverter;
     toObject?: WrapperToObjectConverter;
-};
+}
 
 /**
  * Constructs a new writer instance.
@@ -3021,10 +3337,16 @@ type EventEmitterListener = (...args: any[]) => void;
 
 type FetchCallback = (error: Error, contents?: string) => void;
 
-type FetchOptions = {
+/**
+ * Options as used by {@link util.fetch}.
+ * @interface IFetchOptions
+ * @property {boolean} [binary=false] Whether expecting a binary response
+ * @property {boolean} [xhr=false] If `true`, forces the use of XMLHttpRequest
+ */
+export interface IFetchOptions {
     binary?: boolean;
     xhr?: boolean;
-};
+}
 
 type PoolAllocator = (size: number) => Uint8Array;
 
diff --git a/lib/fetch/index.d.ts b/lib/fetch/index.d.ts
index 5655fc4a7..a3c583833 100644
--- a/lib/fetch/index.d.ts
+++ b/lib/fetch/index.d.ts
@@ -12,13 +12,13 @@ type FetchCallback = (error: Error, contents?: string) => void;
 
 /**
  * Options as used by {@link util.fetch}.
- * @typedef FetchOptions
+ * @typedef IFetchOptions
  * @type {Object}
  * @property {boolean} [binary=false] Whether expecting a binary response
  * @property {boolean} [xhr=false] If `true`, forces the use of XMLHttpRequest
  */
 
-interface FetchOptions {
+interface IFetchOptions {
     binary?: boolean;
     xhr?: boolean;
 }
@@ -27,11 +27,11 @@ interface FetchOptions {
  * Fetches the contents of a file.
  * @memberof util
  * @param {string} filename File path or url
- * @param {FetchOptions} options Fetch options
+ * @param {IFetchOptions} options Fetch options
  * @param {FetchCallback} callback Callback function
  * @returns {undefined}
  */
-declare function fetch(filename: string, options: FetchOptions, callback: FetchCallback): void;
+declare function fetch(filename: string, options: IFetchOptions, callback: FetchCallback): void;
 
 /**
  * Fetches the contents of a file.
@@ -49,8 +49,8 @@ declare function fetch(path: string, callback: FetchCallback): void;
  * @name util.fetch
  * @function
  * @param {string} path File path or url
- * @param {FetchOptions} [options] Fetch options
+ * @param {IFetchOptions} [options] Fetch options
  * @returns {Promise<string|Uint8Array>} Promise
  * @variation 3
  */
-declare function fetch(path: string, options?: FetchOptions): Promise<(string|Uint8Array)>;
+declare function fetch(path: string, options?: IFetchOptions): Promise<(string|Uint8Array)>;
diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index d92aa6897..03431d4ca 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -17,8 +17,7 @@ var fs = inquire("fs");
 
 /**
  * Options as used by {@link util.fetch}.
- * @typedef FetchOptions
- * @type {Object}
+ * @interface IFetchOptions
  * @property {boolean} [binary=false] Whether expecting a binary response
  * @property {boolean} [xhr=false] If `true`, forces the use of XMLHttpRequest
  */
@@ -27,7 +26,7 @@ var fs = inquire("fs");
  * Fetches the contents of a file.
  * @memberof util
  * @param {string} filename File path or url
- * @param {FetchOptions} options Fetch options
+ * @param {IFetchOptions} options Fetch options
  * @param {FetchCallback} callback Callback function
  * @returns {undefined}
  */
@@ -70,7 +69,7 @@ function fetch(filename, options, callback) {
  * @name util.fetch
  * @function
  * @param {string} path File path or url
- * @param {FetchOptions} [options] Fetch options
+ * @param {IFetchOptions} [options] Fetch options
  * @returns {Promise<string|Uint8Array>} Promise
  * @variation 3
  */
diff --git a/src/common.js b/src/common.js
index 0a7f3ea6c..bf35f656f 100644
--- a/src/common.js
+++ b/src/common.js
@@ -41,6 +41,14 @@ var commonRe = /\/|\./;
 // the repository or package within the google/protobuf directory.
 
 common("any", {
+
+    /**
+    * Properties of a google.protobuf.Any message.
+    * @interface IAny
+    * @type {Object}
+    * @property {string} [typeUrl]
+    * @property {Uint8Array} [bytes]
+     */
     Any: {
         fields: {
             type_url: {
@@ -58,6 +66,14 @@ common("any", {
 var timeType;
 
 common("duration", {
+
+    /**
+     * Properties of a google.protobuf.Duration message.
+     * @interface IDuration
+     * @type {Object}
+     * @property {number|Long} [seconds]
+     * @property {number} [nanos]
+     */
     Duration: timeType = {
         fields: {
             seconds: {
@@ -73,16 +89,36 @@ common("duration", {
 });
 
 common("timestamp", {
+
+    /**
+     * Properties of a google.protobuf.Timestamp message.
+     * @interface ITimestamp
+     * @type {Object}
+     * @property {number|Long} [seconds]
+     * @property {number} [nanos]
+     */
     Timestamp: timeType
 });
 
 common("empty", {
+
+    /**
+     * Properties of a google.protobuf.Empty message.
+     * @interface IEmpty
+     */
     Empty: {
         fields: {}
     }
 });
 
 common("struct", {
+
+    /**
+     * Properties of a google.protobuf.Struct message.
+     * @interface IStruct
+     * @type {Object}
+     * @property {Object.<string,IValue>} [fields]
+     */
     Struct: {
         fields: {
             fields: {
@@ -92,6 +128,19 @@ common("struct", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.Value message.
+     * @interface IValue
+     * @type {Object}
+     * @property {string} [kind]
+     * @property {0} [nullValue]
+     * @property {number} [numberValue]
+     * @property {string} [stringValue]
+     * @property {boolean} [boolValue]
+     * @property {IStruct} [structValue]
+     * @property {IListValue} [listValue]
+     */
     Value: {
         oneofs: {
             kind: {
@@ -132,11 +181,19 @@ common("struct", {
             }
         }
     },
+
     NullValue: {
         values: {
             NULL_VALUE: 0
         }
     },
+
+    /**
+     * Properties of a google.protobuf.ListValue message.
+     * @interface IListValue
+     * @type {Object}
+     * @property {Array.<IValue>} [values]
+     */
     ListValue: {
         fields: {
             values: {
@@ -149,6 +206,13 @@ common("struct", {
 });
 
 common("wrappers", {
+
+    /**
+     * Properties of a google.protobuf.DoubleValue message.
+     * @interface IDoubleValue
+     * @type {Object}
+     * @property {number} [value]
+     */
     DoubleValue: {
         fields: {
             value: {
@@ -157,6 +221,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.FloatValue message.
+     * @interface IFloatValue
+     * @type {Object}
+     * @property {number} [value]
+     */
     FloatValue: {
         fields: {
             value: {
@@ -165,6 +236,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.Int64Value message.
+     * @interface IInt64Value
+     * @type {Object}
+     * @property {number|Long} [value]
+     */
     Int64Value: {
         fields: {
             value: {
@@ -173,6 +251,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.UInt64Value message.
+     * @interface IUInt64Value
+     * @type {Object}
+     * @property {number|Long} [value]
+     */
     UInt64Value: {
         fields: {
             value: {
@@ -181,6 +266,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.Int32Value message.
+     * @interface IInt32Value
+     * @type {Object}
+     * @property {number} [value]
+     */
     Int32Value: {
         fields: {
             value: {
@@ -189,6 +281,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.UInt32Value message.
+     * @interface IUInt32Value
+     * @type {Object}
+     * @property {number} [value]
+     */
     UInt32Value: {
         fields: {
             value: {
@@ -197,6 +296,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.BoolValue message.
+     * @interface IBoolValue
+     * @type {Object}
+     * @property {boolean} [value]
+     */
     BoolValue: {
         fields: {
             value: {
@@ -205,6 +311,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.StringValue message.
+     * @interface IStringValue
+     * @type {Object}
+     * @property {string} [value]
+     */
     StringValue: {
         fields: {
             value: {
@@ -213,6 +326,13 @@ common("wrappers", {
             }
         }
     },
+
+    /**
+     * Properties of a google.protobuf.BytesValue message.
+     * @interface IBytesValue
+     * @type {Object}
+     * @property {Uint8Array} [value]
+     */
     BytesValue: {
         fields: {
             value: {
diff --git a/src/enum.js b/src/enum.js
index 7ac8819a1..f28fe8741 100644
--- a/src/enum.js
+++ b/src/enum.js
@@ -52,8 +52,7 @@ function Enum(name, values, options) {
 
 /**
  * Enum descriptor.
- * @typedef EnumDescriptor
- * @type {Object}
+ * @interface IEnum
  * @property {Object.<string,number>} values Enum values
  * @property {Object.<string,*>} [options] Enum options
  */
@@ -61,7 +60,7 @@ function Enum(name, values, options) {
 /**
  * Constructs an enum from an enum descriptor.
  * @param {string} name Enum name
- * @param {EnumDescriptor} json Enum descriptor
+ * @param {IEnum} json Enum descriptor
  * @returns {Enum} Created enum
  * @throws {TypeError} If arguments are invalid
  */
@@ -71,7 +70,7 @@ Enum.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this enum to an enum descriptor.
- * @returns {EnumDescriptor} Enum descriptor
+ * @returns {IEnum} Enum descriptor
  */
 Enum.prototype.toJSON = function toJSON() {
     return util.toObject([
diff --git a/src/field.js b/src/field.js
index df1963e0b..9b611f448 100644
--- a/src/field.js
+++ b/src/field.js
@@ -30,7 +30,7 @@ var ruleRe = /^required|optional|repeated$/;
 /**
  * Constructs a field from a field descriptor.
  * @param {string} name Field name
- * @param {FieldDescriptor} json Field descriptor
+ * @param {IField} json Field descriptor
  * @returns {Field} Created field
  * @throws {TypeError} If arguments are invalid
  */
@@ -211,8 +211,7 @@ Field.prototype.setOption = function setOption(name, value, ifNotSet) {
 
 /**
  * Field descriptor.
- * @typedef FieldDescriptor
- * @type {Object}
+ * @interface IField
  * @property {string} [rule="optional"] Field rule
  * @property {string} type Field type
  * @property {number} id Field id
@@ -221,18 +220,14 @@ Field.prototype.setOption = function setOption(name, value, ifNotSet) {
 
 /**
  * Extension field descriptor.
- * @typedef ExtensionFieldDescriptor
- * @type {Object}
- * @property {string} [rule="optional"] Field rule
- * @property {string} type Field type
- * @property {number} id Field id
+ * @interface IExtensionField
+ * @extends IField
  * @property {string} extend Extended type
- * @property {Object.<string,*>} [options] Field options
  */
 
 /**
  * Converts this field to a field descriptor.
- * @returns {FieldDescriptor} Field descriptor
+ * @returns {IField} Field descriptor
  */
 Field.prototype.toJSON = function toJSON() {
     return util.toObject([
@@ -254,10 +249,6 @@ Field.prototype.resolve = function resolve() {
     if (this.resolved)
         return this;
 
-    /* istanbul ignore if */
-    if (!Type)
-        Type = require("./type");
-
     if ((this.typeDefault = types.defaults[this.type]) === undefined) { // if not a basic type, resolve it
         this.resolvedType = (this.declaringField ? this.declaringField.parent : this.parent).lookupTypeOrEnum(this.type);
         if (this.resolvedType instanceof Type)
@@ -354,10 +345,14 @@ Field.d = function decorateField(fieldId, fieldType, fieldRule, defaultValue) {
  * @name Field.d
  * @function
  * @param {number} fieldId Field id
- * @param {Constructor<T>} fieldType Field type
+ * @param {Constructor<T>|string} fieldType Field type
  * @param {"optional"|"required"|"repeated"} [fieldRule="optional"] Field rule
  * @returns {FieldDecorator} Decorator function
  * @template T extends Message<T>
  * @variation 2
  */
 // like Field.d but without a default value
+
+Field._configure = function configure(Type_) {
+    Type = Type_;
+};
diff --git a/src/index-light.js b/src/index-light.js
index 7f949fe1c..35ad3c566 100644
--- a/src/index-light.js
+++ b/src/index-light.js
@@ -100,3 +100,4 @@ protobuf.util             = require("./util");
 protobuf.ReflectionObject._configure(protobuf.Root);
 protobuf.Namespace._configure(protobuf.Type, protobuf.Service);
 protobuf.Root._configure(protobuf.Type);
+protobuf.Field._configure(protobuf.Type);
diff --git a/src/mapfield.js b/src/mapfield.js
index 95a577151..58c4ca32c 100644
--- a/src/mapfield.js
+++ b/src/mapfield.js
@@ -44,29 +44,22 @@ function MapField(name, id, keyType, type, options) {
 
 /**
  * Map field descriptor.
- * @typedef MapFieldDescriptor
- * @type {Object}
+ * @interface IMapField
+ * @extends {IField}
  * @property {string} keyType Key type
- * @property {string} type Value type
- * @property {number} id Field id
- * @property {Object.<string,*>} [options] Field options
  */
 
 /**
  * Extension map field descriptor.
- * @typedef ExtensionMapFieldDescriptor
- * @type {Object}
- * @property {string} keyType Key type
- * @property {string} type Value type
- * @property {number} id Field id
+ * @interface IExtensionMapField
+ * @extends IMapField
  * @property {string} extend Extended type
- * @property {Object.<string,*>} [options] Field options
  */
 
 /**
  * Constructs a map field from a map field descriptor.
  * @param {string} name Field name
- * @param {MapFieldDescriptor} json Map field descriptor
+ * @param {IMapField} json Map field descriptor
  * @returns {MapField} Created map field
  * @throws {TypeError} If arguments are invalid
  */
@@ -76,7 +69,7 @@ MapField.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this map field to a map field descriptor.
- * @returns {MapFieldDescriptor} Map field descriptor
+ * @returns {IMapField} Map field descriptor
  */
 MapField.prototype.toJSON = function toJSON() {
     return util.toObject([
diff --git a/src/message.js b/src/message.js
index 82b800dd5..ff54610c2 100644
--- a/src/message.js
+++ b/src/message.js
@@ -119,7 +119,7 @@ Message.fromObject = function fromObject(object) {
 /**
  * Creates a plain object from a message of this type. Also converts values to other types if specified.
  * @param {T} message Message instance
- * @param {ConversionOptions} [options] Conversion options
+ * @param {IConversionOptions} [options] Conversion options
  * @returns {Object.<string,*>} Plain object
  * @template T extends Message<T>
  * @this Constructor<T>
@@ -130,7 +130,7 @@ Message.toObject = function toObject(message, options) {
 
 /**
  * Creates a plain object from this message. Also converts values to other types if specified.
- * @param {ConversionOptions} [options] Conversion options
+ * @param {IConversionOptions} [options] Conversion options
  * @returns {Object.<string,*>} Plain object
  */
 Message.prototype.toObject = function toObject(options) {
diff --git a/src/method.js b/src/method.js
index 1cd8dcb67..074adf3f9 100644
--- a/src/method.js
+++ b/src/method.js
@@ -89,8 +89,8 @@ function Method(name, type, requestType, responseType, requestStream, responseSt
 }
 
 /**
- * @typedef MethodDescriptor
- * @type {Object}
+ * Method descriptor.
+ * @interface IMethod
  * @property {string} [type="rpc"] Method type
  * @property {string} requestType Request type
  * @property {string} responseType Response type
@@ -102,7 +102,7 @@ function Method(name, type, requestType, responseType, requestStream, responseSt
 /**
  * Constructs a method from a method descriptor.
  * @param {string} name Method name
- * @param {MethodDescriptor} json Method descriptor
+ * @param {IMethod} json Method descriptor
  * @returns {Method} Created method
  * @throws {TypeError} If arguments are invalid
  */
@@ -112,7 +112,7 @@ Method.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this method to a method descriptor.
- * @returns {MethodDescriptor} Method descriptor
+ * @returns {IMethod} Method descriptor
  */
 Method.prototype.toJSON = function toJSON() {
     return util.toObject([
diff --git a/src/namespace.js b/src/namespace.js
index edc6f3cb6..2d5e01f2e 100644
--- a/src/namespace.js
+++ b/src/namespace.js
@@ -99,36 +99,27 @@ Object.defineProperty(Namespace.prototype, "nestedArray", {
 
 /**
  * Namespace descriptor.
- * @typedef NamespaceDescriptor
- * @type {Object}
+ * @interface INamespace
  * @property {Object.<string,*>} [options] Namespace options
- * @property {Object.<string,AnyNestedDescriptor>} nested Nested object descriptors
- */
-
-/**
- * Namespace base descriptor.
- * @typedef NamespaceBaseDescriptor
- * @type {Object}
- * @property {Object.<string,*>} [options] Namespace options
- * @property {Object.<string,AnyNestedDescriptor>} [nested] Nested object descriptors
+ * @property {Object.<string,AnyNestedObject>} [nested] Nested object descriptors
  */
 
 /**
  * Any extension field descriptor.
- * @typedef AnyExtensionFieldDescriptor
- * @type {ExtensionFieldDescriptor|ExtensionMapFieldDescriptor}
+ * @typedef AnyExtensionField
+ * @type {IExtensionField|IExtensionMapField}
  */
 
 /**
  * Any nested object descriptor.
- * @typedef AnyNestedDescriptor
- * @type {EnumDescriptor|TypeDescriptor|ServiceDescriptor|AnyExtensionFieldDescriptor|NamespaceDescriptor}
+ * @typedef AnyNestedObject
+ * @type {IEnum|IType|IService|AnyExtensionField|INamespace}
  */
-// ^ BEWARE: VSCode hangs forever when using more than 5 types (that's why AnyExtensionFieldDescriptor exists in the first place)
+// ^ BEWARE: VSCode hangs forever when using more than 5 types (that's why AnyExtensionField exists in the first place)
 
 /**
  * Converts this namespace to a namespace descriptor.
- * @returns {NamespaceBaseDescriptor} Namespace descriptor
+ * @returns {INamespace} Namespace descriptor
  */
 Namespace.prototype.toJSON = function toJSON() {
     return util.toObject([
@@ -139,7 +130,7 @@ Namespace.prototype.toJSON = function toJSON() {
 
 /**
  * Adds nested objects to this namespace from nested object descriptors.
- * @param {Object.<string,AnyNestedDescriptor>} nestedJson Any nested object descriptors
+ * @param {Object.<string,AnyNestedObject>} nestedJson Any nested object descriptors
  * @returns {Namespace} `this`
  */
 Namespace.prototype.addJSON = function addJSON(nestedJson) {
diff --git a/src/oneof.js b/src/oneof.js
index c2d23934d..7ada12cb3 100644
--- a/src/oneof.js
+++ b/src/oneof.js
@@ -44,8 +44,7 @@ function OneOf(name, fieldNames, options) {
 
 /**
  * Oneof descriptor.
- * @typedef OneOfDescriptor
- * @type {Object}
+ * @interface IOneOf
  * @property {Array.<string>} oneof Oneof field names
  * @property {Object.<string,*>} [options] Oneof options
  */
@@ -53,7 +52,7 @@ function OneOf(name, fieldNames, options) {
 /**
  * Constructs a oneof from a oneof descriptor.
  * @param {string} name Oneof name
- * @param {OneOfDescriptor} json Oneof descriptor
+ * @param {IOneOf} json Oneof descriptor
  * @returns {OneOf} Created oneof
  * @throws {TypeError} If arguments are invalid
  */
@@ -63,7 +62,7 @@ OneOf.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this oneof to a oneof descriptor.
- * @returns {OneOfDescriptor} Oneof descriptor
+ * @returns {IOneOf} Oneof descriptor
  */
 OneOf.prototype.toJSON = function toJSON() {
     return util.toObject([
diff --git a/src/parse.js b/src/parse.js
index 025c81021..e78624785 100644
--- a/src/parse.js
+++ b/src/parse.js
@@ -40,8 +40,7 @@ parse.numberRe = numberRe;
 
 /**
  * Result object returned from {@link parse}.
- * @typedef ParserResult
- * @type {Object.<string,*>}
+ * @interface IParserResult
  * @property {string|undefined} package Package name, if declared
  * @property {string[]|undefined} imports Imports, if any
  * @property {string[]|undefined} weakImports Weak imports, if any
@@ -51,8 +50,7 @@ parse.numberRe = numberRe;
 
 /**
  * Options modifying the behavior of {@link parse}.
- * @typedef ParseOptions
- * @type {Object.<string,*>}
+ * @interface IParseOptions
  * @property {boolean} [keepCase=false] Keeps field casing instead of converting to camel case
  */
 
@@ -61,10 +59,10 @@ parse.numberRe = numberRe;
  * @function
  * @param {string} source Source contents
  * @param {Root} root Root to populate
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
- * @returns {ParserResult} Parser result
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
  * @property {string} filename=null Currently processing file name for error reporting, if known
- * @property {ParseOptions} defaults Default {@link ParseOptions}
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
  */
 function parse(source, root, options) {
     /* eslint-disable callback-return */
@@ -745,9 +743,9 @@ function parse(source, root, options) {
  * @name parse
  * @function
  * @param {string} source Source contents
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
- * @returns {ParserResult} Parser result
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
  * @property {string} filename=null Currently processing file name for error reporting, if known
- * @property {ParseOptions} defaults Default {@link ParseOptions}
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
  * @variation 2
  */
diff --git a/src/root.js b/src/root.js
index de3ca62c5..43cfd43d3 100644
--- a/src/root.js
+++ b/src/root.js
@@ -39,7 +39,7 @@ function Root(options) {
 
 /**
  * Loads a namespace descriptor into a root namespace.
- * @param {NamespaceDescriptor} json Nameespace descriptor
+ * @param {INamespace} json Nameespace descriptor
  * @param {Root} [root] Root namespace, defaults to create a new one if omitted
  * @returns {Root} Root namespace
  */
@@ -68,7 +68,7 @@ function SYNC() {} // eslint-disable-line no-empty-function
 /**
  * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
  * @param {string|string[]} filename Names of one or multiple files to load
- * @param {ParseOptions} options Parse options
+ * @param {IParseOptions} options Parse options
  * @param {LoadCallback} callback Callback function
  * @returns {undefined}
  */
@@ -199,7 +199,7 @@ Root.prototype.load = function load(filename, options, callback) {
         finish(null, self);
     return undefined;
 };
-// function load(filename:string, options:ParseOptions, callback:LoadCallback):undefined
+// function load(filename:string, options:IParseOptions, callback:LoadCallback):undefined
 
 /**
  * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
@@ -215,18 +215,18 @@ Root.prototype.load = function load(filename, options, callback) {
  * @name Root#load
  * @function
  * @param {string|string[]} filename Names of one or multiple files to load
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
  * @returns {Promise<Root>} Promise
  * @variation 3
  */
-// function load(filename:string, [options:ParseOptions]):Promise<Root>
+// function load(filename:string, [options:IParseOptions]):Promise<Root>
 
 /**
  * Synchronously loads one or multiple .proto or preprocessed .json files into this root namespace (node only).
  * @name Root#loadSync
  * @function
  * @param {string|string[]} filename Names of one or multiple files to load
- * @param {ParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
  * @returns {Root} Root namespace
  * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid
  */
diff --git a/src/service.js b/src/service.js
index a55e53256..33ee45182 100644
--- a/src/service.js
+++ b/src/service.js
@@ -37,17 +37,15 @@ function Service(name, options) {
 
 /**
  * Service descriptor.
- * @typedef ServiceDescriptor
- * @type {Object}
- * @property {Object.<string,*>} [options] Service options
- * @property {Object.<string,MethodDescriptor>} methods Method descriptors
- * @property {Object.<string,AnyNestedDescriptor>} [nested] Nested object descriptors
+ * @interface IService
+ * @extends INamespace
+ * @property {Object.<string,IMethod>} methods Method descriptors
  */
 
 /**
  * Constructs a service from a service descriptor.
  * @param {string} name Service name
- * @param {ServiceDescriptor} json Service descriptor
+ * @param {IService} json Service descriptor
  * @returns {Service} Created service
  * @throws {TypeError} If arguments are invalid
  */
@@ -64,7 +62,7 @@ Service.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this service to a service descriptor.
- * @returns {ServiceDescriptor} Service descriptor
+ * @returns {IService} Service descriptor
  */
 Service.prototype.toJSON = function toJSON() {
     var inherited = Namespace.prototype.toJSON.call(this);
diff --git a/src/tokenize.js b/src/tokenize.js
index c49e6d289..dae4db087 100644
--- a/src/tokenize.js
+++ b/src/tokenize.js
@@ -38,21 +38,68 @@ function unescape(str) {
 
 tokenize.unescape = unescape;
 
+/**
+ * Gets the current line number.
+ * @typedef TokenizerHandleLine
+ * @type {function}
+ * @returns {number} Line number
+ */
+
+/**
+ * Gets the next token and advances.
+ * @typedef TokenizerHandleNext
+ * @type {function}
+ * @returns {?string} Next token or `null` on eof
+ */
+
+/**
+ * Peeks for the next token.
+ * @typedef TokenizerHandlePeek
+ * @type {function}
+ * @returns {?string} Next token or `null` on eof
+ */
+
+/**
+ * Pushes a token back to the stack.
+ * @typedef TokenizerHandlePush
+ * @type {function}
+ * @param {string} token Token
+ * @returns {undefined}
+ */
+
+/**
+ * Skips the next token.
+ * @typedef TokenizerHandleSkip
+ * @type {function}
+ * @param {string} expected Expected token
+ * @param {boolean} [optional=false] If optional
+ * @returns {boolean} Whether the token matched
+ * @throws {Error} If the token didn't match and is not optional
+ */
+
+/**
+ * Gets the comment on the previous line or, alternatively, the line comment on the specified line.
+ * @typedef TokenizerHandleCmnt
+ * @type {function}
+ * @param {number} [line] Line number
+ * @returns {?string} Comment text or `null` if none
+ */
+
 /**
  * Handle object returned from {@link tokenize}.
- * @typedef {Object.<string,*>} TokenizerHandle
- * @property {function():number} line Gets the current line number
- * @property {function():?string} next Gets the next token and advances (`null` on eof)
- * @property {function():?string} peek Peeks for the next token (`null` on eof)
- * @property {function(string)} push Pushes a token back to the stack
- * @property {function(string, boolean=):boolean} skip Skips a token, returns its presence and advances or, if non-optional and not present, throws
- * @property {function(number=):?string} cmnt Gets the comment on the previous line or the line comment on the specified line, if any
+ * @interface ITokenizerHandle
+ * @property {TokenizerHandleLine} line Gets the current line number
+ * @property {TokenizerHandleNext} next Gets the next token and advances (`null` on eof)
+ * @property {TokenizerHandlePeek} peek Peeks for the next token (`null` on eof)
+ * @property {TokenizerHandlePush} push Pushes a token back to the stack
+ * @property {TokenizerHandleSkip} skip Skips a token, returns its presence and advances or, if non-optional and not present, throws
+ * @property {TokenizerHandleCmnt} cmnt Gets the comment on the previous line or the line comment on the specified line, if any
  */
 
 /**
  * Tokenizes the given .proto source and returns an object with useful utility functions.
  * @param {string} source Source contents
- * @returns {TokenizerHandle} Tokenizer handle
+ * @returns {ITokenizerHandle} Tokenizer handle
  * @property {function(string):string} unescape Unescapes a string
  */
 function tokenize(source) {
diff --git a/src/type.js b/src/type.js
index a36505492..12ba8e78f 100644
--- a/src/type.js
+++ b/src/type.js
@@ -219,21 +219,19 @@ function clearCache(type) {
 
 /**
  * Message type descriptor.
- * @typedef TypeDescriptor
- * @type {Object}
- * @property {Object.<string,*>} [options] Message type options
- * @property {Object.<string,OneOfDescriptor>} [oneofs] Oneof descriptors
- * @property {Object.<string,FieldDescriptor>} fields Field descriptors
+ * @interface IType
+ * @extends INamespace
+ * @property {Object.<string,IOneOf>} [oneofs] Oneof descriptors
+ * @property {Object.<string,IField>} fields Field descriptors
  * @property {number[][]} [extensions] Extension ranges
  * @property {number[][]} [reserved] Reserved ranges
  * @property {boolean} [group=false] Whether a legacy group or not
- * @property {Object.<string,AnyNestedDescriptor>} [nested] Nested object descriptors
  */
 
 /**
  * Creates a message type from a message type descriptor.
  * @param {string} name Message name
- * @param {TypeDescriptor} json Message type descriptor
+ * @param {IType} json Message type descriptor
  * @returns {Type} Created message type
  */
 Type.fromJSON = function fromJSON(name, json) {
@@ -277,7 +275,7 @@ Type.fromJSON = function fromJSON(name, json) {
 
 /**
  * Converts this message type to a message type descriptor.
- * @returns {TypeDescriptor} Message type descriptor
+ * @returns {IType} Message type descriptor
  */
 Type.prototype.toJSON = function toJSON() {
     var inherited = Namespace.prototype.toJSON.call(this);
@@ -545,8 +543,7 @@ Type.prototype.fromObject = function fromObject(object) {
 
 /**
  * Conversion options as used by {@link Type#toObject} and {@link Message.toObject}.
- * @typedef ConversionOptions
- * @type {Object}
+ * @interface IConversionOptions
  * @property {*} [longs] Long conversion type.
  * Valid values are `String` and `Number` (the global types).
  * Defaults to copy the present value, which is a possibly unsafe number without and a {@link Long} with a long library.
@@ -566,7 +563,7 @@ Type.prototype.fromObject = function fromObject(object) {
 /**
  * Creates a plain object from a message of this type. Also converts values to other types if specified.
  * @param {Message<{}>} message Message instance
- * @param {ConversionOptions} [options] Conversion options
+ * @param {IConversionOptions} [options] Conversion options
  * @returns {Object.<string,*>} Plain object
  */
 Type.prototype.toObject = function toObject(message, options) {
diff --git a/src/typescript.jsdoc b/src/typescript.jsdoc
index 37d2dfd9f..9a6710169 100644
--- a/src/typescript.jsdoc
+++ b/src/typescript.jsdoc
@@ -1,15 +1,15 @@
 /**
  * Constructor type.
- * @typedef Constructor
- * @template T extends object
- * @type {Function}
- * @tstype { new(...params: any[]): T }
+ * @interface Constructor
+ * @extends Function
+ * @template T
+ * @tstype new(...params: any[]): T; prototype: T;
  */
 
 /**
  * Properties type.
  * @typedef Properties
- * @template T extends object
+ * @template T
  * @type {Object.<string,*>}
- * @tstype { [P in keyof T]?: T[P] } & { [key: string]: any }
+ * @tstype { [P in keyof T]?: T[P] }
  */
diff --git a/src/util/minimal.js b/src/util/minimal.js
index 5ca4ddf51..b24da6c9a 100644
--- a/src/util/minimal.js
+++ b/src/util/minimal.js
@@ -387,7 +387,7 @@ util.oneOfSetter = function setOneOf(fieldNames) {
  * - Repeated fields become arrays
  * - NaN and Infinity for float and double fields become strings
  *
- * @type {ConversionOptions}
+ * @type {IConversionOptions}
  * @see https://developers.google.com/protocol-buffers/docs/proto3?hl=en#json
  */
 util.toJSONOptions = {
diff --git a/src/wrappers.js b/src/wrappers.js
index 8d09b8819..6e9f35ffa 100644
--- a/src/wrappers.js
+++ b/src/wrappers.js
@@ -2,7 +2,7 @@
 
 /**
  * Wrappers for common types.
- * @type {Object.<string,Wrapper>}
+ * @type {Object.<string,IWrapper>}
  * @const
  */
 var wrappers = exports;
@@ -10,7 +10,7 @@ var wrappers = exports;
 var Message = require("./message");
 
 /**
- * From object converter part of a {@link Wrapper}.
+ * From object converter part of an {@link IWrapper}.
  * @typedef WrapperFromObjectConverter
  * @type {function}
  * @param {Object.<string,*>} object Plain object
@@ -19,19 +19,18 @@ var Message = require("./message");
  */
 
 /**
- * To object converter part of a {@link Wrapper}.
+ * To object converter part of an {@link IWrapper}.
  * @typedef WrapperToObjectConverter
  * @type {function}
  * @param {Message<{}>} message Message instance
- * @param {ConversionOptions} [options] Conversion options
+ * @param {IConversionOptions} [options] Conversion options
  * @returns {Object.<string,*>}
  * @this Type
  */
 
 /**
  * Common type wrapper part of {@link wrappers}.
- * @typedef Wrapper
- * @type {Object}
+ * @interface IWrapper
  * @property {WrapperFromObjectConverter} [fromObject] From object converter
  * @property {WrapperToObjectConverter} [toObject] To object converter
  */
diff --git a/tests/comp_typescript.js b/tests/comp_typescript.js
index a6c34a0e8..1b87ec60c 100644
--- a/tests/comp_typescript.js
+++ b/tests/comp_typescript.js
@@ -20,6 +20,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 exports.__esModule = true;
 var __1 = require("..");
 // Reflection
@@ -71,16 +74,20 @@ var AwesomeSubMessage = (function (_super) {
     return AwesomeSubMessage;
 }(__1.Message));
 __decorate([
-    __1.Field.d(1, "string")
+    __1.Field.d(1, "string"),
+    __metadata("design:type", String)
 ], AwesomeSubMessage.prototype, "awesomeString");
 __decorate([
-    __1.MapField.d(2, "string", "string")
+    __1.MapField.d(2, "string", "string"),
+    __metadata("design:type", Object)
 ], AwesomeSubMessage.prototype, "awesomeMapString");
 __decorate([
-    __1.MapField.d(3, "string", AwesomeEnum)
+    __1.MapField.d(3, "string", AwesomeEnum),
+    __metadata("design:type", Object)
 ], AwesomeSubMessage.prototype, "awesomeMapEnum");
 __decorate([
-    __1.MapField.d(4, "string", AwesomeSubMessage)
+    __1.MapField.d(4, "string", AwesomeSubMessage),
+    __metadata("design:type", Object)
 ], AwesomeSubMessage.prototype, "awesomeMapMessage");
 exports.AwesomeSubMessage = AwesomeSubMessage;
 var AwesomeMessage = (function (_super) {
@@ -91,16 +98,20 @@ var AwesomeMessage = (function (_super) {
     return AwesomeMessage;
 }(__1.Message));
 __decorate([
-    __1.Field.d(1, "string", "optional", "awesome default string")
+    __1.Field.d(1, "string", "optional", "awesome default string"),
+    __metadata("design:type", String)
 ], AwesomeMessage.prototype, "awesomeField");
 __decorate([
-    __1.Field.d(2, AwesomeSubMessage)
+    __1.Field.d(2, AwesomeSubMessage),
+    __metadata("design:type", AwesomeSubMessage)
 ], AwesomeMessage.prototype, "awesomeSubMessage");
 __decorate([
-    __1.Field.d(3, AwesomeEnum, "optional", AwesomeEnum.ONE)
+    __1.Field.d(3, AwesomeEnum, "optional", AwesomeEnum.ONE),
+    __metadata("design:type", Number)
 ], AwesomeMessage.prototype, "awesomeEnum");
 __decorate([
-    __1.OneOf.d("awesomeSubMessage", "awesomeEnum")
+    __1.OneOf.d("awesomeSubMessage", "awesomeEnum"),
+    __metadata("design:type", String)
 ], AwesomeMessage.prototype, "which");
 AwesomeMessage = __decorate([
     __1.Type.d("SuperAwesomeMessage")
diff --git a/tests/data/comments.js b/tests/data/comments.js
index 5fee2487e..55345b03a 100644
--- a/tests/data/comments.js
+++ b/tests/data/comments.js
@@ -13,8 +13,8 @@ $root.Test1 = (function() {
 
     /**
      * Properties of a Test1.
-     * @typedef Test1$Properties
-     * @type {Object}
+     * @interface ITest1
+     * @name ITest1
      * @property {string} [field1] Field with a comment.
      * @property {number} [field2] Test1 field2.
      * @property {boolean} [field3] Field with a comment and a <a href="http://example.com/foo/">link</a>
@@ -26,9 +26,9 @@ $root.Test1 = (function() {
      * with
      * a
      * comment.
-     * @exports Test1
      * @constructor
-     * @param {Test1$Properties=} [properties] Properties to set
+     * @param {ITest1=} [properties] Properties to set
+     * @name Test1
      */
     function Test1(properties) {
         if (properties)
@@ -57,7 +57,7 @@ $root.Test1 = (function() {
 
     /**
      * Creates a new Test1 instance using the specified properties.
-     * @param {Test1$Properties=} [properties] Properties to set
+     * @param {ITest1=} [properties] Properties to set
      * @returns {Test1} Test1 instance
      */
     Test1.create = function create(properties) {
@@ -66,7 +66,7 @@ $root.Test1 = (function() {
 
     /**
      * Encodes the specified Test1 message. Does not implicitly {@link Test1.verify|verify} messages.
-     * @param {Test1$Properties} message Test1 message or plain object to encode
+     * @param {ITest1} message Test1 message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -84,7 +84,7 @@ $root.Test1 = (function() {
 
     /**
      * Encodes the specified Test1 message, length delimited. Does not implicitly {@link Test1.verify|verify} messages.
-     * @param {Test1$Properties} message Test1 message or plain object to encode
+     * @param {ITest1} message Test1 message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -178,7 +178,7 @@ $root.Test1 = (function() {
     /**
      * Creates a plain object from a Test1 message. Also converts values to other types if specified.
      * @param {Test1} message Test1
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Test1.toObject = function toObject(message, options) {
@@ -201,7 +201,7 @@ $root.Test1 = (function() {
 
     /**
      * Creates a plain object from this Test1 message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Test1.prototype.toObject = function toObject(options) {
@@ -223,15 +223,15 @@ $root.Test2 = (function() {
 
     /**
      * Properties of a Test2.
-     * @typedef Test2$Properties
-     * @type {Object}
+     * @interface ITest2
+     * @name ITest2
      */
 
     /**
      * Constructs a new Test2.
-     * @exports Test2
      * @constructor
-     * @param {Test2$Properties=} [properties] Properties to set
+     * @param {ITest2=} [properties] Properties to set
+     * @name Test2
      */
     function Test2(properties) {
         if (properties)
@@ -242,7 +242,7 @@ $root.Test2 = (function() {
 
     /**
      * Creates a new Test2 instance using the specified properties.
-     * @param {Test2$Properties=} [properties] Properties to set
+     * @param {ITest2=} [properties] Properties to set
      * @returns {Test2} Test2 instance
      */
     Test2.create = function create(properties) {
@@ -251,7 +251,7 @@ $root.Test2 = (function() {
 
     /**
      * Encodes the specified Test2 message. Does not implicitly {@link Test2.verify|verify} messages.
-     * @param {Test2$Properties} message Test2 message or plain object to encode
+     * @param {ITest2} message Test2 message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -263,7 +263,7 @@ $root.Test2 = (function() {
 
     /**
      * Encodes the specified Test2 message, length delimited. Does not implicitly {@link Test2.verify|verify} messages.
-     * @param {Test2$Properties} message Test2 message or plain object to encode
+     * @param {ITest2} message Test2 message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -332,7 +332,7 @@ $root.Test2 = (function() {
     /**
      * Creates a plain object from a Test2 message. Also converts values to other types if specified.
      * @param {Test2} message Test2
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Test2.toObject = function toObject() {
@@ -341,7 +341,7 @@ $root.Test2 = (function() {
 
     /**
      * Creates a plain object from this Test2 message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Test2.prototype.toObject = function toObject(options) {
@@ -361,8 +361,9 @@ $root.Test2 = (function() {
 
 /**
  * Test3 enum.
- * @exports Test3
+ * @name Test3
  * @enum {number}
+ * @name Test3
  * @property {number} ONE=1 Value with a comment.
  * @property {number} TWO=2 TWO value
  * @property {number} THREE=3 Value with a comment.
diff --git a/tests/data/convert.js b/tests/data/convert.js
index d4b9b1056..f6f59ad4f 100644
--- a/tests/data/convert.js
+++ b/tests/data/convert.js
@@ -13,8 +13,8 @@ $root.Message = (function() {
 
     /**
      * Properties of a Message.
-     * @typedef Message$Properties
-     * @type {Object}
+     * @interface IMessage
+     * @name IMessage
      * @property {string} [stringVal] Message stringVal.
      * @property {Array.<string>} [stringRepeated] Message stringRepeated.
      * @property {number|Long} [uint64Val] Message uint64Val.
@@ -28,9 +28,9 @@ $root.Message = (function() {
 
     /**
      * Constructs a new Message.
-     * @exports Message
      * @constructor
-     * @param {Message$Properties=} [properties] Properties to set
+     * @param {IMessage=} [properties] Properties to set
+     * @name Message
      */
     function Message(properties) {
         this.stringRepeated = [];
@@ -100,7 +100,7 @@ $root.Message = (function() {
 
     /**
      * Creates a new Message instance using the specified properties.
-     * @param {Message$Properties=} [properties] Properties to set
+     * @param {IMessage=} [properties] Properties to set
      * @returns {Message} Message instance
      */
     Message.create = function create(properties) {
@@ -109,7 +109,7 @@ $root.Message = (function() {
 
     /**
      * Encodes the specified Message message. Does not implicitly {@link Message.verify|verify} messages.
-     * @param {Message$Properties} message Message message or plain object to encode
+     * @param {IMessage} message Message message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -150,7 +150,7 @@ $root.Message = (function() {
 
     /**
      * Encodes the specified Message message, length delimited. Does not implicitly {@link Message.verify|verify} messages.
-     * @param {Message$Properties} message Message message or plain object to encode
+     * @param {IMessage} message Message message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -416,7 +416,7 @@ $root.Message = (function() {
     /**
      * Creates a plain object from a Message message. Also converts values to other types if specified.
      * @param {Message} message Message
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Message.toObject = function toObject(message, options) {
@@ -489,7 +489,7 @@ $root.Message = (function() {
 
     /**
      * Creates a plain object from this Message message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Message.prototype.toObject = function toObject(options) {
@@ -507,8 +507,8 @@ $root.Message = (function() {
     /**
      * SomeEnum enum.
      * @name SomeEnum
-     * @memberof Message
      * @enum {number}
+     * @memberof Message
      * @property {number} ONE=1 ONE value
      * @property {number} TWO=2 TWO value
      */
diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js
index c031a994c..72f9ce9b0 100644
--- a/tests/data/mapbox/vector_tile.js
+++ b/tests/data/mapbox/vector_tile.js
@@ -13,8 +13,8 @@ $root.vector_tile = (function() {
 
     /**
      * Namespace vector_tile.
-     * @exports vector_tile
      * @namespace
+     * @name vector_tile
      */
     var vector_tile = {};
 
@@ -22,16 +22,16 @@ $root.vector_tile = (function() {
 
         /**
          * Properties of a Tile.
-         * @typedef vector_tile.Tile$Properties
-         * @type {Object}
-         * @property {Array.<vector_tile.Tile.Layer$Properties>} [layers] Tile layers.
+         * @interface ITile
+         * @memberof vector_tile
+         * @property {Array.<vector_tile.Tile.ILayer>} [layers] Tile layers.
          */
 
         /**
          * Constructs a new Tile.
-         * @exports vector_tile.Tile
          * @constructor
-         * @param {vector_tile.Tile$Properties=} [properties] Properties to set
+         * @param {vector_tile.ITile=} [properties] Properties to set
+         * @memberof vector_tile
          */
         function Tile(properties) {
             this.layers = [];
@@ -43,13 +43,13 @@ $root.vector_tile = (function() {
 
         /**
          * Tile layers.
-         * @type {Array.<vector_tile.Tile.Layer$Properties>}
+         * @type {Array.<vector_tile.Tile.ILayer>}
          */
         Tile.prototype.layers = $util.emptyArray;
 
         /**
          * Creates a new Tile instance using the specified properties.
-         * @param {vector_tile.Tile$Properties=} [properties] Properties to set
+         * @param {vector_tile.ITile=} [properties] Properties to set
          * @returns {vector_tile.Tile} Tile instance
          */
         Tile.create = function create(properties) {
@@ -58,7 +58,7 @@ $root.vector_tile = (function() {
 
         /**
          * Encodes the specified Tile message. Does not implicitly {@link vector_tile.Tile.verify|verify} messages.
-         * @param {vector_tile.Tile$Properties} message Tile message or plain object to encode
+         * @param {vector_tile.ITile} message Tile message or plain object to encode
          * @param {$protobuf.Writer} [writer] Writer to encode to
          * @returns {$protobuf.Writer} Writer
          */
@@ -73,7 +73,7 @@ $root.vector_tile = (function() {
 
         /**
          * Encodes the specified Tile message, length delimited. Does not implicitly {@link vector_tile.Tile.verify|verify} messages.
-         * @param {vector_tile.Tile$Properties} message Tile message or plain object to encode
+         * @param {vector_tile.ITile} message Tile message or plain object to encode
          * @param {$protobuf.Writer} [writer] Writer to encode to
          * @returns {$protobuf.Writer} Writer
          */
@@ -167,7 +167,7 @@ $root.vector_tile = (function() {
         /**
          * Creates a plain object from a Tile message. Also converts values to other types if specified.
          * @param {vector_tile.Tile} message Tile
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
          * @returns {Object.<string,*>} Plain object
          */
         Tile.toObject = function toObject(message, options) {
@@ -186,7 +186,7 @@ $root.vector_tile = (function() {
 
         /**
          * Creates a plain object from this Tile message. Also converts values to other types if specified.
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
          * @returns {Object.<string,*>} Plain object
          */
         Tile.prototype.toObject = function toObject(options) {
@@ -204,8 +204,8 @@ $root.vector_tile = (function() {
         /**
          * GeomType enum.
          * @name GeomType
-         * @memberof vector_tile.Tile
          * @enum {number}
+         * @memberof vector_tile.Tile
          * @property {number} UNKNOWN=0 UNKNOWN value
          * @property {number} POINT=1 POINT value
          * @property {number} LINESTRING=2 LINESTRING value
@@ -224,8 +224,8 @@ $root.vector_tile = (function() {
 
             /**
              * Properties of a Value.
-             * @typedef vector_tile.Tile.Value$Properties
-             * @type {Object}
+             * @interface IValue
+             * @memberof vector_tile.Tile
              * @property {string} [stringValue] Value stringValue.
              * @property {number} [floatValue] Value floatValue.
              * @property {number} [doubleValue] Value doubleValue.
@@ -237,9 +237,9 @@ $root.vector_tile = (function() {
 
             /**
              * Constructs a new Value.
-             * @exports vector_tile.Tile.Value
              * @constructor
-             * @param {vector_tile.Tile.Value$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.IValue=} [properties] Properties to set
+             * @memberof vector_tile.Tile
              */
             function Value(properties) {
                 if (properties)
@@ -292,7 +292,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Value instance using the specified properties.
-             * @param {vector_tile.Tile.Value$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.IValue=} [properties] Properties to set
              * @returns {vector_tile.Tile.Value} Value instance
              */
             Value.create = function create(properties) {
@@ -301,7 +301,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Value message. Does not implicitly {@link vector_tile.Tile.Value.verify|verify} messages.
-             * @param {vector_tile.Tile.Value$Properties} message Value message or plain object to encode
+             * @param {vector_tile.Tile.IValue} message Value message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -327,7 +327,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Value message, length delimited. Does not implicitly {@link vector_tile.Tile.Value.verify|verify} messages.
-             * @param {vector_tile.Tile.Value$Properties} message Value message or plain object to encode
+             * @param {vector_tile.Tile.IValue} message Value message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -474,7 +474,7 @@ $root.vector_tile = (function() {
             /**
              * Creates a plain object from a Value message. Also converts values to other types if specified.
              * @param {vector_tile.Tile.Value} message Value
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Value.toObject = function toObject(message, options) {
@@ -530,7 +530,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a plain object from this Value message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Value.prototype.toObject = function toObject(options) {
@@ -552,8 +552,8 @@ $root.vector_tile = (function() {
 
             /**
              * Properties of a Feature.
-             * @typedef vector_tile.Tile.Feature$Properties
-             * @type {Object}
+             * @interface IFeature
+             * @memberof vector_tile.Tile
              * @property {number|Long} [id] Feature id.
              * @property {Array.<number>} [tags] Feature tags.
              * @property {vector_tile.Tile.GeomType} [type] Feature type.
@@ -562,9 +562,9 @@ $root.vector_tile = (function() {
 
             /**
              * Constructs a new Feature.
-             * @exports vector_tile.Tile.Feature
              * @constructor
-             * @param {vector_tile.Tile.Feature$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.IFeature=} [properties] Properties to set
+             * @memberof vector_tile.Tile
              */
             function Feature(properties) {
                 this.tags = [];
@@ -601,7 +601,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Feature instance using the specified properties.
-             * @param {vector_tile.Tile.Feature$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.IFeature=} [properties] Properties to set
              * @returns {vector_tile.Tile.Feature} Feature instance
              */
             Feature.create = function create(properties) {
@@ -610,7 +610,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Feature message. Does not implicitly {@link vector_tile.Tile.Feature.verify|verify} messages.
-             * @param {vector_tile.Tile.Feature$Properties} message Feature message or plain object to encode
+             * @param {vector_tile.Tile.IFeature} message Feature message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -638,7 +638,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Feature message, length delimited. Does not implicitly {@link vector_tile.Tile.Feature.verify|verify} messages.
-             * @param {vector_tile.Tile.Feature$Properties} message Feature message or plain object to encode
+             * @param {vector_tile.Tile.IFeature} message Feature message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -802,7 +802,7 @@ $root.vector_tile = (function() {
             /**
              * Creates a plain object from a Feature message. Also converts values to other types if specified.
              * @param {vector_tile.Tile.Feature} message Feature
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Feature.toObject = function toObject(message, options) {
@@ -843,7 +843,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a plain object from this Feature message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Feature.prototype.toObject = function toObject(options) {
@@ -865,21 +865,21 @@ $root.vector_tile = (function() {
 
             /**
              * Properties of a Layer.
-             * @typedef vector_tile.Tile.Layer$Properties
-             * @type {Object}
+             * @interface ILayer
+             * @memberof vector_tile.Tile
              * @property {number} version Layer version.
              * @property {string} name Layer name.
-             * @property {Array.<vector_tile.Tile.Feature$Properties>} [features] Layer features.
+             * @property {Array.<vector_tile.Tile.IFeature>} [features] Layer features.
              * @property {Array.<string>} [keys] Layer keys.
-             * @property {Array.<vector_tile.Tile.Value$Properties>} [values] Layer values.
+             * @property {Array.<vector_tile.Tile.IValue>} [values] Layer values.
              * @property {number} [extent] Layer extent.
              */
 
             /**
              * Constructs a new Layer.
-             * @exports vector_tile.Tile.Layer
              * @constructor
-             * @param {vector_tile.Tile.Layer$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.ILayer=} [properties] Properties to set
+             * @memberof vector_tile.Tile
              */
             function Layer(properties) {
                 this.features = [];
@@ -905,7 +905,7 @@ $root.vector_tile = (function() {
 
             /**
              * Layer features.
-             * @type {Array.<vector_tile.Tile.Feature$Properties>}
+             * @type {Array.<vector_tile.Tile.IFeature>}
              */
             Layer.prototype.features = $util.emptyArray;
 
@@ -917,7 +917,7 @@ $root.vector_tile = (function() {
 
             /**
              * Layer values.
-             * @type {Array.<vector_tile.Tile.Value$Properties>}
+             * @type {Array.<vector_tile.Tile.IValue>}
              */
             Layer.prototype.values = $util.emptyArray;
 
@@ -929,7 +929,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Layer instance using the specified properties.
-             * @param {vector_tile.Tile.Layer$Properties=} [properties] Properties to set
+             * @param {vector_tile.Tile.ILayer=} [properties] Properties to set
              * @returns {vector_tile.Tile.Layer} Layer instance
              */
             Layer.create = function create(properties) {
@@ -938,7 +938,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Layer message. Does not implicitly {@link vector_tile.Tile.Layer.verify|verify} messages.
-             * @param {vector_tile.Tile.Layer$Properties} message Layer message or plain object to encode
+             * @param {vector_tile.Tile.ILayer} message Layer message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -963,7 +963,7 @@ $root.vector_tile = (function() {
 
             /**
              * Encodes the specified Layer message, length delimited. Does not implicitly {@link vector_tile.Tile.Layer.verify|verify} messages.
-             * @param {vector_tile.Tile.Layer$Properties} message Layer message or plain object to encode
+             * @param {vector_tile.Tile.ILayer} message Layer message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1126,7 +1126,7 @@ $root.vector_tile = (function() {
             /**
              * Creates a plain object from a Layer message. Also converts values to other types if specified.
              * @param {vector_tile.Tile.Layer} message Layer
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Layer.toObject = function toObject(message, options) {
@@ -1169,7 +1169,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a plain object from this Layer message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Layer.prototype.toObject = function toObject(options) {
diff --git a/tests/data/package.js b/tests/data/package.js
index 4020dc288..2f9d60c65 100644
--- a/tests/data/package.js
+++ b/tests/data/package.js
@@ -13,15 +13,15 @@ $root.Package = (function() {
 
     /**
      * Properties of a Package.
-     * @typedef Package$Properties
-     * @type {Object}
+     * @interface IPackage
+     * @name IPackage
      * @property {string} [name] Package name.
      * @property {string} [version] Package version.
      * @property {string} [versionScheme] Package versionScheme.
      * @property {string} [description] Package description.
      * @property {string} [author] Package author.
      * @property {string} [license] Package license.
-     * @property {Package.Repository$Properties} [repository] Package repository.
+     * @property {Package.IRepository} [repository] Package repository.
      * @property {string} [bugs] Package bugs.
      * @property {string} [homepage] Package homepage.
      * @property {Array.<string>} [keywords] Package keywords.
@@ -36,9 +36,9 @@ $root.Package = (function() {
 
     /**
      * Constructs a new Package.
-     * @exports Package
      * @constructor
-     * @param {Package$Properties=} [properties] Properties to set
+     * @param {IPackage=} [properties] Properties to set
+     * @name Package
      */
     function Package(properties) {
         this.keywords = [];
@@ -91,7 +91,7 @@ $root.Package = (function() {
 
     /**
      * Package repository.
-     * @type {(Package.Repository$Properties|null)}
+     * @type {(Package.IRepository|null)}
      */
     Package.prototype.repository = null;
 
@@ -157,7 +157,7 @@ $root.Package = (function() {
 
     /**
      * Creates a new Package instance using the specified properties.
-     * @param {Package$Properties=} [properties] Properties to set
+     * @param {IPackage=} [properties] Properties to set
      * @returns {Package} Package instance
      */
     Package.create = function create(properties) {
@@ -166,7 +166,7 @@ $root.Package = (function() {
 
     /**
      * Encodes the specified Package message. Does not implicitly {@link Package.verify|verify} messages.
-     * @param {Package$Properties} message Package message or plain object to encode
+     * @param {IPackage} message Package message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -218,7 +218,7 @@ $root.Package = (function() {
 
     /**
      * Encodes the specified Package message, length delimited. Does not implicitly {@link Package.verify|verify} messages.
-     * @param {Package$Properties} message Package message or plain object to encode
+     * @param {IPackage} message Package message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -511,7 +511,7 @@ $root.Package = (function() {
     /**
      * Creates a plain object from a Package message. Also converts values to other types if specified.
      * @param {Package} message Package
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Package.toObject = function toObject(message, options) {
@@ -599,7 +599,7 @@ $root.Package = (function() {
 
     /**
      * Creates a plain object from this Package message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     Package.prototype.toObject = function toObject(options) {
@@ -618,17 +618,17 @@ $root.Package = (function() {
 
         /**
          * Properties of a Repository.
-         * @typedef Package.Repository$Properties
-         * @type {Object}
+         * @interface IRepository
+         * @memberof Package
          * @property {string} [type] Repository type.
          * @property {string} [url] Repository url.
          */
 
         /**
          * Constructs a new Repository.
-         * @exports Package.Repository
          * @constructor
-         * @param {Package.Repository$Properties=} [properties] Properties to set
+         * @param {Package.IRepository=} [properties] Properties to set
+         * @memberof Package
          */
         function Repository(properties) {
             if (properties)
@@ -651,7 +651,7 @@ $root.Package = (function() {
 
         /**
          * Creates a new Repository instance using the specified properties.
-         * @param {Package.Repository$Properties=} [properties] Properties to set
+         * @param {Package.IRepository=} [properties] Properties to set
          * @returns {Package.Repository} Repository instance
          */
         Repository.create = function create(properties) {
@@ -660,7 +660,7 @@ $root.Package = (function() {
 
         /**
          * Encodes the specified Repository message. Does not implicitly {@link Package.Repository.verify|verify} messages.
-         * @param {Package.Repository$Properties} message Repository message or plain object to encode
+         * @param {Package.IRepository} message Repository message or plain object to encode
          * @param {$protobuf.Writer} [writer] Writer to encode to
          * @returns {$protobuf.Writer} Writer
          */
@@ -676,7 +676,7 @@ $root.Package = (function() {
 
         /**
          * Encodes the specified Repository message, length delimited. Does not implicitly {@link Package.Repository.verify|verify} messages.
-         * @param {Package.Repository$Properties} message Repository message or plain object to encode
+         * @param {Package.IRepository} message Repository message or plain object to encode
          * @param {$protobuf.Writer} [writer] Writer to encode to
          * @returns {$protobuf.Writer} Writer
          */
@@ -762,7 +762,7 @@ $root.Package = (function() {
         /**
          * Creates a plain object from a Repository message. Also converts values to other types if specified.
          * @param {Package.Repository} message Repository
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
          * @returns {Object.<string,*>} Plain object
          */
         Repository.toObject = function toObject(message, options) {
@@ -782,7 +782,7 @@ $root.Package = (function() {
 
         /**
          * Creates a plain object from this Repository message. Also converts values to other types if specified.
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
          * @returns {Object.<string,*>} Plain object
          */
         Repository.prototype.toObject = function toObject(options) {
diff --git a/tests/data/rpc-es6.js b/tests/data/rpc-es6.js
index f399c8bc7..dcae2f0e8 100644
--- a/tests/data/rpc-es6.js
+++ b/tests/data/rpc-es6.js
@@ -11,12 +11,12 @@ export const MyService = $root.MyService = (() => {
 
     /**
      * Constructs a new MyService service.
-     * @exports MyService
      * @extends $protobuf.rpc.Service
      * @constructor
      * @param {$protobuf.RPCImpl} rpcImpl RPC implementation
      * @param {boolean} [requestDelimited=false] Whether requests are length-delimited
      * @param {boolean} [responseDelimited=false] Whether responses are length-delimited
+     * @name MyService
      */
     function MyService(rpcImpl, requestDelimited, responseDelimited) {
         $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited);
@@ -45,7 +45,7 @@ export const MyService = $root.MyService = (() => {
 
     /**
      * Calls MyMethod.
-     * @param {MyRequest|Object.<string,*>} request MyRequest message or plain object
+     * @param {IMyRequest} request MyRequest message or plain object
      * @param {MyService_myMethod_Callback} callback Node-style callback called with the error, if any, and MyResponse
      * @returns {undefined}
      */
@@ -57,7 +57,7 @@ export const MyService = $root.MyService = (() => {
      * Calls MyMethod.
      * @name MyService#myMethod
      * @function
-     * @param {MyRequest|Object.<string,*>} request MyRequest message or plain object
+     * @param {IMyRequest} request MyRequest message or plain object
      * @returns {Promise<MyResponse>} Promise
      * @variation 2
      */
@@ -69,16 +69,16 @@ export const MyRequest = $root.MyRequest = (() => {
 
     /**
      * Properties of a MyRequest.
-     * @typedef MyRequest$Properties
-     * @type {Object}
+     * @interface IMyRequest
+     * @name IMyRequest
      * @property {string} [path] MyRequest path.
      */
 
     /**
      * Constructs a new MyRequest.
-     * @exports MyRequest
      * @constructor
-     * @param {MyRequest$Properties=} [properties] Properties to set
+     * @param {IMyRequest=} [properties] Properties to set
+     * @name MyRequest
      */
     function MyRequest(properties) {
         if (properties)
@@ -95,7 +95,7 @@ export const MyRequest = $root.MyRequest = (() => {
 
     /**
      * Creates a new MyRequest instance using the specified properties.
-     * @param {MyRequest$Properties=} [properties] Properties to set
+     * @param {IMyRequest=} [properties] Properties to set
      * @returns {MyRequest} MyRequest instance
      */
     MyRequest.create = function create(properties) {
@@ -104,7 +104,7 @@ export const MyRequest = $root.MyRequest = (() => {
 
     /**
      * Encodes the specified MyRequest message. Does not implicitly {@link MyRequest.verify|verify} messages.
-     * @param {MyRequest$Properties} message MyRequest message or plain object to encode
+     * @param {IMyRequest} message MyRequest message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -118,7 +118,7 @@ export const MyRequest = $root.MyRequest = (() => {
 
     /**
      * Encodes the specified MyRequest message, length delimited. Does not implicitly {@link MyRequest.verify|verify} messages.
-     * @param {MyRequest$Properties} message MyRequest message or plain object to encode
+     * @param {IMyRequest} message MyRequest message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -196,7 +196,7 @@ export const MyRequest = $root.MyRequest = (() => {
     /**
      * Creates a plain object from a MyRequest message. Also converts values to other types if specified.
      * @param {MyRequest} message MyRequest
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyRequest.toObject = function toObject(message, options) {
@@ -212,7 +212,7 @@ export const MyRequest = $root.MyRequest = (() => {
 
     /**
      * Creates a plain object from this MyRequest message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyRequest.prototype.toObject = function toObject(options) {
@@ -234,16 +234,16 @@ export const MyResponse = $root.MyResponse = (() => {
 
     /**
      * Properties of a MyResponse.
-     * @typedef MyResponse$Properties
-     * @type {Object}
+     * @interface IMyResponse
+     * @name IMyResponse
      * @property {number} [status] MyResponse status.
      */
 
     /**
      * Constructs a new MyResponse.
-     * @exports MyResponse
      * @constructor
-     * @param {MyResponse$Properties=} [properties] Properties to set
+     * @param {IMyResponse=} [properties] Properties to set
+     * @name MyResponse
      */
     function MyResponse(properties) {
         if (properties)
@@ -260,7 +260,7 @@ export const MyResponse = $root.MyResponse = (() => {
 
     /**
      * Creates a new MyResponse instance using the specified properties.
-     * @param {MyResponse$Properties=} [properties] Properties to set
+     * @param {IMyResponse=} [properties] Properties to set
      * @returns {MyResponse} MyResponse instance
      */
     MyResponse.create = function create(properties) {
@@ -269,7 +269,7 @@ export const MyResponse = $root.MyResponse = (() => {
 
     /**
      * Encodes the specified MyResponse message. Does not implicitly {@link MyResponse.verify|verify} messages.
-     * @param {MyResponse$Properties} message MyResponse message or plain object to encode
+     * @param {IMyResponse} message MyResponse message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -283,7 +283,7 @@ export const MyResponse = $root.MyResponse = (() => {
 
     /**
      * Encodes the specified MyResponse message, length delimited. Does not implicitly {@link MyResponse.verify|verify} messages.
-     * @param {MyResponse$Properties} message MyResponse message or plain object to encode
+     * @param {IMyResponse} message MyResponse message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -361,7 +361,7 @@ export const MyResponse = $root.MyResponse = (() => {
     /**
      * Creates a plain object from a MyResponse message. Also converts values to other types if specified.
      * @param {MyResponse} message MyResponse
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyResponse.toObject = function toObject(message, options) {
@@ -377,7 +377,7 @@ export const MyResponse = $root.MyResponse = (() => {
 
     /**
      * Creates a plain object from this MyResponse message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyResponse.prototype.toObject = function toObject(options) {
diff --git a/tests/data/rpc.d.ts b/tests/data/rpc.d.ts
index 0245638e9..d4ce4fa56 100644
--- a/tests/data/rpc.d.ts
+++ b/tests/data/rpc.d.ts
@@ -2,47 +2,23 @@ import * as $protobuf from "../..";
 
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
-    public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
-    public myMethod(request: (MyRequest|{ [k: string]: any }), callback: MyService_myMethod_Callback): void;
-    public myMethod(request: (MyRequest|{ [k: string]: any })): Promise<MyResponse>;
+    public myMethod(request: IMyRequest): Promise<MyResponse>;
 }
 
 type MyService_myMethod_Callback = (error: Error, response?: MyResponse) => void;
 
-type MyRequest$Properties = {
-    path?: string;
-};
-
 export class MyRequest {
-    constructor(properties?: MyRequest$Properties);
-    public path: string;
-    public static create(properties?: MyRequest$Properties): MyRequest;
-    public static encode(message: MyRequest$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-    public static encodeDelimited(message: MyRequest$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-    public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyRequest;
-    public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): MyRequest;
-    public static verify(message: { [k: string]: any }): string;
-    public static fromObject(object: { [k: string]: any }): MyRequest;
-    public static toObject(message: MyRequest, options?: $protobuf.ConversionOptions): { [k: string]: any };
-    public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
-    public toJSON(): { [k: string]: any };
+    constructor(properties?: IMyRequest);
 }
 
-type MyResponse$Properties = {
-    status?: number;
-};
+export interface IMyRequest {
+    path?: string;
+}
 
 export class MyResponse {
-    constructor(properties?: MyResponse$Properties);
-    public status: number;
-    public static create(properties?: MyResponse$Properties): MyResponse;
-    public static encode(message: MyResponse$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-    public static encodeDelimited(message: MyResponse$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-    public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyResponse;
-    public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): MyResponse;
-    public static verify(message: { [k: string]: any }): string;
-    public static fromObject(object: { [k: string]: any }): MyResponse;
-    public static toObject(message: MyResponse, options?: $protobuf.ConversionOptions): { [k: string]: any };
-    public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
-    public toJSON(): { [k: string]: any };
+    constructor(properties?: IMyResponse);
+}
+
+export interface IMyResponse {
+    status?: number;
 }
diff --git a/tests/data/rpc.js b/tests/data/rpc.js
index 8e0641bc6..d98dd8660 100644
--- a/tests/data/rpc.js
+++ b/tests/data/rpc.js
@@ -13,12 +13,12 @@ $root.MyService = (function() {
 
     /**
      * Constructs a new MyService service.
-     * @exports MyService
      * @extends $protobuf.rpc.Service
      * @constructor
      * @param {$protobuf.RPCImpl} rpcImpl RPC implementation
      * @param {boolean} [requestDelimited=false] Whether requests are length-delimited
      * @param {boolean} [responseDelimited=false] Whether responses are length-delimited
+     * @name MyService
      */
     function MyService(rpcImpl, requestDelimited, responseDelimited) {
         $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited);
@@ -47,7 +47,7 @@ $root.MyService = (function() {
 
     /**
      * Calls MyMethod.
-     * @param {MyRequest|Object.<string,*>} request MyRequest message or plain object
+     * @param {IMyRequest} request MyRequest message or plain object
      * @param {MyService_myMethod_Callback} callback Node-style callback called with the error, if any, and MyResponse
      * @returns {undefined}
      */
@@ -59,7 +59,7 @@ $root.MyService = (function() {
      * Calls MyMethod.
      * @name MyService#myMethod
      * @function
-     * @param {MyRequest|Object.<string,*>} request MyRequest message or plain object
+     * @param {IMyRequest} request MyRequest message or plain object
      * @returns {Promise<MyResponse>} Promise
      * @variation 2
      */
@@ -71,16 +71,16 @@ $root.MyRequest = (function() {
 
     /**
      * Properties of a MyRequest.
-     * @typedef MyRequest$Properties
-     * @type {Object}
+     * @interface IMyRequest
+     * @name IMyRequest
      * @property {string} [path] MyRequest path.
      */
 
     /**
      * Constructs a new MyRequest.
-     * @exports MyRequest
      * @constructor
-     * @param {MyRequest$Properties=} [properties] Properties to set
+     * @param {IMyRequest=} [properties] Properties to set
+     * @name MyRequest
      */
     function MyRequest(properties) {
         if (properties)
@@ -97,7 +97,7 @@ $root.MyRequest = (function() {
 
     /**
      * Creates a new MyRequest instance using the specified properties.
-     * @param {MyRequest$Properties=} [properties] Properties to set
+     * @param {IMyRequest=} [properties] Properties to set
      * @returns {MyRequest} MyRequest instance
      */
     MyRequest.create = function create(properties) {
@@ -106,7 +106,7 @@ $root.MyRequest = (function() {
 
     /**
      * Encodes the specified MyRequest message. Does not implicitly {@link MyRequest.verify|verify} messages.
-     * @param {MyRequest$Properties} message MyRequest message or plain object to encode
+     * @param {IMyRequest} message MyRequest message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -120,7 +120,7 @@ $root.MyRequest = (function() {
 
     /**
      * Encodes the specified MyRequest message, length delimited. Does not implicitly {@link MyRequest.verify|verify} messages.
-     * @param {MyRequest$Properties} message MyRequest message or plain object to encode
+     * @param {IMyRequest} message MyRequest message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -198,7 +198,7 @@ $root.MyRequest = (function() {
     /**
      * Creates a plain object from a MyRequest message. Also converts values to other types if specified.
      * @param {MyRequest} message MyRequest
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyRequest.toObject = function toObject(message, options) {
@@ -214,7 +214,7 @@ $root.MyRequest = (function() {
 
     /**
      * Creates a plain object from this MyRequest message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyRequest.prototype.toObject = function toObject(options) {
@@ -236,16 +236,16 @@ $root.MyResponse = (function() {
 
     /**
      * Properties of a MyResponse.
-     * @typedef MyResponse$Properties
-     * @type {Object}
+     * @interface IMyResponse
+     * @name IMyResponse
      * @property {number} [status] MyResponse status.
      */
 
     /**
      * Constructs a new MyResponse.
-     * @exports MyResponse
      * @constructor
-     * @param {MyResponse$Properties=} [properties] Properties to set
+     * @param {IMyResponse=} [properties] Properties to set
+     * @name MyResponse
      */
     function MyResponse(properties) {
         if (properties)
@@ -262,7 +262,7 @@ $root.MyResponse = (function() {
 
     /**
      * Creates a new MyResponse instance using the specified properties.
-     * @param {MyResponse$Properties=} [properties] Properties to set
+     * @param {IMyResponse=} [properties] Properties to set
      * @returns {MyResponse} MyResponse instance
      */
     MyResponse.create = function create(properties) {
@@ -271,7 +271,7 @@ $root.MyResponse = (function() {
 
     /**
      * Encodes the specified MyResponse message. Does not implicitly {@link MyResponse.verify|verify} messages.
-     * @param {MyResponse$Properties} message MyResponse message or plain object to encode
+     * @param {IMyResponse} message MyResponse message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -285,7 +285,7 @@ $root.MyResponse = (function() {
 
     /**
      * Encodes the specified MyResponse message, length delimited. Does not implicitly {@link MyResponse.verify|verify} messages.
-     * @param {MyResponse$Properties} message MyResponse message or plain object to encode
+     * @param {IMyResponse} message MyResponse message or plain object to encode
      * @param {$protobuf.Writer} [writer] Writer to encode to
      * @returns {$protobuf.Writer} Writer
      */
@@ -363,7 +363,7 @@ $root.MyResponse = (function() {
     /**
      * Creates a plain object from a MyResponse message. Also converts values to other types if specified.
      * @param {MyResponse} message MyResponse
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyResponse.toObject = function toObject(message, options) {
@@ -379,7 +379,7 @@ $root.MyResponse = (function() {
 
     /**
      * Creates a plain object from this MyResponse message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
+     * @param {$protobuf.IConversionOptions} [options] Conversion options
      * @returns {Object.<string,*>} Plain object
      */
     MyResponse.prototype.toObject = function toObject(options) {
diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts
index 848103daa..f92638cd4 100644
--- a/tests/data/test.d.ts
+++ b/tests/data/test.d.ts
@@ -4,19 +4,20 @@ export namespace jspb {
 
     namespace test {
 
-        type Empty$Properties = {};
+        interface IEmpty {
+        }
 
         class Empty {
-            constructor(properties?: jspb.test.Empty$Properties);
-            public static create(properties?: jspb.test.Empty$Properties): jspb.test.Empty;
-            public static encode(message: jspb.test.Empty$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.Empty$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.IEmpty);
+            public static create(properties?: jspb.test.IEmpty): jspb.test.Empty;
+            public static encode(message: jspb.test.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Empty;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Empty;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.Empty;
-            public static toObject(message: jspb.test.Empty, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -25,326 +26,328 @@ export namespace jspb {
             BAR = 2
         }
 
-        type EnumContainer$Properties = {
+        interface IEnumContainer {
             outerEnum?: jspb.test.OuterEnum;
-        };
+        }
 
         class EnumContainer {
-            constructor(properties?: jspb.test.EnumContainer$Properties);
+            constructor(properties?: jspb.test.IEnumContainer);
             public outerEnum: jspb.test.OuterEnum;
-            public static create(properties?: jspb.test.EnumContainer$Properties): jspb.test.EnumContainer;
-            public static encode(message: jspb.test.EnumContainer$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.EnumContainer$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IEnumContainer): jspb.test.EnumContainer;
+            public static encode(message: jspb.test.IEnumContainer, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IEnumContainer, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.EnumContainer;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.EnumContainer;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.EnumContainer;
-            public static toObject(message: jspb.test.EnumContainer, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.EnumContainer, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type Simple1$Properties = {
+        interface ISimple1 {
             aString: string;
             aRepeatedString?: string[];
             aBoolean?: boolean;
-        };
+        }
 
         class Simple1 {
-            constructor(properties?: jspb.test.Simple1$Properties);
+            constructor(properties?: jspb.test.ISimple1);
             public aString: string;
             public aRepeatedString: string[];
             public aBoolean: boolean;
-            public static create(properties?: jspb.test.Simple1$Properties): jspb.test.Simple1;
-            public static encode(message: jspb.test.Simple1$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.Simple1$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ISimple1): jspb.test.Simple1;
+            public static encode(message: jspb.test.ISimple1, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ISimple1, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple1;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Simple1;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.Simple1;
-            public static toObject(message: jspb.test.Simple1, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.Simple1, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type Simple2$Properties = {
+        interface ISimple2 {
             aString: string;
             aRepeatedString?: string[];
-        };
+        }
 
         class Simple2 {
-            constructor(properties?: jspb.test.Simple2$Properties);
+            constructor(properties?: jspb.test.ISimple2);
             public aString: string;
             public aRepeatedString: string[];
-            public static create(properties?: jspb.test.Simple2$Properties): jspb.test.Simple2;
-            public static encode(message: jspb.test.Simple2$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.Simple2$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ISimple2): jspb.test.Simple2;
+            public static encode(message: jspb.test.ISimple2, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ISimple2, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple2;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Simple2;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.Simple2;
-            public static toObject(message: jspb.test.Simple2, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.Simple2, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type SpecialCases$Properties = {
+        interface ISpecialCases {
             normal: string;
             default: string;
             function: string;
             var: string;
-        };
+        }
 
         class SpecialCases {
-            constructor(properties?: jspb.test.SpecialCases$Properties);
+            constructor(properties?: jspb.test.ISpecialCases);
             public normal: string;
             public ["default"]: string;
             public ["function"]: string;
             public ["var"]: string;
-            public static create(properties?: jspb.test.SpecialCases$Properties): jspb.test.SpecialCases;
-            public static encode(message: jspb.test.SpecialCases$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.SpecialCases$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ISpecialCases): jspb.test.SpecialCases;
+            public static encode(message: jspb.test.ISpecialCases, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ISpecialCases, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.SpecialCases;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.SpecialCases;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.SpecialCases;
-            public static toObject(message: jspb.test.SpecialCases, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.SpecialCases, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type OptionalFields$Properties = {
+        interface IOptionalFields {
             aString?: string;
             aBool: boolean;
-            aNestedMessage?: jspb.test.OptionalFields.Nested$Properties;
-            aRepeatedMessage?: jspb.test.OptionalFields.Nested$Properties[];
+            aNestedMessage?: jspb.test.OptionalFields.INested;
+            aRepeatedMessage?: jspb.test.OptionalFields.INested[];
             aRepeatedString?: string[];
-        };
+        }
 
         class OptionalFields {
-            constructor(properties?: jspb.test.OptionalFields$Properties);
+            constructor(properties?: jspb.test.IOptionalFields);
             public aString: string;
             public aBool: boolean;
-            public aNestedMessage: (jspb.test.OptionalFields.Nested$Properties|null);
-            public aRepeatedMessage: jspb.test.OptionalFields.Nested$Properties[];
+            public aNestedMessage: (jspb.test.OptionalFields.INested|null);
+            public aRepeatedMessage: jspb.test.OptionalFields.INested[];
             public aRepeatedString: string[];
-            public static create(properties?: jspb.test.OptionalFields$Properties): jspb.test.OptionalFields;
-            public static encode(message: jspb.test.OptionalFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.OptionalFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IOptionalFields): jspb.test.OptionalFields;
+            public static encode(message: jspb.test.IOptionalFields, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IOptionalFields, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OptionalFields;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.OptionalFields;
-            public static toObject(message: jspb.test.OptionalFields, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.OptionalFields, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace OptionalFields {
 
-            type Nested$Properties = {
+            interface INested {
                 anInt?: number;
-            };
+            }
 
             class Nested {
-                constructor(properties?: jspb.test.OptionalFields.Nested$Properties);
+                constructor(properties?: jspb.test.OptionalFields.INested);
                 public anInt: number;
-                public static create(properties?: jspb.test.OptionalFields.Nested$Properties): jspb.test.OptionalFields.Nested;
-                public static encode(message: jspb.test.OptionalFields.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.OptionalFields.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.OptionalFields.INested): jspb.test.OptionalFields.Nested;
+                public static encode(message: jspb.test.OptionalFields.INested, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.OptionalFields.INested, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields.Nested;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OptionalFields.Nested;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.OptionalFields.Nested;
-                public static toObject(message: jspb.test.OptionalFields.Nested, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.OptionalFields.Nested, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type HasExtensions$Properties = {
+        interface IHasExtensions {
             str1?: string;
             str2?: string;
             str3?: string;
-            ".jspb.test.IsExtension.extField"?: jspb.test.IsExtension$Properties;
-            ".jspb.test.IndirectExtension.simple"?: jspb.test.Simple1$Properties;
+            ".jspb.test.IsExtension.extField"?: jspb.test.IIsExtension;
+            ".jspb.test.IndirectExtension.simple"?: jspb.test.ISimple1;
             ".jspb.test.IndirectExtension.str"?: string;
             ".jspb.test.IndirectExtension.repeatedStr"?: string[];
-            ".jspb.test.IndirectExtension.repeatedSimple"?: jspb.test.Simple1$Properties[];
-            ".jspb.test.simple1"?: jspb.test.Simple1$Properties;
-        };
+            ".jspb.test.IndirectExtension.repeatedSimple"?: jspb.test.ISimple1[];
+            ".jspb.test.simple1"?: jspb.test.ISimple1;
+        }
 
         class HasExtensions {
-            constructor(properties?: jspb.test.HasExtensions$Properties);
+            constructor(properties?: jspb.test.IHasExtensions);
             public str1: string;
             public str2: string;
             public str3: string;
-            public [".jspb.test.IsExtension.extField"]: (jspb.test.IsExtension$Properties|null);
-            public [".jspb.test.IndirectExtension.simple"]: (jspb.test.Simple1$Properties|null);
+            public [".jspb.test.IsExtension.extField"]: (jspb.test.IIsExtension|null);
+            public [".jspb.test.IndirectExtension.simple"]: (jspb.test.ISimple1|null);
             public [".jspb.test.IndirectExtension.str"]: string;
             public [".jspb.test.IndirectExtension.repeatedStr"]: string[];
-            public [".jspb.test.IndirectExtension.repeatedSimple"]: jspb.test.Simple1$Properties[];
-            public [".jspb.test.simple1"]: (jspb.test.Simple1$Properties|null);
-            public static create(properties?: jspb.test.HasExtensions$Properties): jspb.test.HasExtensions;
-            public static encode(message: jspb.test.HasExtensions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.HasExtensions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public [".jspb.test.IndirectExtension.repeatedSimple"]: jspb.test.ISimple1[];
+            public [".jspb.test.simple1"]: (jspb.test.ISimple1|null);
+            public static create(properties?: jspb.test.IHasExtensions): jspb.test.HasExtensions;
+            public static encode(message: jspb.test.IHasExtensions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IHasExtensions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.HasExtensions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.HasExtensions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.HasExtensions;
-            public static toObject(message: jspb.test.HasExtensions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.HasExtensions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type Complex$Properties = {
+        interface IComplex {
             aString: string;
             anOutOfOrderBool: boolean;
-            aNestedMessage?: jspb.test.Complex.Nested$Properties;
-            aRepeatedMessage?: jspb.test.Complex.Nested$Properties[];
+            aNestedMessage?: jspb.test.Complex.INested;
+            aRepeatedMessage?: jspb.test.Complex.INested[];
             aRepeatedString?: string[];
-        };
+        }
 
         class Complex {
-            constructor(properties?: jspb.test.Complex$Properties);
+            constructor(properties?: jspb.test.IComplex);
             public aString: string;
             public anOutOfOrderBool: boolean;
-            public aNestedMessage: (jspb.test.Complex.Nested$Properties|null);
-            public aRepeatedMessage: jspb.test.Complex.Nested$Properties[];
+            public aNestedMessage: (jspb.test.Complex.INested|null);
+            public aRepeatedMessage: jspb.test.Complex.INested[];
             public aRepeatedString: string[];
-            public static create(properties?: jspb.test.Complex$Properties): jspb.test.Complex;
-            public static encode(message: jspb.test.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IComplex): jspb.test.Complex;
+            public static encode(message: jspb.test.IComplex, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IComplex, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Complex;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.Complex;
-            public static toObject(message: jspb.test.Complex, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.Complex, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace Complex {
 
-            type Nested$Properties = {
+            interface INested {
                 anInt: number;
-            };
+            }
 
             class Nested {
-                constructor(properties?: jspb.test.Complex.Nested$Properties);
+                constructor(properties?: jspb.test.Complex.INested);
                 public anInt: number;
-                public static create(properties?: jspb.test.Complex.Nested$Properties): jspb.test.Complex.Nested;
-                public static encode(message: jspb.test.Complex.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.Complex.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.Complex.INested): jspb.test.Complex.Nested;
+                public static encode(message: jspb.test.Complex.INested, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.Complex.INested, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex.Nested;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Complex.Nested;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.Complex.Nested;
-                public static toObject(message: jspb.test.Complex.Nested, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.Complex.Nested, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type OuterMessage$Properties = {};
+        interface IOuterMessage {
+        }
 
         class OuterMessage {
-            constructor(properties?: jspb.test.OuterMessage$Properties);
-            public static create(properties?: jspb.test.OuterMessage$Properties): jspb.test.OuterMessage;
-            public static encode(message: jspb.test.OuterMessage$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.OuterMessage$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.IOuterMessage);
+            public static create(properties?: jspb.test.IOuterMessage): jspb.test.OuterMessage;
+            public static encode(message: jspb.test.IOuterMessage, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IOuterMessage, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OuterMessage;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.OuterMessage;
-            public static toObject(message: jspb.test.OuterMessage, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.OuterMessage, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace OuterMessage {
 
-            type Complex$Properties = {
+            interface IComplex {
                 innerComplexField?: number;
-            };
+            }
 
             class Complex {
-                constructor(properties?: jspb.test.OuterMessage.Complex$Properties);
+                constructor(properties?: jspb.test.OuterMessage.IComplex);
                 public innerComplexField: number;
-                public static create(properties?: jspb.test.OuterMessage.Complex$Properties): jspb.test.OuterMessage.Complex;
-                public static encode(message: jspb.test.OuterMessage.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.OuterMessage.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.OuterMessage.IComplex): jspb.test.OuterMessage.Complex;
+                public static encode(message: jspb.test.OuterMessage.IComplex, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.OuterMessage.IComplex, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage.Complex;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OuterMessage.Complex;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.OuterMessage.Complex;
-                public static toObject(message: jspb.test.OuterMessage.Complex, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.OuterMessage.Complex, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type IsExtension$Properties = {
+        interface IIsExtension {
             ext1?: string;
-        };
+        }
 
         class IsExtension {
-            constructor(properties?: jspb.test.IsExtension$Properties);
+            constructor(properties?: jspb.test.IIsExtension);
             public ext1: string;
-            public static create(properties?: jspb.test.IsExtension$Properties): jspb.test.IsExtension;
-            public static encode(message: jspb.test.IsExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.IsExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IIsExtension): jspb.test.IsExtension;
+            public static encode(message: jspb.test.IIsExtension, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IIsExtension, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IsExtension;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.IsExtension;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.IsExtension;
-            public static toObject(message: jspb.test.IsExtension, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.IsExtension, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type IndirectExtension$Properties = {};
+        interface IIndirectExtension {
+        }
 
         class IndirectExtension {
-            constructor(properties?: jspb.test.IndirectExtension$Properties);
-            public static create(properties?: jspb.test.IndirectExtension$Properties): jspb.test.IndirectExtension;
-            public static encode(message: jspb.test.IndirectExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.IndirectExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.IIndirectExtension);
+            public static create(properties?: jspb.test.IIndirectExtension): jspb.test.IndirectExtension;
+            public static encode(message: jspb.test.IIndirectExtension, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IIndirectExtension, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IndirectExtension;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.IndirectExtension;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.IndirectExtension;
-            public static toObject(message: jspb.test.IndirectExtension, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.IndirectExtension, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type DefaultValues$Properties = {
+        interface IDefaultValues {
             stringField?: string;
             boolField?: boolean;
             intField?: (number|Long);
             enumField?: jspb.test.DefaultValues.Enum;
             emptyField?: string;
             bytesField?: Uint8Array;
-        };
+        }
 
         class DefaultValues {
-            constructor(properties?: jspb.test.DefaultValues$Properties);
+            constructor(properties?: jspb.test.IDefaultValues);
             public stringField: string;
             public boolField: boolean;
             public intField: (number|Long);
             public enumField: jspb.test.DefaultValues.Enum;
             public emptyField: string;
             public bytesField: Uint8Array;
-            public static create(properties?: jspb.test.DefaultValues$Properties): jspb.test.DefaultValues;
-            public static encode(message: jspb.test.DefaultValues$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.DefaultValues$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IDefaultValues): jspb.test.DefaultValues;
+            public static encode(message: jspb.test.IDefaultValues, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IDefaultValues, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.DefaultValues;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.DefaultValues;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.DefaultValues;
-            public static toObject(message: jspb.test.DefaultValues, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.DefaultValues, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -356,7 +359,7 @@ export namespace jspb {
             }
         }
 
-        type FloatingPointFields$Properties = {
+        interface IFloatingPointFields {
             optionalFloatField?: number;
             requiredFloatField: number;
             repeatedFloatField?: number[];
@@ -365,10 +368,10 @@ export namespace jspb {
             requiredDoubleField: number;
             repeatedDoubleField?: number[];
             defaultDoubleField?: number;
-        };
+        }
 
         class FloatingPointFields {
-            constructor(properties?: jspb.test.FloatingPointFields$Properties);
+            constructor(properties?: jspb.test.IFloatingPointFields);
             public optionalFloatField: number;
             public requiredFloatField: number;
             public repeatedFloatField: number[];
@@ -377,217 +380,218 @@ export namespace jspb {
             public requiredDoubleField: number;
             public repeatedDoubleField: number[];
             public defaultDoubleField: number;
-            public static create(properties?: jspb.test.FloatingPointFields$Properties): jspb.test.FloatingPointFields;
-            public static encode(message: jspb.test.FloatingPointFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.FloatingPointFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IFloatingPointFields): jspb.test.FloatingPointFields;
+            public static encode(message: jspb.test.IFloatingPointFields, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IFloatingPointFields, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.FloatingPointFields;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.FloatingPointFields;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.FloatingPointFields;
-            public static toObject(message: jspb.test.FloatingPointFields, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.FloatingPointFields, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestClone$Properties = {
+        interface ITestClone {
             str?: string;
-            simple1?: jspb.test.Simple1$Properties;
-            simple2?: jspb.test.Simple1$Properties[];
+            simple1?: jspb.test.ISimple1;
+            simple2?: jspb.test.ISimple1[];
             bytesField?: Uint8Array;
             unused?: string;
-            ".jspb.test.CloneExtension.extField"?: jspb.test.CloneExtension$Properties;
-        };
+            ".jspb.test.CloneExtension.extField"?: jspb.test.ICloneExtension;
+        }
 
         class TestClone {
-            constructor(properties?: jspb.test.TestClone$Properties);
+            constructor(properties?: jspb.test.ITestClone);
             public str: string;
-            public simple1: (jspb.test.Simple1$Properties|null);
-            public simple2: jspb.test.Simple1$Properties[];
+            public simple1: (jspb.test.ISimple1|null);
+            public simple2: jspb.test.ISimple1[];
             public bytesField: Uint8Array;
             public unused: string;
-            public [".jspb.test.CloneExtension.extField"]: (jspb.test.CloneExtension$Properties|null);
-            public static create(properties?: jspb.test.TestClone$Properties): jspb.test.TestClone;
-            public static encode(message: jspb.test.TestClone$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestClone$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public [".jspb.test.CloneExtension.extField"]: (jspb.test.ICloneExtension|null);
+            public static create(properties?: jspb.test.ITestClone): jspb.test.TestClone;
+            public static encode(message: jspb.test.ITestClone, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestClone, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestClone;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestClone;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestClone;
-            public static toObject(message: jspb.test.TestClone, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestClone, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type CloneExtension$Properties = {
+        interface ICloneExtension {
             ext?: string;
-        };
+        }
 
         class CloneExtension {
-            constructor(properties?: jspb.test.CloneExtension$Properties);
+            constructor(properties?: jspb.test.ICloneExtension);
             public ext: string;
-            public static create(properties?: jspb.test.CloneExtension$Properties): jspb.test.CloneExtension;
-            public static encode(message: jspb.test.CloneExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.CloneExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ICloneExtension): jspb.test.CloneExtension;
+            public static encode(message: jspb.test.ICloneExtension, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ICloneExtension, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.CloneExtension;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.CloneExtension;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.CloneExtension;
-            public static toObject(message: jspb.test.CloneExtension, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.CloneExtension, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestGroup$Properties = {
-            repeatedGroup?: jspb.test.TestGroup.RepeatedGroup$Properties[];
-            requiredGroup: jspb.test.TestGroup.RequiredGroup$Properties;
-            optionalGroup?: jspb.test.TestGroup.OptionalGroup$Properties;
+        interface ITestGroup {
+            repeatedGroup?: jspb.test.TestGroup.IRepeatedGroup[];
+            requiredGroup: jspb.test.TestGroup.IRequiredGroup;
+            optionalGroup?: jspb.test.TestGroup.IOptionalGroup;
             id?: string;
-            requiredSimple: jspb.test.Simple2$Properties;
-            optionalSimple?: jspb.test.Simple2$Properties;
-        };
+            requiredSimple: jspb.test.ISimple2;
+            optionalSimple?: jspb.test.ISimple2;
+        }
 
         class TestGroup {
-            constructor(properties?: jspb.test.TestGroup$Properties);
-            public repeatedGroup: jspb.test.TestGroup.RepeatedGroup$Properties[];
-            public requiredGroup: jspb.test.TestGroup.RequiredGroup$Properties;
-            public optionalGroup: (jspb.test.TestGroup.OptionalGroup$Properties|null);
+            constructor(properties?: jspb.test.ITestGroup);
+            public repeatedGroup: jspb.test.TestGroup.IRepeatedGroup[];
+            public requiredGroup: jspb.test.TestGroup.IRequiredGroup;
+            public optionalGroup: (jspb.test.TestGroup.IOptionalGroup|null);
             public id: string;
-            public requiredSimple: jspb.test.Simple2$Properties;
-            public optionalSimple: (jspb.test.Simple2$Properties|null);
-            public static create(properties?: jspb.test.TestGroup$Properties): jspb.test.TestGroup;
-            public static encode(message: jspb.test.TestGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public requiredSimple: jspb.test.ISimple2;
+            public optionalSimple: (jspb.test.ISimple2|null);
+            public static create(properties?: jspb.test.ITestGroup): jspb.test.TestGroup;
+            public static encode(message: jspb.test.ITestGroup, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestGroup, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestGroup;
-            public static toObject(message: jspb.test.TestGroup, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestGroup, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace TestGroup {
 
-            type RepeatedGroup$Properties = {
+            interface IRepeatedGroup {
                 id: string;
                 someBool?: boolean[];
-            };
+            }
 
             class RepeatedGroup {
-                constructor(properties?: jspb.test.TestGroup.RepeatedGroup$Properties);
+                constructor(properties?: jspb.test.TestGroup.IRepeatedGroup);
                 public id: string;
                 public someBool: boolean[];
-                public static create(properties?: jspb.test.TestGroup.RepeatedGroup$Properties): jspb.test.TestGroup.RepeatedGroup;
-                public static encode(message: jspb.test.TestGroup.RepeatedGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.TestGroup.RepeatedGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.TestGroup.IRepeatedGroup): jspb.test.TestGroup.RepeatedGroup;
+                public static encode(message: jspb.test.TestGroup.IRepeatedGroup, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.TestGroup.IRepeatedGroup, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RepeatedGroup;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.RepeatedGroup;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.TestGroup.RepeatedGroup;
-                public static toObject(message: jspb.test.TestGroup.RepeatedGroup, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.TestGroup.RepeatedGroup, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
 
-            type RequiredGroup$Properties = {
+            interface IRequiredGroup {
                 id: string;
-            };
+            }
 
             class RequiredGroup {
-                constructor(properties?: jspb.test.TestGroup.RequiredGroup$Properties);
+                constructor(properties?: jspb.test.TestGroup.IRequiredGroup);
                 public id: string;
-                public static create(properties?: jspb.test.TestGroup.RequiredGroup$Properties): jspb.test.TestGroup.RequiredGroup;
-                public static encode(message: jspb.test.TestGroup.RequiredGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.TestGroup.RequiredGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.TestGroup.IRequiredGroup): jspb.test.TestGroup.RequiredGroup;
+                public static encode(message: jspb.test.TestGroup.IRequiredGroup, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.TestGroup.IRequiredGroup, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RequiredGroup;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.RequiredGroup;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.TestGroup.RequiredGroup;
-                public static toObject(message: jspb.test.TestGroup.RequiredGroup, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.TestGroup.RequiredGroup, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
 
-            type OptionalGroup$Properties = {
+            interface IOptionalGroup {
                 id: string;
-            };
+            }
 
             class OptionalGroup {
-                constructor(properties?: jspb.test.TestGroup.OptionalGroup$Properties);
+                constructor(properties?: jspb.test.TestGroup.IOptionalGroup);
                 public id: string;
-                public static create(properties?: jspb.test.TestGroup.OptionalGroup$Properties): jspb.test.TestGroup.OptionalGroup;
-                public static encode(message: jspb.test.TestGroup.OptionalGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.TestGroup.OptionalGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: jspb.test.TestGroup.IOptionalGroup): jspb.test.TestGroup.OptionalGroup;
+                public static encode(message: jspb.test.TestGroup.IOptionalGroup, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.TestGroup.IOptionalGroup, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.OptionalGroup;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.OptionalGroup;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.TestGroup.OptionalGroup;
-                public static toObject(message: jspb.test.TestGroup.OptionalGroup, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.TestGroup.OptionalGroup, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type TestGroup1$Properties = {
-            group?: jspb.test.TestGroup.RepeatedGroup$Properties;
-        };
+        interface ITestGroup1 {
+            group?: jspb.test.TestGroup.IRepeatedGroup;
+        }
 
         class TestGroup1 {
-            constructor(properties?: jspb.test.TestGroup1$Properties);
-            public group: (jspb.test.TestGroup.RepeatedGroup$Properties|null);
-            public static create(properties?: jspb.test.TestGroup1$Properties): jspb.test.TestGroup1;
-            public static encode(message: jspb.test.TestGroup1$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestGroup1$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.ITestGroup1);
+            public group: (jspb.test.TestGroup.IRepeatedGroup|null);
+            public static create(properties?: jspb.test.ITestGroup1): jspb.test.TestGroup1;
+            public static encode(message: jspb.test.ITestGroup1, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestGroup1, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup1;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup1;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestGroup1;
-            public static toObject(message: jspb.test.TestGroup1, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestGroup1, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestReservedNames$Properties = {
+        interface ITestReservedNames {
             extension?: number;
             ".jspb.test.TestReservedNamesExtension.foo"?: number;
-        };
+        }
 
         class TestReservedNames {
-            constructor(properties?: jspb.test.TestReservedNames$Properties);
+            constructor(properties?: jspb.test.ITestReservedNames);
             public extension: number;
             public [".jspb.test.TestReservedNamesExtension.foo"]: number;
-            public static create(properties?: jspb.test.TestReservedNames$Properties): jspb.test.TestReservedNames;
-            public static encode(message: jspb.test.TestReservedNames$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestReservedNames$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ITestReservedNames): jspb.test.TestReservedNames;
+            public static encode(message: jspb.test.ITestReservedNames, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestReservedNames, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNames;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestReservedNames;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestReservedNames;
-            public static toObject(message: jspb.test.TestReservedNames, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestReservedNames, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestReservedNamesExtension$Properties = {};
+        interface ITestReservedNamesExtension {
+        }
 
         class TestReservedNamesExtension {
-            constructor(properties?: jspb.test.TestReservedNamesExtension$Properties);
-            public static create(properties?: jspb.test.TestReservedNamesExtension$Properties): jspb.test.TestReservedNamesExtension;
-            public static encode(message: jspb.test.TestReservedNamesExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestReservedNamesExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.ITestReservedNamesExtension);
+            public static create(properties?: jspb.test.ITestReservedNamesExtension): jspb.test.TestReservedNamesExtension;
+            public static encode(message: jspb.test.ITestReservedNamesExtension, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestReservedNamesExtension, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNamesExtension;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestReservedNamesExtension;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestReservedNamesExtension;
-            public static toObject(message: jspb.test.TestReservedNamesExtension, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestReservedNamesExtension, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestMessageWithOneof$Properties = {
+        interface ITestMessageWithOneof {
             pone?: string;
             pthree?: string;
-            rone?: jspb.test.TestMessageWithOneof$Properties;
+            rone?: jspb.test.ITestMessageWithOneof;
             rtwo?: string;
             normalField?: boolean;
             repeatedField?: string[];
@@ -595,13 +599,13 @@ export namespace jspb {
             atwo?: number;
             bone?: number;
             btwo?: number;
-        };
+        }
 
         class TestMessageWithOneof {
-            constructor(properties?: jspb.test.TestMessageWithOneof$Properties);
+            constructor(properties?: jspb.test.ITestMessageWithOneof);
             public pone: string;
             public pthree: string;
-            public rone: (jspb.test.TestMessageWithOneof$Properties|null);
+            public rone: (jspb.test.ITestMessageWithOneof|null);
             public rtwo: string;
             public normalField: boolean;
             public repeatedField: string[];
@@ -613,77 +617,77 @@ export namespace jspb {
             public recursiveOneof?: string;
             public defaultOneofA?: string;
             public defaultOneofB?: string;
-            public static create(properties?: jspb.test.TestMessageWithOneof$Properties): jspb.test.TestMessageWithOneof;
-            public static encode(message: jspb.test.TestMessageWithOneof$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestMessageWithOneof$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ITestMessageWithOneof): jspb.test.TestMessageWithOneof;
+            public static encode(message: jspb.test.ITestMessageWithOneof, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestMessageWithOneof, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMessageWithOneof;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestMessageWithOneof;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestMessageWithOneof;
-            public static toObject(message: jspb.test.TestMessageWithOneof, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestMessageWithOneof, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestEndsWithBytes$Properties = {
+        interface ITestEndsWithBytes {
             value?: number;
             data?: Uint8Array;
-        };
+        }
 
         class TestEndsWithBytes {
-            constructor(properties?: jspb.test.TestEndsWithBytes$Properties);
+            constructor(properties?: jspb.test.ITestEndsWithBytes);
             public value: number;
             public data: Uint8Array;
-            public static create(properties?: jspb.test.TestEndsWithBytes$Properties): jspb.test.TestEndsWithBytes;
-            public static encode(message: jspb.test.TestEndsWithBytes$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestEndsWithBytes$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.ITestEndsWithBytes): jspb.test.TestEndsWithBytes;
+            public static encode(message: jspb.test.ITestEndsWithBytes, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestEndsWithBytes, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestEndsWithBytes;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestEndsWithBytes;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestEndsWithBytes;
-            public static toObject(message: jspb.test.TestEndsWithBytes, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestEndsWithBytes, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type TestMapFieldsNoBinary$Properties = {
+        interface ITestMapFieldsNoBinary {
             mapStringString?: { [k: string]: string };
             mapStringInt32?: { [k: string]: number };
             mapStringInt64?: { [k: string]: (number|Long) };
             mapStringBool?: { [k: string]: boolean };
             mapStringDouble?: { [k: string]: number };
             mapStringEnum?: { [k: string]: jspb.test.MapValueEnumNoBinary };
-            mapStringMsg?: { [k: string]: jspb.test.MapValueMessageNoBinary$Properties };
+            mapStringMsg?: { [k: string]: jspb.test.IMapValueMessageNoBinary };
             mapInt32String?: { [k: string]: string };
             mapInt64String?: { [k: string]: string };
             mapBoolString?: { [k: string]: string };
-            testMapFields?: jspb.test.TestMapFieldsNoBinary$Properties;
-            mapStringTestmapfields?: { [k: string]: jspb.test.TestMapFieldsNoBinary$Properties };
-        };
+            testMapFields?: jspb.test.ITestMapFieldsNoBinary;
+            mapStringTestmapfields?: { [k: string]: jspb.test.ITestMapFieldsNoBinary };
+        }
 
         class TestMapFieldsNoBinary {
-            constructor(properties?: jspb.test.TestMapFieldsNoBinary$Properties);
+            constructor(properties?: jspb.test.ITestMapFieldsNoBinary);
             public mapStringString: { [k: string]: string };
             public mapStringInt32: { [k: string]: number };
             public mapStringInt64: { [k: string]: (number|Long) };
             public mapStringBool: { [k: string]: boolean };
             public mapStringDouble: { [k: string]: number };
             public mapStringEnum: { [k: string]: jspb.test.MapValueEnumNoBinary };
-            public mapStringMsg: { [k: string]: jspb.test.MapValueMessageNoBinary$Properties };
+            public mapStringMsg: { [k: string]: jspb.test.IMapValueMessageNoBinary };
             public mapInt32String: { [k: string]: string };
             public mapInt64String: { [k: string]: string };
             public mapBoolString: { [k: string]: string };
-            public testMapFields: (jspb.test.TestMapFieldsNoBinary$Properties|null);
-            public mapStringTestmapfields: { [k: string]: jspb.test.TestMapFieldsNoBinary$Properties };
-            public static create(properties?: jspb.test.TestMapFieldsNoBinary$Properties): jspb.test.TestMapFieldsNoBinary;
-            public static encode(message: jspb.test.TestMapFieldsNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.TestMapFieldsNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public testMapFields: (jspb.test.ITestMapFieldsNoBinary|null);
+            public mapStringTestmapfields: { [k: string]: jspb.test.ITestMapFieldsNoBinary };
+            public static create(properties?: jspb.test.ITestMapFieldsNoBinary): jspb.test.TestMapFieldsNoBinary;
+            public static encode(message: jspb.test.ITestMapFieldsNoBinary, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.ITestMapFieldsNoBinary, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMapFieldsNoBinary;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestMapFieldsNoBinary;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.TestMapFieldsNoBinary;
-            public static toObject(message: jspb.test.TestMapFieldsNoBinary, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.TestMapFieldsNoBinary, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -693,77 +697,79 @@ export namespace jspb {
             MAP_VALUE_BAZ_NOBINARY = 2
         }
 
-        type MapValueMessageNoBinary$Properties = {
+        interface IMapValueMessageNoBinary {
             foo?: number;
-        };
+        }
 
         class MapValueMessageNoBinary {
-            constructor(properties?: jspb.test.MapValueMessageNoBinary$Properties);
+            constructor(properties?: jspb.test.IMapValueMessageNoBinary);
             public foo: number;
-            public static create(properties?: jspb.test.MapValueMessageNoBinary$Properties): jspb.test.MapValueMessageNoBinary;
-            public static encode(message: jspb.test.MapValueMessageNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.MapValueMessageNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: jspb.test.IMapValueMessageNoBinary): jspb.test.MapValueMessageNoBinary;
+            public static encode(message: jspb.test.IMapValueMessageNoBinary, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IMapValueMessageNoBinary, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.MapValueMessageNoBinary;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.MapValueMessageNoBinary;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.MapValueMessageNoBinary;
-            public static toObject(message: jspb.test.MapValueMessageNoBinary, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.MapValueMessageNoBinary, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type Deeply$Properties = {};
+        interface IDeeply {
+        }
 
         class Deeply {
-            constructor(properties?: jspb.test.Deeply$Properties);
-            public static create(properties?: jspb.test.Deeply$Properties): jspb.test.Deeply;
-            public static encode(message: jspb.test.Deeply$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: jspb.test.Deeply$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: jspb.test.IDeeply);
+            public static create(properties?: jspb.test.IDeeply): jspb.test.Deeply;
+            public static encode(message: jspb.test.IDeeply, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: jspb.test.IDeeply, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): jspb.test.Deeply;
-            public static toObject(message: jspb.test.Deeply, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: jspb.test.Deeply, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace Deeply {
 
-            type Nested$Properties = {};
+            interface INested {
+            }
 
             class Nested {
-                constructor(properties?: jspb.test.Deeply.Nested$Properties);
-                public static create(properties?: jspb.test.Deeply.Nested$Properties): jspb.test.Deeply.Nested;
-                public static encode(message: jspb.test.Deeply.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: jspb.test.Deeply.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                constructor(properties?: jspb.test.Deeply.INested);
+                public static create(properties?: jspb.test.Deeply.INested): jspb.test.Deeply.Nested;
+                public static encode(message: jspb.test.Deeply.INested, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: jspb.test.Deeply.INested, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply.Nested;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): jspb.test.Deeply.Nested;
-                public static toObject(message: jspb.test.Deeply.Nested, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: jspb.test.Deeply.Nested, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
 
             namespace Nested {
 
-                type Message$Properties = {
+                interface IMessage {
                     count?: number;
-                };
+                }
 
                 class Message {
-                    constructor(properties?: jspb.test.Deeply.Nested.Message$Properties);
+                    constructor(properties?: jspb.test.Deeply.Nested.IMessage);
                     public count: number;
-                    public static create(properties?: jspb.test.Deeply.Nested.Message$Properties): jspb.test.Deeply.Nested.Message;
-                    public static encode(message: jspb.test.Deeply.Nested.Message$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                    public static encodeDelimited(message: jspb.test.Deeply.Nested.Message$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                    public static create(properties?: jspb.test.Deeply.Nested.IMessage): jspb.test.Deeply.Nested.Message;
+                    public static encode(message: jspb.test.Deeply.Nested.IMessage, writer?: $protobuf.Writer): $protobuf.Writer;
+                    public static encodeDelimited(message: jspb.test.Deeply.Nested.IMessage, writer?: $protobuf.Writer): $protobuf.Writer;
                     public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested.Message;
                     public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply.Nested.Message;
                     public static verify(message: { [k: string]: any }): string;
                     public static fromObject(object: { [k: string]: any }): jspb.test.Deeply.Nested.Message;
-                    public static toObject(message: jspb.test.Deeply.Nested.Message, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                    public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                    public static toObject(message: jspb.test.Deeply.Nested.Message, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                    public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                     public toJSON(): { [k: string]: any };
                 }
             }
@@ -775,149 +781,149 @@ export namespace google {
 
     namespace protobuf {
 
-        type FileDescriptorSet$Properties = {
-            file?: google.protobuf.FileDescriptorProto$Properties[];
-        };
+        interface IFileDescriptorSet {
+            file?: google.protobuf.IFileDescriptorProto[];
+        }
 
         class FileDescriptorSet {
-            constructor(properties?: google.protobuf.FileDescriptorSet$Properties);
-            public file: google.protobuf.FileDescriptorProto$Properties[];
-            public static create(properties?: google.protobuf.FileDescriptorSet$Properties): google.protobuf.FileDescriptorSet;
-            public static encode(message: google.protobuf.FileDescriptorSet$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.FileDescriptorSet$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: google.protobuf.IFileDescriptorSet);
+            public file: google.protobuf.IFileDescriptorProto[];
+            public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet;
+            public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet;
-            public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type FileDescriptorProto$Properties = {
+        interface IFileDescriptorProto {
             name?: string;
             "package"?: string;
             dependency?: string[];
             publicDependency?: number[];
             weakDependency?: number[];
-            messageType?: google.protobuf.DescriptorProto$Properties[];
-            enumType?: google.protobuf.EnumDescriptorProto$Properties[];
-            service?: google.protobuf.ServiceDescriptorProto$Properties[];
-            extension?: google.protobuf.FieldDescriptorProto$Properties[];
-            options?: google.protobuf.FileOptions$Properties;
-            sourceCodeInfo?: google.protobuf.SourceCodeInfo$Properties;
+            messageType?: google.protobuf.IDescriptorProto[];
+            enumType?: google.protobuf.IEnumDescriptorProto[];
+            service?: google.protobuf.IServiceDescriptorProto[];
+            extension?: google.protobuf.IFieldDescriptorProto[];
+            options?: google.protobuf.IFileOptions;
+            sourceCodeInfo?: google.protobuf.ISourceCodeInfo;
             syntax?: string;
-        };
+        }
 
         class FileDescriptorProto {
-            constructor(properties?: google.protobuf.FileDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IFileDescriptorProto);
             public name: string;
             public ["package"]: string;
             public dependency: string[];
             public publicDependency: number[];
             public weakDependency: number[];
-            public messageType: google.protobuf.DescriptorProto$Properties[];
-            public enumType: google.protobuf.EnumDescriptorProto$Properties[];
-            public service: google.protobuf.ServiceDescriptorProto$Properties[];
-            public extension: google.protobuf.FieldDescriptorProto$Properties[];
-            public options: (google.protobuf.FileOptions$Properties|null);
-            public sourceCodeInfo: (google.protobuf.SourceCodeInfo$Properties|null);
+            public messageType: google.protobuf.IDescriptorProto[];
+            public enumType: google.protobuf.IEnumDescriptorProto[];
+            public service: google.protobuf.IServiceDescriptorProto[];
+            public extension: google.protobuf.IFieldDescriptorProto[];
+            public options: (google.protobuf.IFileOptions|null);
+            public sourceCodeInfo: (google.protobuf.ISourceCodeInfo|null);
             public syntax: string;
-            public static create(properties?: google.protobuf.FileDescriptorProto$Properties): google.protobuf.FileDescriptorProto;
-            public static encode(message: google.protobuf.FileDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.FileDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto;
+            public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto;
-            public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type DescriptorProto$Properties = {
+        interface IDescriptorProto {
             name?: string;
-            field?: google.protobuf.FieldDescriptorProto$Properties[];
-            extension?: google.protobuf.FieldDescriptorProto$Properties[];
-            nestedType?: google.protobuf.DescriptorProto$Properties[];
-            enumType?: google.protobuf.EnumDescriptorProto$Properties[];
-            extensionRange?: google.protobuf.DescriptorProto.ExtensionRange$Properties[];
-            oneofDecl?: google.protobuf.OneofDescriptorProto$Properties[];
-            options?: google.protobuf.MessageOptions$Properties;
-            reservedRange?: google.protobuf.DescriptorProto.ReservedRange$Properties[];
+            field?: google.protobuf.IFieldDescriptorProto[];
+            extension?: google.protobuf.IFieldDescriptorProto[];
+            nestedType?: google.protobuf.IDescriptorProto[];
+            enumType?: google.protobuf.IEnumDescriptorProto[];
+            extensionRange?: google.protobuf.DescriptorProto.IExtensionRange[];
+            oneofDecl?: google.protobuf.IOneofDescriptorProto[];
+            options?: google.protobuf.IMessageOptions;
+            reservedRange?: google.protobuf.DescriptorProto.IReservedRange[];
             reservedName?: string[];
-        };
+        }
 
         class DescriptorProto {
-            constructor(properties?: google.protobuf.DescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IDescriptorProto);
             public name: string;
-            public field: google.protobuf.FieldDescriptorProto$Properties[];
-            public extension: google.protobuf.FieldDescriptorProto$Properties[];
-            public nestedType: google.protobuf.DescriptorProto$Properties[];
-            public enumType: google.protobuf.EnumDescriptorProto$Properties[];
-            public extensionRange: google.protobuf.DescriptorProto.ExtensionRange$Properties[];
-            public oneofDecl: google.protobuf.OneofDescriptorProto$Properties[];
-            public options: (google.protobuf.MessageOptions$Properties|null);
-            public reservedRange: google.protobuf.DescriptorProto.ReservedRange$Properties[];
+            public field: google.protobuf.IFieldDescriptorProto[];
+            public extension: google.protobuf.IFieldDescriptorProto[];
+            public nestedType: google.protobuf.IDescriptorProto[];
+            public enumType: google.protobuf.IEnumDescriptorProto[];
+            public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[];
+            public oneofDecl: google.protobuf.IOneofDescriptorProto[];
+            public options: (google.protobuf.IMessageOptions|null);
+            public reservedRange: google.protobuf.DescriptorProto.IReservedRange[];
             public reservedName: string[];
-            public static create(properties?: google.protobuf.DescriptorProto$Properties): google.protobuf.DescriptorProto;
-            public static encode(message: google.protobuf.DescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.DescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto;
+            public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto;
-            public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace DescriptorProto {
 
-            type ExtensionRange$Properties = {
+            interface IExtensionRange {
                 start?: number;
                 end?: number;
-            };
+            }
 
             class ExtensionRange {
-                constructor(properties?: google.protobuf.DescriptorProto.ExtensionRange$Properties);
+                constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange);
                 public start: number;
                 public end: number;
-                public static create(properties?: google.protobuf.DescriptorProto.ExtensionRange$Properties): google.protobuf.DescriptorProto.ExtensionRange;
-                public static encode(message: google.protobuf.DescriptorProto.ExtensionRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: google.protobuf.DescriptorProto.ExtensionRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange;
+                public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange;
-                public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
 
-            type ReservedRange$Properties = {
+            interface IReservedRange {
                 start?: number;
                 end?: number;
-            };
+            }
 
             class ReservedRange {
-                constructor(properties?: google.protobuf.DescriptorProto.ReservedRange$Properties);
+                constructor(properties?: google.protobuf.DescriptorProto.IReservedRange);
                 public start: number;
                 public end: number;
-                public static create(properties?: google.protobuf.DescriptorProto.ReservedRange$Properties): google.protobuf.DescriptorProto.ReservedRange;
-                public static encode(message: google.protobuf.DescriptorProto.ReservedRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: google.protobuf.DescriptorProto.ReservedRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange;
+                public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange;
-                public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type FieldDescriptorProto$Properties = {
+        interface IFieldDescriptorProto {
             name?: string;
             number?: number;
             label?: google.protobuf.FieldDescriptorProto.Label;
@@ -927,11 +933,11 @@ export namespace google {
             defaultValue?: string;
             oneofIndex?: number;
             jsonName?: string;
-            options?: google.protobuf.FieldOptions$Properties;
-        };
+            options?: google.protobuf.IFieldOptions;
+        }
 
         class FieldDescriptorProto {
-            constructor(properties?: google.protobuf.FieldDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IFieldDescriptorProto);
             public name: string;
             public number: number;
             public label: google.protobuf.FieldDescriptorProto.Label;
@@ -941,16 +947,16 @@ export namespace google {
             public defaultValue: string;
             public oneofIndex: number;
             public jsonName: string;
-            public options: (google.protobuf.FieldOptions$Properties|null);
-            public static create(properties?: google.protobuf.FieldDescriptorProto$Properties): google.protobuf.FieldDescriptorProto;
-            public static encode(message: google.protobuf.FieldDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.FieldDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public options: (google.protobuf.IFieldOptions|null);
+            public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto;
+            public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto;
-            public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -984,126 +990,126 @@ export namespace google {
             }
         }
 
-        type OneofDescriptorProto$Properties = {
+        interface IOneofDescriptorProto {
             name?: string;
-            options?: google.protobuf.OneofOptions$Properties;
-        };
+            options?: google.protobuf.IOneofOptions;
+        }
 
         class OneofDescriptorProto {
-            constructor(properties?: google.protobuf.OneofDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IOneofDescriptorProto);
             public name: string;
-            public options: (google.protobuf.OneofOptions$Properties|null);
-            public static create(properties?: google.protobuf.OneofDescriptorProto$Properties): google.protobuf.OneofDescriptorProto;
-            public static encode(message: google.protobuf.OneofDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.OneofDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public options: (google.protobuf.IOneofOptions|null);
+            public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto;
+            public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto;
-            public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type EnumDescriptorProto$Properties = {
+        interface IEnumDescriptorProto {
             name?: string;
-            value?: google.protobuf.EnumValueDescriptorProto$Properties[];
-            options?: google.protobuf.EnumOptions$Properties;
-        };
+            value?: google.protobuf.IEnumValueDescriptorProto[];
+            options?: google.protobuf.IEnumOptions;
+        }
 
         class EnumDescriptorProto {
-            constructor(properties?: google.protobuf.EnumDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IEnumDescriptorProto);
             public name: string;
-            public value: google.protobuf.EnumValueDescriptorProto$Properties[];
-            public options: (google.protobuf.EnumOptions$Properties|null);
-            public static create(properties?: google.protobuf.EnumDescriptorProto$Properties): google.protobuf.EnumDescriptorProto;
-            public static encode(message: google.protobuf.EnumDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.EnumDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public value: google.protobuf.IEnumValueDescriptorProto[];
+            public options: (google.protobuf.IEnumOptions|null);
+            public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto;
+            public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto;
-            public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type EnumValueDescriptorProto$Properties = {
+        interface IEnumValueDescriptorProto {
             name?: string;
             number?: number;
-            options?: google.protobuf.EnumValueOptions$Properties;
-        };
+            options?: google.protobuf.IEnumValueOptions;
+        }
 
         class EnumValueDescriptorProto {
-            constructor(properties?: google.protobuf.EnumValueDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IEnumValueDescriptorProto);
             public name: string;
             public number: number;
-            public options: (google.protobuf.EnumValueOptions$Properties|null);
-            public static create(properties?: google.protobuf.EnumValueDescriptorProto$Properties): google.protobuf.EnumValueDescriptorProto;
-            public static encode(message: google.protobuf.EnumValueDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.EnumValueDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public options: (google.protobuf.IEnumValueOptions|null);
+            public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto;
+            public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto;
-            public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type ServiceDescriptorProto$Properties = {
+        interface IServiceDescriptorProto {
             name?: string;
-            method?: google.protobuf.MethodDescriptorProto$Properties[];
-            options?: google.protobuf.ServiceOptions$Properties;
-        };
+            method?: google.protobuf.IMethodDescriptorProto[];
+            options?: google.protobuf.IServiceOptions;
+        }
 
         class ServiceDescriptorProto {
-            constructor(properties?: google.protobuf.ServiceDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IServiceDescriptorProto);
             public name: string;
-            public method: google.protobuf.MethodDescriptorProto$Properties[];
-            public options: (google.protobuf.ServiceOptions$Properties|null);
-            public static create(properties?: google.protobuf.ServiceDescriptorProto$Properties): google.protobuf.ServiceDescriptorProto;
-            public static encode(message: google.protobuf.ServiceDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.ServiceDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public method: google.protobuf.IMethodDescriptorProto[];
+            public options: (google.protobuf.IServiceOptions|null);
+            public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto;
+            public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto;
-            public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type MethodDescriptorProto$Properties = {
+        interface IMethodDescriptorProto {
             name?: string;
             inputType?: string;
             outputType?: string;
-            options?: google.protobuf.MethodOptions$Properties;
+            options?: google.protobuf.IMethodOptions;
             clientStreaming?: boolean;
             serverStreaming?: boolean;
-        };
+        }
 
         class MethodDescriptorProto {
-            constructor(properties?: google.protobuf.MethodDescriptorProto$Properties);
+            constructor(properties?: google.protobuf.IMethodDescriptorProto);
             public name: string;
             public inputType: string;
             public outputType: string;
-            public options: (google.protobuf.MethodOptions$Properties|null);
+            public options: (google.protobuf.IMethodOptions|null);
             public clientStreaming: boolean;
             public serverStreaming: boolean;
-            public static create(properties?: google.protobuf.MethodDescriptorProto$Properties): google.protobuf.MethodDescriptorProto;
-            public static encode(message: google.protobuf.MethodDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.MethodDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto;
+            public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto;
-            public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type FileOptions$Properties = {
+        interface IFileOptions {
             javaPackage?: string;
             javaOuterClassname?: string;
             javaMultipleFiles?: boolean;
@@ -1118,11 +1124,11 @@ export namespace google {
             ccEnableArenas?: boolean;
             objcClassPrefix?: string;
             csharpNamespace?: string;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class FileOptions {
-            constructor(properties?: google.protobuf.FileOptions$Properties);
+            constructor(properties?: google.protobuf.IFileOptions);
             public javaPackage: string;
             public javaOuterClassname: string;
             public javaMultipleFiles: boolean;
@@ -1137,16 +1143,16 @@ export namespace google {
             public ccEnableArenas: boolean;
             public objcClassPrefix: string;
             public csharpNamespace: string;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.FileOptions$Properties): google.protobuf.FileOptions;
-            public static encode(message: google.protobuf.FileOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.FileOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions;
+            public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions;
-            public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -1159,61 +1165,61 @@ export namespace google {
             }
         }
 
-        type MessageOptions$Properties = {
+        interface IMessageOptions {
             messageSetWireFormat?: boolean;
             noStandardDescriptorAccessor?: boolean;
             deprecated?: boolean;
             mapEntry?: boolean;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class MessageOptions {
-            constructor(properties?: google.protobuf.MessageOptions$Properties);
+            constructor(properties?: google.protobuf.IMessageOptions);
             public messageSetWireFormat: boolean;
             public noStandardDescriptorAccessor: boolean;
             public deprecated: boolean;
             public mapEntry: boolean;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.MessageOptions$Properties): google.protobuf.MessageOptions;
-            public static encode(message: google.protobuf.MessageOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.MessageOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions;
+            public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions;
-            public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type FieldOptions$Properties = {
+        interface IFieldOptions {
             ctype?: google.protobuf.FieldOptions.CType;
             packed?: boolean;
             jstype?: google.protobuf.FieldOptions.JSType;
             lazy?: boolean;
             deprecated?: boolean;
             weak?: boolean;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class FieldOptions {
-            constructor(properties?: google.protobuf.FieldOptions$Properties);
+            constructor(properties?: google.protobuf.IFieldOptions);
             public ctype: google.protobuf.FieldOptions.CType;
             public packed: boolean;
             public jstype: google.protobuf.FieldOptions.JSType;
             public lazy: boolean;
             public deprecated: boolean;
             public weak: boolean;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.FieldOptions$Properties): google.protobuf.FieldOptions;
-            public static encode(message: google.protobuf.FieldOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.FieldOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions;
+            public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions;
-            public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -1232,112 +1238,112 @@ export namespace google {
             }
         }
 
-        type OneofOptions$Properties = {
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+        interface IOneofOptions {
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class OneofOptions {
-            constructor(properties?: google.protobuf.OneofOptions$Properties);
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.OneofOptions$Properties): google.protobuf.OneofOptions;
-            public static encode(message: google.protobuf.OneofOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.OneofOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: google.protobuf.IOneofOptions);
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions;
+            public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions;
-            public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type EnumOptions$Properties = {
+        interface IEnumOptions {
             allowAlias?: boolean;
             deprecated?: boolean;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
             ".jspb.test.IsExtension.simpleOption"?: string;
-        };
+        }
 
         class EnumOptions {
-            constructor(properties?: google.protobuf.EnumOptions$Properties);
+            constructor(properties?: google.protobuf.IEnumOptions);
             public allowAlias: boolean;
             public deprecated: boolean;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
             public [".jspb.test.IsExtension.simpleOption"]: string;
-            public static create(properties?: google.protobuf.EnumOptions$Properties): google.protobuf.EnumOptions;
-            public static encode(message: google.protobuf.EnumOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.EnumOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions;
+            public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions;
-            public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type EnumValueOptions$Properties = {
+        interface IEnumValueOptions {
             deprecated?: boolean;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class EnumValueOptions {
-            constructor(properties?: google.protobuf.EnumValueOptions$Properties);
+            constructor(properties?: google.protobuf.IEnumValueOptions);
             public deprecated: boolean;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.EnumValueOptions$Properties): google.protobuf.EnumValueOptions;
-            public static encode(message: google.protobuf.EnumValueOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.EnumValueOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions;
+            public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions;
-            public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type ServiceOptions$Properties = {
+        interface IServiceOptions {
             deprecated?: boolean;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class ServiceOptions {
-            constructor(properties?: google.protobuf.ServiceOptions$Properties);
+            constructor(properties?: google.protobuf.IServiceOptions);
             public deprecated: boolean;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.ServiceOptions$Properties): google.protobuf.ServiceOptions;
-            public static encode(message: google.protobuf.ServiceOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.ServiceOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions;
+            public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions;
-            public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
-        type MethodOptions$Properties = {
+        interface IMethodOptions {
             deprecated?: boolean;
             idempotencyLevel?: google.protobuf.MethodOptions.IdempotencyLevel;
-            uninterpretedOption?: google.protobuf.UninterpretedOption$Properties[];
-        };
+            uninterpretedOption?: google.protobuf.IUninterpretedOption[];
+        }
 
         class MethodOptions {
-            constructor(properties?: google.protobuf.MethodOptions$Properties);
+            constructor(properties?: google.protobuf.IMethodOptions);
             public deprecated: boolean;
             public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel;
-            public uninterpretedOption: google.protobuf.UninterpretedOption$Properties[];
-            public static create(properties?: google.protobuf.MethodOptions$Properties): google.protobuf.MethodOptions;
-            public static encode(message: google.protobuf.MethodOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.MethodOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public uninterpretedOption: google.protobuf.IUninterpretedOption[];
+            public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions;
+            public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions;
-            public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
@@ -1350,153 +1356,153 @@ export namespace google {
             }
         }
 
-        type UninterpretedOption$Properties = {
-            name?: google.protobuf.UninterpretedOption.NamePart$Properties[];
+        interface IUninterpretedOption {
+            name?: google.protobuf.UninterpretedOption.INamePart[];
             identifierValue?: string;
             positiveIntValue?: (number|Long);
             negativeIntValue?: (number|Long);
             doubleValue?: number;
             stringValue?: Uint8Array;
             aggregateValue?: string;
-        };
+        }
 
         class UninterpretedOption {
-            constructor(properties?: google.protobuf.UninterpretedOption$Properties);
-            public name: google.protobuf.UninterpretedOption.NamePart$Properties[];
+            constructor(properties?: google.protobuf.IUninterpretedOption);
+            public name: google.protobuf.UninterpretedOption.INamePart[];
             public identifierValue: string;
             public positiveIntValue: (number|Long);
             public negativeIntValue: (number|Long);
             public doubleValue: number;
             public stringValue: Uint8Array;
             public aggregateValue: string;
-            public static create(properties?: google.protobuf.UninterpretedOption$Properties): google.protobuf.UninterpretedOption;
-            public static encode(message: google.protobuf.UninterpretedOption$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.UninterpretedOption$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption;
+            public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption;
-            public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace UninterpretedOption {
 
-            type NamePart$Properties = {
+            interface INamePart {
                 namePart: string;
                 isExtension: boolean;
-            };
+            }
 
             class NamePart {
-                constructor(properties?: google.protobuf.UninterpretedOption.NamePart$Properties);
+                constructor(properties?: google.protobuf.UninterpretedOption.INamePart);
                 public namePart: string;
                 public isExtension: boolean;
-                public static create(properties?: google.protobuf.UninterpretedOption.NamePart$Properties): google.protobuf.UninterpretedOption.NamePart;
-                public static encode(message: google.protobuf.UninterpretedOption.NamePart$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: google.protobuf.UninterpretedOption.NamePart$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart;
+                public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart;
-                public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type SourceCodeInfo$Properties = {
-            location?: google.protobuf.SourceCodeInfo.Location$Properties[];
-        };
+        interface ISourceCodeInfo {
+            location?: google.protobuf.SourceCodeInfo.ILocation[];
+        }
 
         class SourceCodeInfo {
-            constructor(properties?: google.protobuf.SourceCodeInfo$Properties);
-            public location: google.protobuf.SourceCodeInfo.Location$Properties[];
-            public static create(properties?: google.protobuf.SourceCodeInfo$Properties): google.protobuf.SourceCodeInfo;
-            public static encode(message: google.protobuf.SourceCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.SourceCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: google.protobuf.ISourceCodeInfo);
+            public location: google.protobuf.SourceCodeInfo.ILocation[];
+            public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo;
+            public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo;
-            public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace SourceCodeInfo {
 
-            type Location$Properties = {
+            interface ILocation {
                 path?: number[];
                 span?: number[];
                 leadingComments?: string;
                 trailingComments?: string;
                 leadingDetachedComments?: string[];
-            };
+            }
 
             class Location {
-                constructor(properties?: google.protobuf.SourceCodeInfo.Location$Properties);
+                constructor(properties?: google.protobuf.SourceCodeInfo.ILocation);
                 public path: number[];
                 public span: number[];
                 public leadingComments: string;
                 public trailingComments: string;
                 public leadingDetachedComments: string[];
-                public static create(properties?: google.protobuf.SourceCodeInfo.Location$Properties): google.protobuf.SourceCodeInfo.Location;
-                public static encode(message: google.protobuf.SourceCodeInfo.Location$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: google.protobuf.SourceCodeInfo.Location$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location;
+                public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location;
-                public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
 
-        type GeneratedCodeInfo$Properties = {
-            annotation?: google.protobuf.GeneratedCodeInfo.Annotation$Properties[];
-        };
+        interface IGeneratedCodeInfo {
+            annotation?: google.protobuf.GeneratedCodeInfo.IAnnotation[];
+        }
 
         class GeneratedCodeInfo {
-            constructor(properties?: google.protobuf.GeneratedCodeInfo$Properties);
-            public annotation: google.protobuf.GeneratedCodeInfo.Annotation$Properties[];
-            public static create(properties?: google.protobuf.GeneratedCodeInfo$Properties): google.protobuf.GeneratedCodeInfo;
-            public static encode(message: google.protobuf.GeneratedCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-            public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+            constructor(properties?: google.protobuf.IGeneratedCodeInfo);
+            public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[];
+            public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo;
+            public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer;
+            public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo;
             public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo;
             public static verify(message: { [k: string]: any }): string;
             public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo;
-            public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.ConversionOptions): { [k: string]: any };
-            public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+            public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any };
+            public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
             public toJSON(): { [k: string]: any };
         }
 
         namespace GeneratedCodeInfo {
 
-            type Annotation$Properties = {
+            interface IAnnotation {
                 path?: number[];
                 sourceFile?: string;
                 begin?: number;
                 end?: number;
-            };
+            }
 
             class Annotation {
-                constructor(properties?: google.protobuf.GeneratedCodeInfo.Annotation$Properties);
+                constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation);
                 public path: number[];
                 public sourceFile: string;
                 public begin: number;
                 public end: number;
-                public static create(properties?: google.protobuf.GeneratedCodeInfo.Annotation$Properties): google.protobuf.GeneratedCodeInfo.Annotation;
-                public static encode(message: google.protobuf.GeneratedCodeInfo.Annotation$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
-                public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.Annotation$Properties, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation;
+                public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer;
+                public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation;
                 public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation;
                 public static verify(message: { [k: string]: any }): string;
                 public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation;
-                public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.ConversionOptions): { [k: string]: any };
-                public toObject(options?: $protobuf.ConversionOptions): { [k: string]: any };
+                public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                public toObject(options?: $protobuf.IConversionOptions): { [k: string]: any };
                 public toJSON(): { [k: string]: any };
             }
         }
diff --git a/tests/data/test.js b/tests/data/test.js
index 53836f781..9770b085e 100644
--- a/tests/data/test.js
+++ b/tests/data/test.js
@@ -13,8 +13,8 @@ $root.jspb = (function() {
 
     /**
      * Namespace jspb.
-     * @exports jspb
      * @namespace
+     * @name jspb
      */
     var jspb = {};
 
@@ -22,8 +22,8 @@ $root.jspb = (function() {
 
         /**
          * Namespace test.
-         * @exports jspb.test
          * @namespace
+         * @memberof jspb
          */
         var test = {};
 
@@ -31,15 +31,15 @@ $root.jspb = (function() {
 
             /**
              * Properties of an Empty.
-             * @typedef jspb.test.Empty$Properties
-             * @type {Object}
+             * @interface IEmpty
+             * @memberof jspb.test
              */
 
             /**
              * Constructs a new Empty.
-             * @exports jspb.test.Empty
              * @constructor
-             * @param {jspb.test.Empty$Properties=} [properties] Properties to set
+             * @param {jspb.test.IEmpty=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function Empty(properties) {
                 if (properties)
@@ -50,7 +50,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Empty instance using the specified properties.
-             * @param {jspb.test.Empty$Properties=} [properties] Properties to set
+             * @param {jspb.test.IEmpty=} [properties] Properties to set
              * @returns {jspb.test.Empty} Empty instance
              */
             Empty.create = function create(properties) {
@@ -59,7 +59,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Empty message. Does not implicitly {@link jspb.test.Empty.verify|verify} messages.
-             * @param {jspb.test.Empty$Properties} message Empty message or plain object to encode
+             * @param {jspb.test.IEmpty} message Empty message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -71,7 +71,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Empty message, length delimited. Does not implicitly {@link jspb.test.Empty.verify|verify} messages.
-             * @param {jspb.test.Empty$Properties} message Empty message or plain object to encode
+             * @param {jspb.test.IEmpty} message Empty message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -140,7 +140,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an Empty message. Also converts values to other types if specified.
              * @param {jspb.test.Empty} message Empty
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Empty.toObject = function toObject() {
@@ -149,7 +149,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this Empty message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Empty.prototype.toObject = function toObject(options) {
@@ -170,8 +170,8 @@ $root.jspb = (function() {
         /**
          * OuterEnum enum.
          * @name OuterEnum
-         * @memberof jspb.test
          * @enum {number}
+         * @memberof jspb.test
          * @property {number} FOO=1 FOO value
          * @property {number} BAR=2 BAR value
          */
@@ -186,16 +186,16 @@ $root.jspb = (function() {
 
             /**
              * Properties of an EnumContainer.
-             * @typedef jspb.test.EnumContainer$Properties
-             * @type {Object}
+             * @interface IEnumContainer
+             * @memberof jspb.test
              * @property {jspb.test.OuterEnum} [outerEnum] EnumContainer outerEnum.
              */
 
             /**
              * Constructs a new EnumContainer.
-             * @exports jspb.test.EnumContainer
              * @constructor
-             * @param {jspb.test.EnumContainer$Properties=} [properties] Properties to set
+             * @param {jspb.test.IEnumContainer=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function EnumContainer(properties) {
                 if (properties)
@@ -212,7 +212,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new EnumContainer instance using the specified properties.
-             * @param {jspb.test.EnumContainer$Properties=} [properties] Properties to set
+             * @param {jspb.test.IEnumContainer=} [properties] Properties to set
              * @returns {jspb.test.EnumContainer} EnumContainer instance
              */
             EnumContainer.create = function create(properties) {
@@ -221,7 +221,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified EnumContainer message. Does not implicitly {@link jspb.test.EnumContainer.verify|verify} messages.
-             * @param {jspb.test.EnumContainer$Properties} message EnumContainer message or plain object to encode
+             * @param {jspb.test.IEnumContainer} message EnumContainer message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -235,7 +235,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified EnumContainer message, length delimited. Does not implicitly {@link jspb.test.EnumContainer.verify|verify} messages.
-             * @param {jspb.test.EnumContainer$Properties} message EnumContainer message or plain object to encode
+             * @param {jspb.test.IEnumContainer} message EnumContainer message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -326,7 +326,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an EnumContainer message. Also converts values to other types if specified.
              * @param {jspb.test.EnumContainer} message EnumContainer
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumContainer.toObject = function toObject(message, options) {
@@ -342,7 +342,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this EnumContainer message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumContainer.prototype.toObject = function toObject(options) {
@@ -364,8 +364,8 @@ $root.jspb = (function() {
 
             /**
              * Properties of a Simple1.
-             * @typedef jspb.test.Simple1$Properties
-             * @type {Object}
+             * @interface ISimple1
+             * @memberof jspb.test
              * @property {string} aString Simple1 aString.
              * @property {Array.<string>} [aRepeatedString] Simple1 aRepeatedString.
              * @property {boolean} [aBoolean] Simple1 aBoolean.
@@ -373,9 +373,9 @@ $root.jspb = (function() {
 
             /**
              * Constructs a new Simple1.
-             * @exports jspb.test.Simple1
              * @constructor
-             * @param {jspb.test.Simple1$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISimple1=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function Simple1(properties) {
                 this.aRepeatedString = [];
@@ -405,7 +405,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Simple1 instance using the specified properties.
-             * @param {jspb.test.Simple1$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISimple1=} [properties] Properties to set
              * @returns {jspb.test.Simple1} Simple1 instance
              */
             Simple1.create = function create(properties) {
@@ -414,7 +414,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Simple1 message. Does not implicitly {@link jspb.test.Simple1.verify|verify} messages.
-             * @param {jspb.test.Simple1$Properties} message Simple1 message or plain object to encode
+             * @param {jspb.test.ISimple1} message Simple1 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -432,7 +432,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Simple1 message, length delimited. Does not implicitly {@link jspb.test.Simple1.verify|verify} messages.
-             * @param {jspb.test.Simple1$Properties} message Simple1 message or plain object to encode
+             * @param {jspb.test.ISimple1} message Simple1 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -538,7 +538,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a Simple1 message. Also converts values to other types if specified.
              * @param {jspb.test.Simple1} message Simple1
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Simple1.toObject = function toObject(message, options) {
@@ -565,7 +565,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this Simple1 message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Simple1.prototype.toObject = function toObject(options) {
@@ -587,17 +587,17 @@ $root.jspb = (function() {
 
             /**
              * Properties of a Simple2.
-             * @typedef jspb.test.Simple2$Properties
-             * @type {Object}
+             * @interface ISimple2
+             * @memberof jspb.test
              * @property {string} aString Simple2 aString.
              * @property {Array.<string>} [aRepeatedString] Simple2 aRepeatedString.
              */
 
             /**
              * Constructs a new Simple2.
-             * @exports jspb.test.Simple2
              * @constructor
-             * @param {jspb.test.Simple2$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISimple2=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function Simple2(properties) {
                 this.aRepeatedString = [];
@@ -621,7 +621,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Simple2 instance using the specified properties.
-             * @param {jspb.test.Simple2$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISimple2=} [properties] Properties to set
              * @returns {jspb.test.Simple2} Simple2 instance
              */
             Simple2.create = function create(properties) {
@@ -630,7 +630,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Simple2 message. Does not implicitly {@link jspb.test.Simple2.verify|verify} messages.
-             * @param {jspb.test.Simple2$Properties} message Simple2 message or plain object to encode
+             * @param {jspb.test.ISimple2} message Simple2 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -646,7 +646,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Simple2 message, length delimited. Does not implicitly {@link jspb.test.Simple2.verify|verify} messages.
-             * @param {jspb.test.Simple2$Properties} message Simple2 message or plain object to encode
+             * @param {jspb.test.ISimple2} message Simple2 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -744,7 +744,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a Simple2 message. Also converts values to other types if specified.
              * @param {jspb.test.Simple2} message Simple2
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Simple2.toObject = function toObject(message, options) {
@@ -767,7 +767,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this Simple2 message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Simple2.prototype.toObject = function toObject(options) {
@@ -789,8 +789,8 @@ $root.jspb = (function() {
 
             /**
              * Properties of a SpecialCases.
-             * @typedef jspb.test.SpecialCases$Properties
-             * @type {Object}
+             * @interface ISpecialCases
+             * @memberof jspb.test
              * @property {string} normal SpecialCases normal.
              * @property {string} default SpecialCases default.
              * @property {string} function SpecialCases function.
@@ -799,9 +799,9 @@ $root.jspb = (function() {
 
             /**
              * Constructs a new SpecialCases.
-             * @exports jspb.test.SpecialCases
              * @constructor
-             * @param {jspb.test.SpecialCases$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISpecialCases=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function SpecialCases(properties) {
                 if (properties)
@@ -836,7 +836,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new SpecialCases instance using the specified properties.
-             * @param {jspb.test.SpecialCases$Properties=} [properties] Properties to set
+             * @param {jspb.test.ISpecialCases=} [properties] Properties to set
              * @returns {jspb.test.SpecialCases} SpecialCases instance
              */
             SpecialCases.create = function create(properties) {
@@ -845,7 +845,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified SpecialCases message. Does not implicitly {@link jspb.test.SpecialCases.verify|verify} messages.
-             * @param {jspb.test.SpecialCases$Properties} message SpecialCases message or plain object to encode
+             * @param {jspb.test.ISpecialCases} message SpecialCases message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -861,7 +861,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified SpecialCases message, length delimited. Does not implicitly {@link jspb.test.SpecialCases.verify|verify} messages.
-             * @param {jspb.test.SpecialCases$Properties} message SpecialCases message or plain object to encode
+             * @param {jspb.test.ISpecialCases} message SpecialCases message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -967,7 +967,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a SpecialCases message. Also converts values to other types if specified.
              * @param {jspb.test.SpecialCases} message SpecialCases
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             SpecialCases.toObject = function toObject(message, options) {
@@ -993,7 +993,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this SpecialCases message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             SpecialCases.prototype.toObject = function toObject(options) {
@@ -1015,20 +1015,20 @@ $root.jspb = (function() {
 
             /**
              * Properties of an OptionalFields.
-             * @typedef jspb.test.OptionalFields$Properties
-             * @type {Object}
+             * @interface IOptionalFields
+             * @memberof jspb.test
              * @property {string} [aString] OptionalFields aString.
              * @property {boolean} aBool OptionalFields aBool.
-             * @property {jspb.test.OptionalFields.Nested$Properties} [aNestedMessage] OptionalFields aNestedMessage.
-             * @property {Array.<jspb.test.OptionalFields.Nested$Properties>} [aRepeatedMessage] OptionalFields aRepeatedMessage.
+             * @property {jspb.test.OptionalFields.INested} [aNestedMessage] OptionalFields aNestedMessage.
+             * @property {Array.<jspb.test.OptionalFields.INested>} [aRepeatedMessage] OptionalFields aRepeatedMessage.
              * @property {Array.<string>} [aRepeatedString] OptionalFields aRepeatedString.
              */
 
             /**
              * Constructs a new OptionalFields.
-             * @exports jspb.test.OptionalFields
              * @constructor
-             * @param {jspb.test.OptionalFields$Properties=} [properties] Properties to set
+             * @param {jspb.test.IOptionalFields=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function OptionalFields(properties) {
                 this.aRepeatedMessage = [];
@@ -1053,13 +1053,13 @@ $root.jspb = (function() {
 
             /**
              * OptionalFields aNestedMessage.
-             * @type {(jspb.test.OptionalFields.Nested$Properties|null)}
+             * @type {(jspb.test.OptionalFields.INested|null)}
              */
             OptionalFields.prototype.aNestedMessage = null;
 
             /**
              * OptionalFields aRepeatedMessage.
-             * @type {Array.<jspb.test.OptionalFields.Nested$Properties>}
+             * @type {Array.<jspb.test.OptionalFields.INested>}
              */
             OptionalFields.prototype.aRepeatedMessage = $util.emptyArray;
 
@@ -1071,7 +1071,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new OptionalFields instance using the specified properties.
-             * @param {jspb.test.OptionalFields$Properties=} [properties] Properties to set
+             * @param {jspb.test.IOptionalFields=} [properties] Properties to set
              * @returns {jspb.test.OptionalFields} OptionalFields instance
              */
             OptionalFields.create = function create(properties) {
@@ -1080,7 +1080,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified OptionalFields message. Does not implicitly {@link jspb.test.OptionalFields.verify|verify} messages.
-             * @param {jspb.test.OptionalFields$Properties} message OptionalFields message or plain object to encode
+             * @param {jspb.test.IOptionalFields} message OptionalFields message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1103,7 +1103,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified OptionalFields message, length delimited. Does not implicitly {@link jspb.test.OptionalFields.verify|verify} messages.
-             * @param {jspb.test.OptionalFields$Properties} message OptionalFields message or plain object to encode
+             * @param {jspb.test.IOptionalFields} message OptionalFields message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1246,7 +1246,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an OptionalFields message. Also converts values to other types if specified.
              * @param {jspb.test.OptionalFields} message OptionalFields
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OptionalFields.toObject = function toObject(message, options) {
@@ -1283,7 +1283,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this OptionalFields message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OptionalFields.prototype.toObject = function toObject(options) {
@@ -1302,16 +1302,16 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a Nested.
-                 * @typedef jspb.test.OptionalFields.Nested$Properties
-                 * @type {Object}
+                 * @interface INested
+                 * @memberof jspb.test.OptionalFields
                  * @property {number} [anInt] Nested anInt.
                  */
 
                 /**
                  * Constructs a new Nested.
-                 * @exports jspb.test.OptionalFields.Nested
                  * @constructor
-                 * @param {jspb.test.OptionalFields.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.OptionalFields.INested=} [properties] Properties to set
+                 * @memberof jspb.test.OptionalFields
                  */
                 function Nested(properties) {
                     if (properties)
@@ -1328,7 +1328,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {jspb.test.OptionalFields.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.OptionalFields.INested=} [properties] Properties to set
                  * @returns {jspb.test.OptionalFields.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -1337,7 +1337,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message. Does not implicitly {@link jspb.test.OptionalFields.Nested.verify|verify} messages.
-                 * @param {jspb.test.OptionalFields.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.OptionalFields.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -1351,7 +1351,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.OptionalFields.Nested.verify|verify} messages.
-                 * @param {jspb.test.OptionalFields.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.OptionalFields.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -1429,7 +1429,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a Nested message. Also converts values to other types if specified.
                  * @param {jspb.test.OptionalFields.Nested} message Nested
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.toObject = function toObject(message, options) {
@@ -1445,7 +1445,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this Nested message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.prototype.toObject = function toObject(options) {
@@ -1470,24 +1470,24 @@ $root.jspb = (function() {
 
             /**
              * Properties of a HasExtensions.
-             * @typedef jspb.test.HasExtensions$Properties
-             * @type {Object}
+             * @interface IHasExtensions
+             * @memberof jspb.test
              * @property {string} [str1] HasExtensions str1.
              * @property {string} [str2] HasExtensions str2.
              * @property {string} [str3] HasExtensions str3.
-             * @property {jspb.test.IsExtension$Properties} [".jspb.test.IsExtension.extField"] HasExtensions .jspb.test.IsExtension.extField.
-             * @property {jspb.test.Simple1$Properties} [".jspb.test.IndirectExtension.simple"] HasExtensions .jspb.test.IndirectExtension.simple.
+             * @property {jspb.test.IIsExtension} [".jspb.test.IsExtension.extField"] HasExtensions .jspb.test.IsExtension.extField.
+             * @property {jspb.test.ISimple1} [".jspb.test.IndirectExtension.simple"] HasExtensions .jspb.test.IndirectExtension.simple.
              * @property {string} [".jspb.test.IndirectExtension.str"] HasExtensions .jspb.test.IndirectExtension.str.
              * @property {Array.<string>} [".jspb.test.IndirectExtension.repeatedStr"] HasExtensions .jspb.test.IndirectExtension.repeatedStr.
-             * @property {Array.<jspb.test.Simple1$Properties>} [".jspb.test.IndirectExtension.repeatedSimple"] HasExtensions .jspb.test.IndirectExtension.repeatedSimple.
-             * @property {jspb.test.Simple1$Properties} [".jspb.test.simple1"] HasExtensions .jspb.test.simple1.
+             * @property {Array.<jspb.test.ISimple1>} [".jspb.test.IndirectExtension.repeatedSimple"] HasExtensions .jspb.test.IndirectExtension.repeatedSimple.
+             * @property {jspb.test.ISimple1} [".jspb.test.simple1"] HasExtensions .jspb.test.simple1.
              */
 
             /**
              * Constructs a new HasExtensions.
-             * @exports jspb.test.HasExtensions
              * @constructor
-             * @param {jspb.test.HasExtensions$Properties=} [properties] Properties to set
+             * @param {jspb.test.IHasExtensions=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function HasExtensions(properties) {
                 this[".jspb.test.IndirectExtension.repeatedStr"] = [];
@@ -1518,13 +1518,13 @@ $root.jspb = (function() {
 
             /**
              * HasExtensions .jspb.test.IsExtension.extField.
-             * @type {(jspb.test.IsExtension$Properties|null)}
+             * @type {(jspb.test.IIsExtension|null)}
              */
             HasExtensions.prototype[".jspb.test.IsExtension.extField"] = null;
 
             /**
              * HasExtensions .jspb.test.IndirectExtension.simple.
-             * @type {(jspb.test.Simple1$Properties|null)}
+             * @type {(jspb.test.ISimple1|null)}
              */
             HasExtensions.prototype[".jspb.test.IndirectExtension.simple"] = null;
 
@@ -1542,19 +1542,19 @@ $root.jspb = (function() {
 
             /**
              * HasExtensions .jspb.test.IndirectExtension.repeatedSimple.
-             * @type {Array.<jspb.test.Simple1$Properties>}
+             * @type {Array.<jspb.test.ISimple1>}
              */
             HasExtensions.prototype[".jspb.test.IndirectExtension.repeatedSimple"] = $util.emptyArray;
 
             /**
              * HasExtensions .jspb.test.simple1.
-             * @type {(jspb.test.Simple1$Properties|null)}
+             * @type {(jspb.test.ISimple1|null)}
              */
             HasExtensions.prototype[".jspb.test.simple1"] = null;
 
             /**
              * Creates a new HasExtensions instance using the specified properties.
-             * @param {jspb.test.HasExtensions$Properties=} [properties] Properties to set
+             * @param {jspb.test.IHasExtensions=} [properties] Properties to set
              * @returns {jspb.test.HasExtensions} HasExtensions instance
              */
             HasExtensions.create = function create(properties) {
@@ -1563,7 +1563,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified HasExtensions message. Does not implicitly {@link jspb.test.HasExtensions.verify|verify} messages.
-             * @param {jspb.test.HasExtensions$Properties} message HasExtensions message or plain object to encode
+             * @param {jspb.test.IHasExtensions} message HasExtensions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1595,7 +1595,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified HasExtensions message, length delimited. Does not implicitly {@link jspb.test.HasExtensions.verify|verify} messages.
-             * @param {jspb.test.HasExtensions$Properties} message HasExtensions message or plain object to encode
+             * @param {jspb.test.IHasExtensions} message HasExtensions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1779,7 +1779,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a HasExtensions message. Also converts values to other types if specified.
              * @param {jspb.test.HasExtensions} message HasExtensions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             HasExtensions.toObject = function toObject(message, options) {
@@ -1828,7 +1828,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this HasExtensions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             HasExtensions.prototype.toObject = function toObject(options) {
@@ -1850,20 +1850,20 @@ $root.jspb = (function() {
 
             /**
              * Properties of a Complex.
-             * @typedef jspb.test.Complex$Properties
-             * @type {Object}
+             * @interface IComplex
+             * @memberof jspb.test
              * @property {string} aString Complex aString.
              * @property {boolean} anOutOfOrderBool Complex anOutOfOrderBool.
-             * @property {jspb.test.Complex.Nested$Properties} [aNestedMessage] Complex aNestedMessage.
-             * @property {Array.<jspb.test.Complex.Nested$Properties>} [aRepeatedMessage] Complex aRepeatedMessage.
+             * @property {jspb.test.Complex.INested} [aNestedMessage] Complex aNestedMessage.
+             * @property {Array.<jspb.test.Complex.INested>} [aRepeatedMessage] Complex aRepeatedMessage.
              * @property {Array.<string>} [aRepeatedString] Complex aRepeatedString.
              */
 
             /**
              * Constructs a new Complex.
-             * @exports jspb.test.Complex
              * @constructor
-             * @param {jspb.test.Complex$Properties=} [properties] Properties to set
+             * @param {jspb.test.IComplex=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function Complex(properties) {
                 this.aRepeatedMessage = [];
@@ -1888,13 +1888,13 @@ $root.jspb = (function() {
 
             /**
              * Complex aNestedMessage.
-             * @type {(jspb.test.Complex.Nested$Properties|null)}
+             * @type {(jspb.test.Complex.INested|null)}
              */
             Complex.prototype.aNestedMessage = null;
 
             /**
              * Complex aRepeatedMessage.
-             * @type {Array.<jspb.test.Complex.Nested$Properties>}
+             * @type {Array.<jspb.test.Complex.INested>}
              */
             Complex.prototype.aRepeatedMessage = $util.emptyArray;
 
@@ -1906,7 +1906,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Complex instance using the specified properties.
-             * @param {jspb.test.Complex$Properties=} [properties] Properties to set
+             * @param {jspb.test.IComplex=} [properties] Properties to set
              * @returns {jspb.test.Complex} Complex instance
              */
             Complex.create = function create(properties) {
@@ -1915,7 +1915,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Complex message. Does not implicitly {@link jspb.test.Complex.verify|verify} messages.
-             * @param {jspb.test.Complex$Properties} message Complex message or plain object to encode
+             * @param {jspb.test.IComplex} message Complex message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -1937,7 +1937,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Complex message, length delimited. Does not implicitly {@link jspb.test.Complex.verify|verify} messages.
-             * @param {jspb.test.Complex$Properties} message Complex message or plain object to encode
+             * @param {jspb.test.IComplex} message Complex message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2081,7 +2081,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a Complex message. Also converts values to other types if specified.
              * @param {jspb.test.Complex} message Complex
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Complex.toObject = function toObject(message, options) {
@@ -2118,7 +2118,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this Complex message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Complex.prototype.toObject = function toObject(options) {
@@ -2137,16 +2137,16 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a Nested.
-                 * @typedef jspb.test.Complex.Nested$Properties
-                 * @type {Object}
+                 * @interface INested
+                 * @memberof jspb.test.Complex
                  * @property {number} anInt Nested anInt.
                  */
 
                 /**
                  * Constructs a new Nested.
-                 * @exports jspb.test.Complex.Nested
                  * @constructor
-                 * @param {jspb.test.Complex.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.Complex.INested=} [properties] Properties to set
+                 * @memberof jspb.test.Complex
                  */
                 function Nested(properties) {
                     if (properties)
@@ -2163,7 +2163,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {jspb.test.Complex.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.Complex.INested=} [properties] Properties to set
                  * @returns {jspb.test.Complex.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -2172,7 +2172,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message. Does not implicitly {@link jspb.test.Complex.Nested.verify|verify} messages.
-                 * @param {jspb.test.Complex.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.Complex.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -2185,7 +2185,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.Complex.Nested.verify|verify} messages.
-                 * @param {jspb.test.Complex.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.Complex.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -2264,7 +2264,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a Nested message. Also converts values to other types if specified.
                  * @param {jspb.test.Complex.Nested} message Nested
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.toObject = function toObject(message, options) {
@@ -2280,7 +2280,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this Nested message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.prototype.toObject = function toObject(options) {
@@ -2305,15 +2305,15 @@ $root.jspb = (function() {
 
             /**
              * Properties of an OuterMessage.
-             * @typedef jspb.test.OuterMessage$Properties
-             * @type {Object}
+             * @interface IOuterMessage
+             * @memberof jspb.test
              */
 
             /**
              * Constructs a new OuterMessage.
-             * @exports jspb.test.OuterMessage
              * @constructor
-             * @param {jspb.test.OuterMessage$Properties=} [properties] Properties to set
+             * @param {jspb.test.IOuterMessage=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function OuterMessage(properties) {
                 if (properties)
@@ -2324,7 +2324,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new OuterMessage instance using the specified properties.
-             * @param {jspb.test.OuterMessage$Properties=} [properties] Properties to set
+             * @param {jspb.test.IOuterMessage=} [properties] Properties to set
              * @returns {jspb.test.OuterMessage} OuterMessage instance
              */
             OuterMessage.create = function create(properties) {
@@ -2333,7 +2333,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified OuterMessage message. Does not implicitly {@link jspb.test.OuterMessage.verify|verify} messages.
-             * @param {jspb.test.OuterMessage$Properties} message OuterMessage message or plain object to encode
+             * @param {jspb.test.IOuterMessage} message OuterMessage message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2345,7 +2345,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified OuterMessage message, length delimited. Does not implicitly {@link jspb.test.OuterMessage.verify|verify} messages.
-             * @param {jspb.test.OuterMessage$Properties} message OuterMessage message or plain object to encode
+             * @param {jspb.test.IOuterMessage} message OuterMessage message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2414,7 +2414,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an OuterMessage message. Also converts values to other types if specified.
              * @param {jspb.test.OuterMessage} message OuterMessage
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OuterMessage.toObject = function toObject() {
@@ -2423,7 +2423,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this OuterMessage message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OuterMessage.prototype.toObject = function toObject(options) {
@@ -2442,16 +2442,16 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a Complex.
-                 * @typedef jspb.test.OuterMessage.Complex$Properties
-                 * @type {Object}
+                 * @interface IComplex
+                 * @memberof jspb.test.OuterMessage
                  * @property {number} [innerComplexField] Complex innerComplexField.
                  */
 
                 /**
                  * Constructs a new Complex.
-                 * @exports jspb.test.OuterMessage.Complex
                  * @constructor
-                 * @param {jspb.test.OuterMessage.Complex$Properties=} [properties] Properties to set
+                 * @param {jspb.test.OuterMessage.IComplex=} [properties] Properties to set
+                 * @memberof jspb.test.OuterMessage
                  */
                 function Complex(properties) {
                     if (properties)
@@ -2468,7 +2468,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Complex instance using the specified properties.
-                 * @param {jspb.test.OuterMessage.Complex$Properties=} [properties] Properties to set
+                 * @param {jspb.test.OuterMessage.IComplex=} [properties] Properties to set
                  * @returns {jspb.test.OuterMessage.Complex} Complex instance
                  */
                 Complex.create = function create(properties) {
@@ -2477,7 +2477,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Complex message. Does not implicitly {@link jspb.test.OuterMessage.Complex.verify|verify} messages.
-                 * @param {jspb.test.OuterMessage.Complex$Properties} message Complex message or plain object to encode
+                 * @param {jspb.test.OuterMessage.IComplex} message Complex message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -2491,7 +2491,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Complex message, length delimited. Does not implicitly {@link jspb.test.OuterMessage.Complex.verify|verify} messages.
-                 * @param {jspb.test.OuterMessage.Complex$Properties} message Complex message or plain object to encode
+                 * @param {jspb.test.OuterMessage.IComplex} message Complex message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -2569,7 +2569,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a Complex message. Also converts values to other types if specified.
                  * @param {jspb.test.OuterMessage.Complex} message Complex
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Complex.toObject = function toObject(message, options) {
@@ -2585,7 +2585,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this Complex message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Complex.prototype.toObject = function toObject(options) {
@@ -2610,16 +2610,16 @@ $root.jspb = (function() {
 
             /**
              * Properties of an IsExtension.
-             * @typedef jspb.test.IsExtension$Properties
-             * @type {Object}
+             * @interface IIsExtension
+             * @memberof jspb.test
              * @property {string} [ext1] IsExtension ext1.
              */
 
             /**
              * Constructs a new IsExtension.
-             * @exports jspb.test.IsExtension
              * @constructor
-             * @param {jspb.test.IsExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.IIsExtension=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function IsExtension(properties) {
                 if (properties)
@@ -2636,7 +2636,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new IsExtension instance using the specified properties.
-             * @param {jspb.test.IsExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.IIsExtension=} [properties] Properties to set
              * @returns {jspb.test.IsExtension} IsExtension instance
              */
             IsExtension.create = function create(properties) {
@@ -2645,7 +2645,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified IsExtension message. Does not implicitly {@link jspb.test.IsExtension.verify|verify} messages.
-             * @param {jspb.test.IsExtension$Properties} message IsExtension message or plain object to encode
+             * @param {jspb.test.IIsExtension} message IsExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2659,7 +2659,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified IsExtension message, length delimited. Does not implicitly {@link jspb.test.IsExtension.verify|verify} messages.
-             * @param {jspb.test.IsExtension$Properties} message IsExtension message or plain object to encode
+             * @param {jspb.test.IIsExtension} message IsExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2737,7 +2737,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an IsExtension message. Also converts values to other types if specified.
              * @param {jspb.test.IsExtension} message IsExtension
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             IsExtension.toObject = function toObject(message, options) {
@@ -2753,7 +2753,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this IsExtension message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             IsExtension.prototype.toObject = function toObject(options) {
@@ -2775,15 +2775,15 @@ $root.jspb = (function() {
 
             /**
              * Properties of an IndirectExtension.
-             * @typedef jspb.test.IndirectExtension$Properties
-             * @type {Object}
+             * @interface IIndirectExtension
+             * @memberof jspb.test
              */
 
             /**
              * Constructs a new IndirectExtension.
-             * @exports jspb.test.IndirectExtension
              * @constructor
-             * @param {jspb.test.IndirectExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.IIndirectExtension=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function IndirectExtension(properties) {
                 if (properties)
@@ -2794,7 +2794,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new IndirectExtension instance using the specified properties.
-             * @param {jspb.test.IndirectExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.IIndirectExtension=} [properties] Properties to set
              * @returns {jspb.test.IndirectExtension} IndirectExtension instance
              */
             IndirectExtension.create = function create(properties) {
@@ -2803,7 +2803,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified IndirectExtension message. Does not implicitly {@link jspb.test.IndirectExtension.verify|verify} messages.
-             * @param {jspb.test.IndirectExtension$Properties} message IndirectExtension message or plain object to encode
+             * @param {jspb.test.IIndirectExtension} message IndirectExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2815,7 +2815,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified IndirectExtension message, length delimited. Does not implicitly {@link jspb.test.IndirectExtension.verify|verify} messages.
-             * @param {jspb.test.IndirectExtension$Properties} message IndirectExtension message or plain object to encode
+             * @param {jspb.test.IIndirectExtension} message IndirectExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -2884,7 +2884,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from an IndirectExtension message. Also converts values to other types if specified.
              * @param {jspb.test.IndirectExtension} message IndirectExtension
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             IndirectExtension.toObject = function toObject() {
@@ -2893,7 +2893,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this IndirectExtension message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             IndirectExtension.prototype.toObject = function toObject(options) {
@@ -2915,8 +2915,8 @@ $root.jspb = (function() {
 
             /**
              * Properties of a DefaultValues.
-             * @typedef jspb.test.DefaultValues$Properties
-             * @type {Object}
+             * @interface IDefaultValues
+             * @memberof jspb.test
              * @property {string} [stringField] DefaultValues stringField.
              * @property {boolean} [boolField] DefaultValues boolField.
              * @property {number|Long} [intField] DefaultValues intField.
@@ -2927,9 +2927,9 @@ $root.jspb = (function() {
 
             /**
              * Constructs a new DefaultValues.
-             * @exports jspb.test.DefaultValues
              * @constructor
-             * @param {jspb.test.DefaultValues$Properties=} [properties] Properties to set
+             * @param {jspb.test.IDefaultValues=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function DefaultValues(properties) {
                 if (properties)
@@ -2976,7 +2976,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new DefaultValues instance using the specified properties.
-             * @param {jspb.test.DefaultValues$Properties=} [properties] Properties to set
+             * @param {jspb.test.IDefaultValues=} [properties] Properties to set
              * @returns {jspb.test.DefaultValues} DefaultValues instance
              */
             DefaultValues.create = function create(properties) {
@@ -2985,7 +2985,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified DefaultValues message. Does not implicitly {@link jspb.test.DefaultValues.verify|verify} messages.
-             * @param {jspb.test.DefaultValues$Properties} message DefaultValues message or plain object to encode
+             * @param {jspb.test.IDefaultValues} message DefaultValues message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3009,7 +3009,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified DefaultValues message, length delimited. Does not implicitly {@link jspb.test.DefaultValues.verify|verify} messages.
-             * @param {jspb.test.DefaultValues$Properties} message DefaultValues message or plain object to encode
+             * @param {jspb.test.IDefaultValues} message DefaultValues message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3150,7 +3150,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a DefaultValues message. Also converts values to other types if specified.
              * @param {jspb.test.DefaultValues} message DefaultValues
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             DefaultValues.toObject = function toObject(message, options) {
@@ -3193,7 +3193,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this DefaultValues message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             DefaultValues.prototype.toObject = function toObject(options) {
@@ -3211,8 +3211,8 @@ $root.jspb = (function() {
             /**
              * Enum enum.
              * @name Enum
-             * @memberof jspb.test.DefaultValues
              * @enum {number}
+             * @memberof jspb.test.DefaultValues
              * @property {number} E1=13 E1 value
              * @property {number} E2=77 E2 value
              */
@@ -3230,8 +3230,8 @@ $root.jspb = (function() {
 
             /**
              * Properties of a FloatingPointFields.
-             * @typedef jspb.test.FloatingPointFields$Properties
-             * @type {Object}
+             * @interface IFloatingPointFields
+             * @memberof jspb.test
              * @property {number} [optionalFloatField] FloatingPointFields optionalFloatField.
              * @property {number} requiredFloatField FloatingPointFields requiredFloatField.
              * @property {Array.<number>} [repeatedFloatField] FloatingPointFields repeatedFloatField.
@@ -3244,9 +3244,9 @@ $root.jspb = (function() {
 
             /**
              * Constructs a new FloatingPointFields.
-             * @exports jspb.test.FloatingPointFields
              * @constructor
-             * @param {jspb.test.FloatingPointFields$Properties=} [properties] Properties to set
+             * @param {jspb.test.IFloatingPointFields=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function FloatingPointFields(properties) {
                 this.repeatedFloatField = [];
@@ -3307,7 +3307,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new FloatingPointFields instance using the specified properties.
-             * @param {jspb.test.FloatingPointFields$Properties=} [properties] Properties to set
+             * @param {jspb.test.IFloatingPointFields=} [properties] Properties to set
              * @returns {jspb.test.FloatingPointFields} FloatingPointFields instance
              */
             FloatingPointFields.create = function create(properties) {
@@ -3316,7 +3316,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified FloatingPointFields message. Does not implicitly {@link jspb.test.FloatingPointFields.verify|verify} messages.
-             * @param {jspb.test.FloatingPointFields$Properties} message FloatingPointFields message or plain object to encode
+             * @param {jspb.test.IFloatingPointFields} message FloatingPointFields message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3344,7 +3344,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified FloatingPointFields message, length delimited. Does not implicitly {@link jspb.test.FloatingPointFields.verify|verify} messages.
-             * @param {jspb.test.FloatingPointFields$Properties} message FloatingPointFields message or plain object to encode
+             * @param {jspb.test.IFloatingPointFields} message FloatingPointFields message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3512,7 +3512,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a FloatingPointFields message. Also converts values to other types if specified.
              * @param {jspb.test.FloatingPointFields} message FloatingPointFields
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FloatingPointFields.toObject = function toObject(message, options) {
@@ -3558,7 +3558,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this FloatingPointFields message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FloatingPointFields.prototype.toObject = function toObject(options) {
@@ -3580,21 +3580,21 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestClone.
-             * @typedef jspb.test.TestClone$Properties
-             * @type {Object}
+             * @interface ITestClone
+             * @memberof jspb.test
              * @property {string} [str] TestClone str.
-             * @property {jspb.test.Simple1$Properties} [simple1] TestClone simple1.
-             * @property {Array.<jspb.test.Simple1$Properties>} [simple2] TestClone simple2.
+             * @property {jspb.test.ISimple1} [simple1] TestClone simple1.
+             * @property {Array.<jspb.test.ISimple1>} [simple2] TestClone simple2.
              * @property {Uint8Array} [bytesField] TestClone bytesField.
              * @property {string} [unused] TestClone unused.
-             * @property {jspb.test.CloneExtension$Properties} [".jspb.test.CloneExtension.extField"] TestClone .jspb.test.CloneExtension.extField.
+             * @property {jspb.test.ICloneExtension} [".jspb.test.CloneExtension.extField"] TestClone .jspb.test.CloneExtension.extField.
              */
 
             /**
              * Constructs a new TestClone.
-             * @exports jspb.test.TestClone
              * @constructor
-             * @param {jspb.test.TestClone$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestClone=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestClone(properties) {
                 this.simple2 = [];
@@ -3612,13 +3612,13 @@ $root.jspb = (function() {
 
             /**
              * TestClone simple1.
-             * @type {(jspb.test.Simple1$Properties|null)}
+             * @type {(jspb.test.ISimple1|null)}
              */
             TestClone.prototype.simple1 = null;
 
             /**
              * TestClone simple2.
-             * @type {Array.<jspb.test.Simple1$Properties>}
+             * @type {Array.<jspb.test.ISimple1>}
              */
             TestClone.prototype.simple2 = $util.emptyArray;
 
@@ -3636,13 +3636,13 @@ $root.jspb = (function() {
 
             /**
              * TestClone .jspb.test.CloneExtension.extField.
-             * @type {(jspb.test.CloneExtension$Properties|null)}
+             * @type {(jspb.test.ICloneExtension|null)}
              */
             TestClone.prototype[".jspb.test.CloneExtension.extField"] = null;
 
             /**
              * Creates a new TestClone instance using the specified properties.
-             * @param {jspb.test.TestClone$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestClone=} [properties] Properties to set
              * @returns {jspb.test.TestClone} TestClone instance
              */
             TestClone.create = function create(properties) {
@@ -3651,7 +3651,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestClone message. Does not implicitly {@link jspb.test.TestClone.verify|verify} messages.
-             * @param {jspb.test.TestClone$Properties} message TestClone message or plain object to encode
+             * @param {jspb.test.ITestClone} message TestClone message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3676,7 +3676,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestClone message, length delimited. Does not implicitly {@link jspb.test.TestClone.verify|verify} messages.
-             * @param {jspb.test.TestClone$Properties} message TestClone message or plain object to encode
+             * @param {jspb.test.ITestClone} message TestClone message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3823,7 +3823,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestClone message. Also converts values to other types if specified.
              * @param {jspb.test.TestClone} message TestClone
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestClone.toObject = function toObject(message, options) {
@@ -3859,7 +3859,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestClone message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestClone.prototype.toObject = function toObject(options) {
@@ -3881,16 +3881,16 @@ $root.jspb = (function() {
 
             /**
              * Properties of a CloneExtension.
-             * @typedef jspb.test.CloneExtension$Properties
-             * @type {Object}
+             * @interface ICloneExtension
+             * @memberof jspb.test
              * @property {string} [ext] CloneExtension ext.
              */
 
             /**
              * Constructs a new CloneExtension.
-             * @exports jspb.test.CloneExtension
              * @constructor
-             * @param {jspb.test.CloneExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.ICloneExtension=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function CloneExtension(properties) {
                 if (properties)
@@ -3907,7 +3907,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new CloneExtension instance using the specified properties.
-             * @param {jspb.test.CloneExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.ICloneExtension=} [properties] Properties to set
              * @returns {jspb.test.CloneExtension} CloneExtension instance
              */
             CloneExtension.create = function create(properties) {
@@ -3916,7 +3916,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified CloneExtension message. Does not implicitly {@link jspb.test.CloneExtension.verify|verify} messages.
-             * @param {jspb.test.CloneExtension$Properties} message CloneExtension message or plain object to encode
+             * @param {jspb.test.ICloneExtension} message CloneExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -3930,7 +3930,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified CloneExtension message, length delimited. Does not implicitly {@link jspb.test.CloneExtension.verify|verify} messages.
-             * @param {jspb.test.CloneExtension$Properties} message CloneExtension message or plain object to encode
+             * @param {jspb.test.ICloneExtension} message CloneExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -4008,7 +4008,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a CloneExtension message. Also converts values to other types if specified.
              * @param {jspb.test.CloneExtension} message CloneExtension
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             CloneExtension.toObject = function toObject(message, options) {
@@ -4024,7 +4024,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this CloneExtension message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             CloneExtension.prototype.toObject = function toObject(options) {
@@ -4046,21 +4046,21 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestGroup.
-             * @typedef jspb.test.TestGroup$Properties
-             * @type {Object}
-             * @property {Array.<jspb.test.TestGroup.RepeatedGroup$Properties>} [repeatedGroup] TestGroup repeatedGroup.
-             * @property {jspb.test.TestGroup.RequiredGroup$Properties} requiredGroup TestGroup requiredGroup.
-             * @property {jspb.test.TestGroup.OptionalGroup$Properties} [optionalGroup] TestGroup optionalGroup.
+             * @interface ITestGroup
+             * @memberof jspb.test
+             * @property {Array.<jspb.test.TestGroup.IRepeatedGroup>} [repeatedGroup] TestGroup repeatedGroup.
+             * @property {jspb.test.TestGroup.IRequiredGroup} requiredGroup TestGroup requiredGroup.
+             * @property {jspb.test.TestGroup.IOptionalGroup} [optionalGroup] TestGroup optionalGroup.
              * @property {string} [id] TestGroup id.
-             * @property {jspb.test.Simple2$Properties} requiredSimple TestGroup requiredSimple.
-             * @property {jspb.test.Simple2$Properties} [optionalSimple] TestGroup optionalSimple.
+             * @property {jspb.test.ISimple2} requiredSimple TestGroup requiredSimple.
+             * @property {jspb.test.ISimple2} [optionalSimple] TestGroup optionalSimple.
              */
 
             /**
              * Constructs a new TestGroup.
-             * @exports jspb.test.TestGroup
              * @constructor
-             * @param {jspb.test.TestGroup$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestGroup=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestGroup(properties) {
                 this.repeatedGroup = [];
@@ -4072,19 +4072,19 @@ $root.jspb = (function() {
 
             /**
              * TestGroup repeatedGroup.
-             * @type {Array.<jspb.test.TestGroup.RepeatedGroup$Properties>}
+             * @type {Array.<jspb.test.TestGroup.IRepeatedGroup>}
              */
             TestGroup.prototype.repeatedGroup = $util.emptyArray;
 
             /**
              * TestGroup requiredGroup.
-             * @type {jspb.test.TestGroup.RequiredGroup$Properties}
+             * @type {jspb.test.TestGroup.IRequiredGroup}
              */
             TestGroup.prototype.requiredGroup = null;
 
             /**
              * TestGroup optionalGroup.
-             * @type {(jspb.test.TestGroup.OptionalGroup$Properties|null)}
+             * @type {(jspb.test.TestGroup.IOptionalGroup|null)}
              */
             TestGroup.prototype.optionalGroup = null;
 
@@ -4096,19 +4096,19 @@ $root.jspb = (function() {
 
             /**
              * TestGroup requiredSimple.
-             * @type {jspb.test.Simple2$Properties}
+             * @type {jspb.test.ISimple2}
              */
             TestGroup.prototype.requiredSimple = null;
 
             /**
              * TestGroup optionalSimple.
-             * @type {(jspb.test.Simple2$Properties|null)}
+             * @type {(jspb.test.ISimple2|null)}
              */
             TestGroup.prototype.optionalSimple = null;
 
             /**
              * Creates a new TestGroup instance using the specified properties.
-             * @param {jspb.test.TestGroup$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestGroup=} [properties] Properties to set
              * @returns {jspb.test.TestGroup} TestGroup instance
              */
             TestGroup.create = function create(properties) {
@@ -4117,7 +4117,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestGroup message. Does not implicitly {@link jspb.test.TestGroup.verify|verify} messages.
-             * @param {jspb.test.TestGroup$Properties} message TestGroup message or plain object to encode
+             * @param {jspb.test.ITestGroup} message TestGroup message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -4140,7 +4140,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.verify|verify} messages.
-             * @param {jspb.test.TestGroup$Properties} message TestGroup message or plain object to encode
+             * @param {jspb.test.ITestGroup} message TestGroup message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -4294,7 +4294,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestGroup message. Also converts values to other types if specified.
              * @param {jspb.test.TestGroup} message TestGroup
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestGroup.toObject = function toObject(message, options) {
@@ -4330,7 +4330,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestGroup message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestGroup.prototype.toObject = function toObject(options) {
@@ -4349,17 +4349,17 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a RepeatedGroup.
-                 * @typedef jspb.test.TestGroup.RepeatedGroup$Properties
-                 * @type {Object}
+                 * @interface IRepeatedGroup
+                 * @memberof jspb.test.TestGroup
                  * @property {string} id RepeatedGroup id.
                  * @property {Array.<boolean>} [someBool] RepeatedGroup someBool.
                  */
 
                 /**
                  * Constructs a new RepeatedGroup.
-                 * @exports jspb.test.TestGroup.RepeatedGroup
                  * @constructor
-                 * @param {jspb.test.TestGroup.RepeatedGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IRepeatedGroup=} [properties] Properties to set
+                 * @memberof jspb.test.TestGroup
                  */
                 function RepeatedGroup(properties) {
                     this.someBool = [];
@@ -4383,7 +4383,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new RepeatedGroup instance using the specified properties.
-                 * @param {jspb.test.TestGroup.RepeatedGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IRepeatedGroup=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.RepeatedGroup} RepeatedGroup instance
                  */
                 RepeatedGroup.create = function create(properties) {
@@ -4392,7 +4392,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified RepeatedGroup message. Does not implicitly {@link jspb.test.TestGroup.RepeatedGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.RepeatedGroup$Properties} message RepeatedGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IRepeatedGroup} message RepeatedGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4408,7 +4408,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified RepeatedGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.RepeatedGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.RepeatedGroup$Properties} message RepeatedGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IRepeatedGroup} message RepeatedGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4513,7 +4513,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a RepeatedGroup message. Also converts values to other types if specified.
                  * @param {jspb.test.TestGroup.RepeatedGroup} message RepeatedGroup
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 RepeatedGroup.toObject = function toObject(message, options) {
@@ -4536,7 +4536,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this RepeatedGroup message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 RepeatedGroup.prototype.toObject = function toObject(options) {
@@ -4558,16 +4558,16 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a RequiredGroup.
-                 * @typedef jspb.test.TestGroup.RequiredGroup$Properties
-                 * @type {Object}
+                 * @interface IRequiredGroup
+                 * @memberof jspb.test.TestGroup
                  * @property {string} id RequiredGroup id.
                  */
 
                 /**
                  * Constructs a new RequiredGroup.
-                 * @exports jspb.test.TestGroup.RequiredGroup
                  * @constructor
-                 * @param {jspb.test.TestGroup.RequiredGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IRequiredGroup=} [properties] Properties to set
+                 * @memberof jspb.test.TestGroup
                  */
                 function RequiredGroup(properties) {
                     if (properties)
@@ -4584,7 +4584,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new RequiredGroup instance using the specified properties.
-                 * @param {jspb.test.TestGroup.RequiredGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IRequiredGroup=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.RequiredGroup} RequiredGroup instance
                  */
                 RequiredGroup.create = function create(properties) {
@@ -4593,7 +4593,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified RequiredGroup message. Does not implicitly {@link jspb.test.TestGroup.RequiredGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.RequiredGroup$Properties} message RequiredGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IRequiredGroup} message RequiredGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4606,7 +4606,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified RequiredGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.RequiredGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.RequiredGroup$Properties} message RequiredGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IRequiredGroup} message RequiredGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4687,7 +4687,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a RequiredGroup message. Also converts values to other types if specified.
                  * @param {jspb.test.TestGroup.RequiredGroup} message RequiredGroup
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 RequiredGroup.toObject = function toObject(message, options) {
@@ -4703,7 +4703,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this RequiredGroup message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 RequiredGroup.prototype.toObject = function toObject(options) {
@@ -4725,16 +4725,16 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of an OptionalGroup.
-                 * @typedef jspb.test.TestGroup.OptionalGroup$Properties
-                 * @type {Object}
+                 * @interface IOptionalGroup
+                 * @memberof jspb.test.TestGroup
                  * @property {string} id OptionalGroup id.
                  */
 
                 /**
                  * Constructs a new OptionalGroup.
-                 * @exports jspb.test.TestGroup.OptionalGroup
                  * @constructor
-                 * @param {jspb.test.TestGroup.OptionalGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IOptionalGroup=} [properties] Properties to set
+                 * @memberof jspb.test.TestGroup
                  */
                 function OptionalGroup(properties) {
                     if (properties)
@@ -4751,7 +4751,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new OptionalGroup instance using the specified properties.
-                 * @param {jspb.test.TestGroup.OptionalGroup$Properties=} [properties] Properties to set
+                 * @param {jspb.test.TestGroup.IOptionalGroup=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.OptionalGroup} OptionalGroup instance
                  */
                 OptionalGroup.create = function create(properties) {
@@ -4760,7 +4760,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified OptionalGroup message. Does not implicitly {@link jspb.test.TestGroup.OptionalGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.OptionalGroup$Properties} message OptionalGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IOptionalGroup} message OptionalGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4773,7 +4773,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified OptionalGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.OptionalGroup.verify|verify} messages.
-                 * @param {jspb.test.TestGroup.OptionalGroup$Properties} message OptionalGroup message or plain object to encode
+                 * @param {jspb.test.TestGroup.IOptionalGroup} message OptionalGroup message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -4854,7 +4854,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from an OptionalGroup message. Also converts values to other types if specified.
                  * @param {jspb.test.TestGroup.OptionalGroup} message OptionalGroup
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 OptionalGroup.toObject = function toObject(message, options) {
@@ -4870,7 +4870,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this OptionalGroup message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 OptionalGroup.prototype.toObject = function toObject(options) {
@@ -4895,16 +4895,16 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestGroup1.
-             * @typedef jspb.test.TestGroup1$Properties
-             * @type {Object}
-             * @property {jspb.test.TestGroup.RepeatedGroup$Properties} [group] TestGroup1 group.
+             * @interface ITestGroup1
+             * @memberof jspb.test
+             * @property {jspb.test.TestGroup.IRepeatedGroup} [group] TestGroup1 group.
              */
 
             /**
              * Constructs a new TestGroup1.
-             * @exports jspb.test.TestGroup1
              * @constructor
-             * @param {jspb.test.TestGroup1$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestGroup1=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestGroup1(properties) {
                 if (properties)
@@ -4915,13 +4915,13 @@ $root.jspb = (function() {
 
             /**
              * TestGroup1 group.
-             * @type {(jspb.test.TestGroup.RepeatedGroup$Properties|null)}
+             * @type {(jspb.test.TestGroup.IRepeatedGroup|null)}
              */
             TestGroup1.prototype.group = null;
 
             /**
              * Creates a new TestGroup1 instance using the specified properties.
-             * @param {jspb.test.TestGroup1$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestGroup1=} [properties] Properties to set
              * @returns {jspb.test.TestGroup1} TestGroup1 instance
              */
             TestGroup1.create = function create(properties) {
@@ -4930,7 +4930,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestGroup1 message. Does not implicitly {@link jspb.test.TestGroup1.verify|verify} messages.
-             * @param {jspb.test.TestGroup1$Properties} message TestGroup1 message or plain object to encode
+             * @param {jspb.test.ITestGroup1} message TestGroup1 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -4944,7 +4944,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestGroup1 message, length delimited. Does not implicitly {@link jspb.test.TestGroup1.verify|verify} messages.
-             * @param {jspb.test.TestGroup1$Properties} message TestGroup1 message or plain object to encode
+             * @param {jspb.test.ITestGroup1} message TestGroup1 message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5027,7 +5027,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestGroup1 message. Also converts values to other types if specified.
              * @param {jspb.test.TestGroup1} message TestGroup1
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestGroup1.toObject = function toObject(message, options) {
@@ -5043,7 +5043,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestGroup1 message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestGroup1.prototype.toObject = function toObject(options) {
@@ -5065,17 +5065,17 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestReservedNames.
-             * @typedef jspb.test.TestReservedNames$Properties
-             * @type {Object}
+             * @interface ITestReservedNames
+             * @memberof jspb.test
              * @property {number} [extension] TestReservedNames extension.
              * @property {number} [".jspb.test.TestReservedNamesExtension.foo"] TestReservedNames .jspb.test.TestReservedNamesExtension.foo.
              */
 
             /**
              * Constructs a new TestReservedNames.
-             * @exports jspb.test.TestReservedNames
              * @constructor
-             * @param {jspb.test.TestReservedNames$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestReservedNames=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestReservedNames(properties) {
                 if (properties)
@@ -5098,7 +5098,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestReservedNames instance using the specified properties.
-             * @param {jspb.test.TestReservedNames$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestReservedNames=} [properties] Properties to set
              * @returns {jspb.test.TestReservedNames} TestReservedNames instance
              */
             TestReservedNames.create = function create(properties) {
@@ -5107,7 +5107,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestReservedNames message. Does not implicitly {@link jspb.test.TestReservedNames.verify|verify} messages.
-             * @param {jspb.test.TestReservedNames$Properties} message TestReservedNames message or plain object to encode
+             * @param {jspb.test.ITestReservedNames} message TestReservedNames message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5123,7 +5123,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestReservedNames message, length delimited. Does not implicitly {@link jspb.test.TestReservedNames.verify|verify} messages.
-             * @param {jspb.test.TestReservedNames$Properties} message TestReservedNames message or plain object to encode
+             * @param {jspb.test.ITestReservedNames} message TestReservedNames message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5209,7 +5209,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestReservedNames message. Also converts values to other types if specified.
              * @param {jspb.test.TestReservedNames} message TestReservedNames
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestReservedNames.toObject = function toObject(message, options) {
@@ -5229,7 +5229,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestReservedNames message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestReservedNames.prototype.toObject = function toObject(options) {
@@ -5251,15 +5251,15 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestReservedNamesExtension.
-             * @typedef jspb.test.TestReservedNamesExtension$Properties
-             * @type {Object}
+             * @interface ITestReservedNamesExtension
+             * @memberof jspb.test
              */
 
             /**
              * Constructs a new TestReservedNamesExtension.
-             * @exports jspb.test.TestReservedNamesExtension
              * @constructor
-             * @param {jspb.test.TestReservedNamesExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestReservedNamesExtension=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestReservedNamesExtension(properties) {
                 if (properties)
@@ -5270,7 +5270,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestReservedNamesExtension instance using the specified properties.
-             * @param {jspb.test.TestReservedNamesExtension$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestReservedNamesExtension=} [properties] Properties to set
              * @returns {jspb.test.TestReservedNamesExtension} TestReservedNamesExtension instance
              */
             TestReservedNamesExtension.create = function create(properties) {
@@ -5279,7 +5279,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestReservedNamesExtension message. Does not implicitly {@link jspb.test.TestReservedNamesExtension.verify|verify} messages.
-             * @param {jspb.test.TestReservedNamesExtension$Properties} message TestReservedNamesExtension message or plain object to encode
+             * @param {jspb.test.ITestReservedNamesExtension} message TestReservedNamesExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5291,7 +5291,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestReservedNamesExtension message, length delimited. Does not implicitly {@link jspb.test.TestReservedNamesExtension.verify|verify} messages.
-             * @param {jspb.test.TestReservedNamesExtension$Properties} message TestReservedNamesExtension message or plain object to encode
+             * @param {jspb.test.ITestReservedNamesExtension} message TestReservedNamesExtension message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5360,7 +5360,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestReservedNamesExtension message. Also converts values to other types if specified.
              * @param {jspb.test.TestReservedNamesExtension} message TestReservedNamesExtension
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestReservedNamesExtension.toObject = function toObject() {
@@ -5369,7 +5369,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestReservedNamesExtension message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestReservedNamesExtension.prototype.toObject = function toObject(options) {
@@ -5391,11 +5391,11 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestMessageWithOneof.
-             * @typedef jspb.test.TestMessageWithOneof$Properties
-             * @type {Object}
+             * @interface ITestMessageWithOneof
+             * @memberof jspb.test
              * @property {string} [pone] TestMessageWithOneof pone.
              * @property {string} [pthree] TestMessageWithOneof pthree.
-             * @property {jspb.test.TestMessageWithOneof$Properties} [rone] TestMessageWithOneof rone.
+             * @property {jspb.test.ITestMessageWithOneof} [rone] TestMessageWithOneof rone.
              * @property {string} [rtwo] TestMessageWithOneof rtwo.
              * @property {boolean} [normalField] TestMessageWithOneof normalField.
              * @property {Array.<string>} [repeatedField] TestMessageWithOneof repeatedField.
@@ -5407,9 +5407,9 @@ $root.jspb = (function() {
 
             /**
              * Constructs a new TestMessageWithOneof.
-             * @exports jspb.test.TestMessageWithOneof
              * @constructor
-             * @param {jspb.test.TestMessageWithOneof$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestMessageWithOneof=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestMessageWithOneof(properties) {
                 this.repeatedField = [];
@@ -5433,7 +5433,7 @@ $root.jspb = (function() {
 
             /**
              * TestMessageWithOneof rone.
-             * @type {(jspb.test.TestMessageWithOneof$Properties|null)}
+             * @type {(jspb.test.ITestMessageWithOneof|null)}
              */
             TestMessageWithOneof.prototype.rone = null;
 
@@ -5524,7 +5524,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestMessageWithOneof instance using the specified properties.
-             * @param {jspb.test.TestMessageWithOneof$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestMessageWithOneof=} [properties] Properties to set
              * @returns {jspb.test.TestMessageWithOneof} TestMessageWithOneof instance
              */
             TestMessageWithOneof.create = function create(properties) {
@@ -5533,7 +5533,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestMessageWithOneof message. Does not implicitly {@link jspb.test.TestMessageWithOneof.verify|verify} messages.
-             * @param {jspb.test.TestMessageWithOneof$Properties} message TestMessageWithOneof message or plain object to encode
+             * @param {jspb.test.ITestMessageWithOneof} message TestMessageWithOneof message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5566,7 +5566,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestMessageWithOneof message, length delimited. Does not implicitly {@link jspb.test.TestMessageWithOneof.verify|verify} messages.
-             * @param {jspb.test.TestMessageWithOneof$Properties} message TestMessageWithOneof message or plain object to encode
+             * @param {jspb.test.ITestMessageWithOneof} message TestMessageWithOneof message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5756,7 +5756,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestMessageWithOneof message. Also converts values to other types if specified.
              * @param {jspb.test.TestMessageWithOneof} message TestMessageWithOneof
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestMessageWithOneof.toObject = function toObject(message, options) {
@@ -5819,7 +5819,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestMessageWithOneof message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestMessageWithOneof.prototype.toObject = function toObject(options) {
@@ -5841,17 +5841,17 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestEndsWithBytes.
-             * @typedef jspb.test.TestEndsWithBytes$Properties
-             * @type {Object}
+             * @interface ITestEndsWithBytes
+             * @memberof jspb.test
              * @property {number} [value] TestEndsWithBytes value.
              * @property {Uint8Array} [data] TestEndsWithBytes data.
              */
 
             /**
              * Constructs a new TestEndsWithBytes.
-             * @exports jspb.test.TestEndsWithBytes
              * @constructor
-             * @param {jspb.test.TestEndsWithBytes$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestEndsWithBytes=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestEndsWithBytes(properties) {
                 if (properties)
@@ -5874,7 +5874,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestEndsWithBytes instance using the specified properties.
-             * @param {jspb.test.TestEndsWithBytes$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestEndsWithBytes=} [properties] Properties to set
              * @returns {jspb.test.TestEndsWithBytes} TestEndsWithBytes instance
              */
             TestEndsWithBytes.create = function create(properties) {
@@ -5883,7 +5883,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestEndsWithBytes message. Does not implicitly {@link jspb.test.TestEndsWithBytes.verify|verify} messages.
-             * @param {jspb.test.TestEndsWithBytes$Properties} message TestEndsWithBytes message or plain object to encode
+             * @param {jspb.test.ITestEndsWithBytes} message TestEndsWithBytes message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5899,7 +5899,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestEndsWithBytes message, length delimited. Does not implicitly {@link jspb.test.TestEndsWithBytes.verify|verify} messages.
-             * @param {jspb.test.TestEndsWithBytes$Properties} message TestEndsWithBytes message or plain object to encode
+             * @param {jspb.test.ITestEndsWithBytes} message TestEndsWithBytes message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -5988,7 +5988,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestEndsWithBytes message. Also converts values to other types if specified.
              * @param {jspb.test.TestEndsWithBytes} message TestEndsWithBytes
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestEndsWithBytes.toObject = function toObject(message, options) {
@@ -6008,7 +6008,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestEndsWithBytes message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestEndsWithBytes.prototype.toObject = function toObject(options) {
@@ -6030,27 +6030,27 @@ $root.jspb = (function() {
 
             /**
              * Properties of a TestMapFieldsNoBinary.
-             * @typedef jspb.test.TestMapFieldsNoBinary$Properties
-             * @type {Object}
+             * @interface ITestMapFieldsNoBinary
+             * @memberof jspb.test
              * @property {Object.<string,string>} [mapStringString] TestMapFieldsNoBinary mapStringString.
              * @property {Object.<string,number>} [mapStringInt32] TestMapFieldsNoBinary mapStringInt32.
              * @property {Object.<string,number|Long>} [mapStringInt64] TestMapFieldsNoBinary mapStringInt64.
              * @property {Object.<string,boolean>} [mapStringBool] TestMapFieldsNoBinary mapStringBool.
              * @property {Object.<string,number>} [mapStringDouble] TestMapFieldsNoBinary mapStringDouble.
              * @property {Object.<string,jspb.test.MapValueEnumNoBinary>} [mapStringEnum] TestMapFieldsNoBinary mapStringEnum.
-             * @property {Object.<string,jspb.test.MapValueMessageNoBinary$Properties>} [mapStringMsg] TestMapFieldsNoBinary mapStringMsg.
+             * @property {Object.<string,jspb.test.IMapValueMessageNoBinary>} [mapStringMsg] TestMapFieldsNoBinary mapStringMsg.
              * @property {Object.<string,string>} [mapInt32String] TestMapFieldsNoBinary mapInt32String.
              * @property {Object.<string,string>} [mapInt64String] TestMapFieldsNoBinary mapInt64String.
              * @property {Object.<string,string>} [mapBoolString] TestMapFieldsNoBinary mapBoolString.
-             * @property {jspb.test.TestMapFieldsNoBinary$Properties} [testMapFields] TestMapFieldsNoBinary testMapFields.
-             * @property {Object.<string,jspb.test.TestMapFieldsNoBinary$Properties>} [mapStringTestmapfields] TestMapFieldsNoBinary mapStringTestmapfields.
+             * @property {jspb.test.ITestMapFieldsNoBinary} [testMapFields] TestMapFieldsNoBinary testMapFields.
+             * @property {Object.<string,jspb.test.ITestMapFieldsNoBinary>} [mapStringTestmapfields] TestMapFieldsNoBinary mapStringTestmapfields.
              */
 
             /**
              * Constructs a new TestMapFieldsNoBinary.
-             * @exports jspb.test.TestMapFieldsNoBinary
              * @constructor
-             * @param {jspb.test.TestMapFieldsNoBinary$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestMapFieldsNoBinary=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function TestMapFieldsNoBinary(properties) {
                 this.mapStringString = {};
@@ -6108,7 +6108,7 @@ $root.jspb = (function() {
 
             /**
              * TestMapFieldsNoBinary mapStringMsg.
-             * @type {Object.<string,jspb.test.MapValueMessageNoBinary$Properties>}
+             * @type {Object.<string,jspb.test.IMapValueMessageNoBinary>}
              */
             TestMapFieldsNoBinary.prototype.mapStringMsg = $util.emptyObject;
 
@@ -6132,19 +6132,19 @@ $root.jspb = (function() {
 
             /**
              * TestMapFieldsNoBinary testMapFields.
-             * @type {(jspb.test.TestMapFieldsNoBinary$Properties|null)}
+             * @type {(jspb.test.ITestMapFieldsNoBinary|null)}
              */
             TestMapFieldsNoBinary.prototype.testMapFields = null;
 
             /**
              * TestMapFieldsNoBinary mapStringTestmapfields.
-             * @type {Object.<string,jspb.test.TestMapFieldsNoBinary$Properties>}
+             * @type {Object.<string,jspb.test.ITestMapFieldsNoBinary>}
              */
             TestMapFieldsNoBinary.prototype.mapStringTestmapfields = $util.emptyObject;
 
             /**
              * Creates a new TestMapFieldsNoBinary instance using the specified properties.
-             * @param {jspb.test.TestMapFieldsNoBinary$Properties=} [properties] Properties to set
+             * @param {jspb.test.ITestMapFieldsNoBinary=} [properties] Properties to set
              * @returns {jspb.test.TestMapFieldsNoBinary} TestMapFieldsNoBinary instance
              */
             TestMapFieldsNoBinary.create = function create(properties) {
@@ -6153,7 +6153,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestMapFieldsNoBinary message. Does not implicitly {@link jspb.test.TestMapFieldsNoBinary.verify|verify} messages.
-             * @param {jspb.test.TestMapFieldsNoBinary$Properties} message TestMapFieldsNoBinary message or plain object to encode
+             * @param {jspb.test.ITestMapFieldsNoBinary} message TestMapFieldsNoBinary message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6204,7 +6204,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified TestMapFieldsNoBinary message, length delimited. Does not implicitly {@link jspb.test.TestMapFieldsNoBinary.verify|verify} messages.
-             * @param {jspb.test.TestMapFieldsNoBinary$Properties} message TestMapFieldsNoBinary message or plain object to encode
+             * @param {jspb.test.ITestMapFieldsNoBinary} message TestMapFieldsNoBinary message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6585,7 +6585,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a TestMapFieldsNoBinary message. Also converts values to other types if specified.
              * @param {jspb.test.TestMapFieldsNoBinary} message TestMapFieldsNoBinary
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestMapFieldsNoBinary.toObject = function toObject(message, options) {
@@ -6673,7 +6673,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this TestMapFieldsNoBinary message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             TestMapFieldsNoBinary.prototype.toObject = function toObject(options) {
@@ -6694,8 +6694,8 @@ $root.jspb = (function() {
         /**
          * MapValueEnumNoBinary enum.
          * @name MapValueEnumNoBinary
-         * @memberof jspb.test
          * @enum {number}
+         * @memberof jspb.test
          * @property {number} MAP_VALUE_FOO_NOBINARY=0 MAP_VALUE_FOO_NOBINARY value
          * @property {number} MAP_VALUE_BAR_NOBINARY=1 MAP_VALUE_BAR_NOBINARY value
          * @property {number} MAP_VALUE_BAZ_NOBINARY=2 MAP_VALUE_BAZ_NOBINARY value
@@ -6712,16 +6712,16 @@ $root.jspb = (function() {
 
             /**
              * Properties of a MapValueMessageNoBinary.
-             * @typedef jspb.test.MapValueMessageNoBinary$Properties
-             * @type {Object}
+             * @interface IMapValueMessageNoBinary
+             * @memberof jspb.test
              * @property {number} [foo] MapValueMessageNoBinary foo.
              */
 
             /**
              * Constructs a new MapValueMessageNoBinary.
-             * @exports jspb.test.MapValueMessageNoBinary
              * @constructor
-             * @param {jspb.test.MapValueMessageNoBinary$Properties=} [properties] Properties to set
+             * @param {jspb.test.IMapValueMessageNoBinary=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function MapValueMessageNoBinary(properties) {
                 if (properties)
@@ -6738,7 +6738,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new MapValueMessageNoBinary instance using the specified properties.
-             * @param {jspb.test.MapValueMessageNoBinary$Properties=} [properties] Properties to set
+             * @param {jspb.test.IMapValueMessageNoBinary=} [properties] Properties to set
              * @returns {jspb.test.MapValueMessageNoBinary} MapValueMessageNoBinary instance
              */
             MapValueMessageNoBinary.create = function create(properties) {
@@ -6747,7 +6747,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified MapValueMessageNoBinary message. Does not implicitly {@link jspb.test.MapValueMessageNoBinary.verify|verify} messages.
-             * @param {jspb.test.MapValueMessageNoBinary$Properties} message MapValueMessageNoBinary message or plain object to encode
+             * @param {jspb.test.IMapValueMessageNoBinary} message MapValueMessageNoBinary message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6761,7 +6761,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified MapValueMessageNoBinary message, length delimited. Does not implicitly {@link jspb.test.MapValueMessageNoBinary.verify|verify} messages.
-             * @param {jspb.test.MapValueMessageNoBinary$Properties} message MapValueMessageNoBinary message or plain object to encode
+             * @param {jspb.test.IMapValueMessageNoBinary} message MapValueMessageNoBinary message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6839,7 +6839,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a MapValueMessageNoBinary message. Also converts values to other types if specified.
              * @param {jspb.test.MapValueMessageNoBinary} message MapValueMessageNoBinary
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MapValueMessageNoBinary.toObject = function toObject(message, options) {
@@ -6855,7 +6855,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this MapValueMessageNoBinary message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MapValueMessageNoBinary.prototype.toObject = function toObject(options) {
@@ -6877,15 +6877,15 @@ $root.jspb = (function() {
 
             /**
              * Properties of a Deeply.
-             * @typedef jspb.test.Deeply$Properties
-             * @type {Object}
+             * @interface IDeeply
+             * @memberof jspb.test
              */
 
             /**
              * Constructs a new Deeply.
-             * @exports jspb.test.Deeply
              * @constructor
-             * @param {jspb.test.Deeply$Properties=} [properties] Properties to set
+             * @param {jspb.test.IDeeply=} [properties] Properties to set
+             * @memberof jspb.test
              */
             function Deeply(properties) {
                 if (properties)
@@ -6896,7 +6896,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Deeply instance using the specified properties.
-             * @param {jspb.test.Deeply$Properties=} [properties] Properties to set
+             * @param {jspb.test.IDeeply=} [properties] Properties to set
              * @returns {jspb.test.Deeply} Deeply instance
              */
             Deeply.create = function create(properties) {
@@ -6905,7 +6905,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Deeply message. Does not implicitly {@link jspb.test.Deeply.verify|verify} messages.
-             * @param {jspb.test.Deeply$Properties} message Deeply message or plain object to encode
+             * @param {jspb.test.IDeeply} message Deeply message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6917,7 +6917,7 @@ $root.jspb = (function() {
 
             /**
              * Encodes the specified Deeply message, length delimited. Does not implicitly {@link jspb.test.Deeply.verify|verify} messages.
-             * @param {jspb.test.Deeply$Properties} message Deeply message or plain object to encode
+             * @param {jspb.test.IDeeply} message Deeply message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -6986,7 +6986,7 @@ $root.jspb = (function() {
             /**
              * Creates a plain object from a Deeply message. Also converts values to other types if specified.
              * @param {jspb.test.Deeply} message Deeply
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Deeply.toObject = function toObject() {
@@ -6995,7 +6995,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a plain object from this Deeply message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             Deeply.prototype.toObject = function toObject(options) {
@@ -7014,15 +7014,15 @@ $root.jspb = (function() {
 
                 /**
                  * Properties of a Nested.
-                 * @typedef jspb.test.Deeply.Nested$Properties
-                 * @type {Object}
+                 * @interface INested
+                 * @memberof jspb.test.Deeply
                  */
 
                 /**
                  * Constructs a new Nested.
-                 * @exports jspb.test.Deeply.Nested
                  * @constructor
-                 * @param {jspb.test.Deeply.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.Deeply.INested=} [properties] Properties to set
+                 * @memberof jspb.test.Deeply
                  */
                 function Nested(properties) {
                     if (properties)
@@ -7033,7 +7033,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {jspb.test.Deeply.Nested$Properties=} [properties] Properties to set
+                 * @param {jspb.test.Deeply.INested=} [properties] Properties to set
                  * @returns {jspb.test.Deeply.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -7042,7 +7042,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message. Does not implicitly {@link jspb.test.Deeply.Nested.verify|verify} messages.
-                 * @param {jspb.test.Deeply.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.Deeply.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -7054,7 +7054,7 @@ $root.jspb = (function() {
 
                 /**
                  * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.Deeply.Nested.verify|verify} messages.
-                 * @param {jspb.test.Deeply.Nested$Properties} message Nested message or plain object to encode
+                 * @param {jspb.test.Deeply.INested} message Nested message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -7123,7 +7123,7 @@ $root.jspb = (function() {
                 /**
                  * Creates a plain object from a Nested message. Also converts values to other types if specified.
                  * @param {jspb.test.Deeply.Nested} message Nested
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.toObject = function toObject() {
@@ -7132,7 +7132,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a plain object from this Nested message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Nested.prototype.toObject = function toObject(options) {
@@ -7151,16 +7151,16 @@ $root.jspb = (function() {
 
                     /**
                      * Properties of a Message.
-                     * @typedef jspb.test.Deeply.Nested.Message$Properties
-                     * @type {Object}
+                     * @interface IMessage
+                     * @memberof jspb.test.Deeply.Nested
                      * @property {number} [count] Message count.
                      */
 
                     /**
                      * Constructs a new Message.
-                     * @exports jspb.test.Deeply.Nested.Message
                      * @constructor
-                     * @param {jspb.test.Deeply.Nested.Message$Properties=} [properties] Properties to set
+                     * @param {jspb.test.Deeply.Nested.IMessage=} [properties] Properties to set
+                     * @memberof jspb.test.Deeply.Nested
                      */
                     function Message(properties) {
                         if (properties)
@@ -7177,7 +7177,7 @@ $root.jspb = (function() {
 
                     /**
                      * Creates a new Message instance using the specified properties.
-                     * @param {jspb.test.Deeply.Nested.Message$Properties=} [properties] Properties to set
+                     * @param {jspb.test.Deeply.Nested.IMessage=} [properties] Properties to set
                      * @returns {jspb.test.Deeply.Nested.Message} Message instance
                      */
                     Message.create = function create(properties) {
@@ -7186,7 +7186,7 @@ $root.jspb = (function() {
 
                     /**
                      * Encodes the specified Message message. Does not implicitly {@link jspb.test.Deeply.Nested.Message.verify|verify} messages.
-                     * @param {jspb.test.Deeply.Nested.Message$Properties} message Message message or plain object to encode
+                     * @param {jspb.test.Deeply.Nested.IMessage} message Message message or plain object to encode
                      * @param {$protobuf.Writer} [writer] Writer to encode to
                      * @returns {$protobuf.Writer} Writer
                      */
@@ -7200,7 +7200,7 @@ $root.jspb = (function() {
 
                     /**
                      * Encodes the specified Message message, length delimited. Does not implicitly {@link jspb.test.Deeply.Nested.Message.verify|verify} messages.
-                     * @param {jspb.test.Deeply.Nested.Message$Properties} message Message message or plain object to encode
+                     * @param {jspb.test.Deeply.Nested.IMessage} message Message message or plain object to encode
                      * @param {$protobuf.Writer} [writer] Writer to encode to
                      * @returns {$protobuf.Writer} Writer
                      */
@@ -7278,7 +7278,7 @@ $root.jspb = (function() {
                     /**
                      * Creates a plain object from a Message message. Also converts values to other types if specified.
                      * @param {jspb.test.Deeply.Nested.Message} message Message
-                     * @param {$protobuf.ConversionOptions} [options] Conversion options
+                     * @param {$protobuf.IConversionOptions} [options] Conversion options
                      * @returns {Object.<string,*>} Plain object
                      */
                     Message.toObject = function toObject(message, options) {
@@ -7294,7 +7294,7 @@ $root.jspb = (function() {
 
                     /**
                      * Creates a plain object from this Message message. Also converts values to other types if specified.
-                     * @param {$protobuf.ConversionOptions} [options] Conversion options
+                     * @param {$protobuf.IConversionOptions} [options] Conversion options
                      * @returns {Object.<string,*>} Plain object
                      */
                     Message.prototype.toObject = function toObject(options) {
@@ -7328,8 +7328,8 @@ $root.google = (function() {
 
     /**
      * Namespace google.
-     * @exports google
      * @namespace
+     * @name google
      */
     var google = {};
 
@@ -7337,8 +7337,8 @@ $root.google = (function() {
 
         /**
          * Namespace protobuf.
-         * @exports google.protobuf
          * @namespace
+         * @memberof google
          */
         var protobuf = {};
 
@@ -7346,16 +7346,16 @@ $root.google = (function() {
 
             /**
              * Properties of a FileDescriptorSet.
-             * @typedef google.protobuf.FileDescriptorSet$Properties
-             * @type {Object}
-             * @property {Array.<google.protobuf.FileDescriptorProto$Properties>} [file] FileDescriptorSet file.
+             * @interface IFileDescriptorSet
+             * @memberof google.protobuf
+             * @property {Array.<google.protobuf.IFileDescriptorProto>} [file] FileDescriptorSet file.
              */
 
             /**
              * Constructs a new FileDescriptorSet.
-             * @exports google.protobuf.FileDescriptorSet
              * @constructor
-             * @param {google.protobuf.FileDescriptorSet$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function FileDescriptorSet(properties) {
                 this.file = [];
@@ -7367,13 +7367,13 @@ $root.google = (function() {
 
             /**
              * FileDescriptorSet file.
-             * @type {Array.<google.protobuf.FileDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IFileDescriptorProto>}
              */
             FileDescriptorSet.prototype.file = $util.emptyArray;
 
             /**
              * Creates a new FileDescriptorSet instance using the specified properties.
-             * @param {google.protobuf.FileDescriptorSet$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set
              * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance
              */
             FileDescriptorSet.create = function create(properties) {
@@ -7382,7 +7382,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages.
-             * @param {google.protobuf.FileDescriptorSet$Properties} message FileDescriptorSet message or plain object to encode
+             * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -7397,7 +7397,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages.
-             * @param {google.protobuf.FileDescriptorSet$Properties} message FileDescriptorSet message or plain object to encode
+             * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -7491,7 +7491,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified.
              * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileDescriptorSet.toObject = function toObject(message, options) {
@@ -7510,7 +7510,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this FileDescriptorSet message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileDescriptorSet.prototype.toObject = function toObject(options) {
@@ -7532,27 +7532,27 @@ $root.google = (function() {
 
             /**
              * Properties of a FileDescriptorProto.
-             * @typedef google.protobuf.FileDescriptorProto$Properties
-             * @type {Object}
+             * @interface IFileDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] FileDescriptorProto name.
              * @property {string} ["package"] FileDescriptorProto package.
              * @property {Array.<string>} [dependency] FileDescriptorProto dependency.
              * @property {Array.<number>} [publicDependency] FileDescriptorProto publicDependency.
              * @property {Array.<number>} [weakDependency] FileDescriptorProto weakDependency.
-             * @property {Array.<google.protobuf.DescriptorProto$Properties>} [messageType] FileDescriptorProto messageType.
-             * @property {Array.<google.protobuf.EnumDescriptorProto$Properties>} [enumType] FileDescriptorProto enumType.
-             * @property {Array.<google.protobuf.ServiceDescriptorProto$Properties>} [service] FileDescriptorProto service.
-             * @property {Array.<google.protobuf.FieldDescriptorProto$Properties>} [extension] FileDescriptorProto extension.
-             * @property {google.protobuf.FileOptions$Properties} [options] FileDescriptorProto options.
-             * @property {google.protobuf.SourceCodeInfo$Properties} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo.
+             * @property {Array.<google.protobuf.IDescriptorProto>} [messageType] FileDescriptorProto messageType.
+             * @property {Array.<google.protobuf.IEnumDescriptorProto>} [enumType] FileDescriptorProto enumType.
+             * @property {Array.<google.protobuf.IServiceDescriptorProto>} [service] FileDescriptorProto service.
+             * @property {Array.<google.protobuf.IFieldDescriptorProto>} [extension] FileDescriptorProto extension.
+             * @property {google.protobuf.IFileOptions} [options] FileDescriptorProto options.
+             * @property {google.protobuf.ISourceCodeInfo} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo.
              * @property {string} [syntax] FileDescriptorProto syntax.
              */
 
             /**
              * Constructs a new FileDescriptorProto.
-             * @exports google.protobuf.FileDescriptorProto
              * @constructor
-             * @param {google.protobuf.FileDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function FileDescriptorProto(properties) {
                 this.dependency = [];
@@ -7600,37 +7600,37 @@ $root.google = (function() {
 
             /**
              * FileDescriptorProto messageType.
-             * @type {Array.<google.protobuf.DescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IDescriptorProto>}
              */
             FileDescriptorProto.prototype.messageType = $util.emptyArray;
 
             /**
              * FileDescriptorProto enumType.
-             * @type {Array.<google.protobuf.EnumDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IEnumDescriptorProto>}
              */
             FileDescriptorProto.prototype.enumType = $util.emptyArray;
 
             /**
              * FileDescriptorProto service.
-             * @type {Array.<google.protobuf.ServiceDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IServiceDescriptorProto>}
              */
             FileDescriptorProto.prototype.service = $util.emptyArray;
 
             /**
              * FileDescriptorProto extension.
-             * @type {Array.<google.protobuf.FieldDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IFieldDescriptorProto>}
              */
             FileDescriptorProto.prototype.extension = $util.emptyArray;
 
             /**
              * FileDescriptorProto options.
-             * @type {(google.protobuf.FileOptions$Properties|null)}
+             * @type {(google.protobuf.IFileOptions|null)}
              */
             FileDescriptorProto.prototype.options = null;
 
             /**
              * FileDescriptorProto sourceCodeInfo.
-             * @type {(google.protobuf.SourceCodeInfo$Properties|null)}
+             * @type {(google.protobuf.ISourceCodeInfo|null)}
              */
             FileDescriptorProto.prototype.sourceCodeInfo = null;
 
@@ -7642,7 +7642,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FileDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.FileDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance
              */
             FileDescriptorProto.create = function create(properties) {
@@ -7651,7 +7651,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.FileDescriptorProto$Properties} message FileDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -7694,7 +7694,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.FileDescriptorProto$Properties} message FileDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -7977,7 +7977,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileDescriptorProto.toObject = function toObject(message, options) {
@@ -8050,7 +8050,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this FileDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileDescriptorProto.prototype.toObject = function toObject(options) {
@@ -8072,25 +8072,25 @@ $root.google = (function() {
 
             /**
              * Properties of a DescriptorProto.
-             * @typedef google.protobuf.DescriptorProto$Properties
-             * @type {Object}
+             * @interface IDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] DescriptorProto name.
-             * @property {Array.<google.protobuf.FieldDescriptorProto$Properties>} [field] DescriptorProto field.
-             * @property {Array.<google.protobuf.FieldDescriptorProto$Properties>} [extension] DescriptorProto extension.
-             * @property {Array.<google.protobuf.DescriptorProto$Properties>} [nestedType] DescriptorProto nestedType.
-             * @property {Array.<google.protobuf.EnumDescriptorProto$Properties>} [enumType] DescriptorProto enumType.
-             * @property {Array.<google.protobuf.DescriptorProto.ExtensionRange$Properties>} [extensionRange] DescriptorProto extensionRange.
-             * @property {Array.<google.protobuf.OneofDescriptorProto$Properties>} [oneofDecl] DescriptorProto oneofDecl.
-             * @property {google.protobuf.MessageOptions$Properties} [options] DescriptorProto options.
-             * @property {Array.<google.protobuf.DescriptorProto.ReservedRange$Properties>} [reservedRange] DescriptorProto reservedRange.
+             * @property {Array.<google.protobuf.IFieldDescriptorProto>} [field] DescriptorProto field.
+             * @property {Array.<google.protobuf.IFieldDescriptorProto>} [extension] DescriptorProto extension.
+             * @property {Array.<google.protobuf.IDescriptorProto>} [nestedType] DescriptorProto nestedType.
+             * @property {Array.<google.protobuf.IEnumDescriptorProto>} [enumType] DescriptorProto enumType.
+             * @property {Array.<google.protobuf.DescriptorProto.IExtensionRange>} [extensionRange] DescriptorProto extensionRange.
+             * @property {Array.<google.protobuf.IOneofDescriptorProto>} [oneofDecl] DescriptorProto oneofDecl.
+             * @property {google.protobuf.IMessageOptions} [options] DescriptorProto options.
+             * @property {Array.<google.protobuf.DescriptorProto.IReservedRange>} [reservedRange] DescriptorProto reservedRange.
              * @property {Array.<string>} [reservedName] DescriptorProto reservedName.
              */
 
             /**
              * Constructs a new DescriptorProto.
-             * @exports google.protobuf.DescriptorProto
              * @constructor
-             * @param {google.protobuf.DescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function DescriptorProto(properties) {
                 this.field = [];
@@ -8115,49 +8115,49 @@ $root.google = (function() {
 
             /**
              * DescriptorProto field.
-             * @type {Array.<google.protobuf.FieldDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IFieldDescriptorProto>}
              */
             DescriptorProto.prototype.field = $util.emptyArray;
 
             /**
              * DescriptorProto extension.
-             * @type {Array.<google.protobuf.FieldDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IFieldDescriptorProto>}
              */
             DescriptorProto.prototype.extension = $util.emptyArray;
 
             /**
              * DescriptorProto nestedType.
-             * @type {Array.<google.protobuf.DescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IDescriptorProto>}
              */
             DescriptorProto.prototype.nestedType = $util.emptyArray;
 
             /**
              * DescriptorProto enumType.
-             * @type {Array.<google.protobuf.EnumDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IEnumDescriptorProto>}
              */
             DescriptorProto.prototype.enumType = $util.emptyArray;
 
             /**
              * DescriptorProto extensionRange.
-             * @type {Array.<google.protobuf.DescriptorProto.ExtensionRange$Properties>}
+             * @type {Array.<google.protobuf.DescriptorProto.IExtensionRange>}
              */
             DescriptorProto.prototype.extensionRange = $util.emptyArray;
 
             /**
              * DescriptorProto oneofDecl.
-             * @type {Array.<google.protobuf.OneofDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IOneofDescriptorProto>}
              */
             DescriptorProto.prototype.oneofDecl = $util.emptyArray;
 
             /**
              * DescriptorProto options.
-             * @type {(google.protobuf.MessageOptions$Properties|null)}
+             * @type {(google.protobuf.IMessageOptions|null)}
              */
             DescriptorProto.prototype.options = null;
 
             /**
              * DescriptorProto reservedRange.
-             * @type {Array.<google.protobuf.DescriptorProto.ReservedRange$Properties>}
+             * @type {Array.<google.protobuf.DescriptorProto.IReservedRange>}
              */
             DescriptorProto.prototype.reservedRange = $util.emptyArray;
 
@@ -8169,7 +8169,7 @@ $root.google = (function() {
 
             /**
              * Creates a new DescriptorProto instance using the specified properties.
-             * @param {google.protobuf.DescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.DescriptorProto} DescriptorProto instance
              */
             DescriptorProto.create = function create(properties) {
@@ -8178,7 +8178,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.DescriptorProto$Properties} message DescriptorProto message or plain object to encode
+             * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -8218,7 +8218,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.DescriptorProto$Properties} message DescriptorProto message or plain object to encode
+             * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -8496,7 +8496,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.DescriptorProto} message DescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             DescriptorProto.toObject = function toObject(message, options) {
@@ -8566,7 +8566,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this DescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             DescriptorProto.prototype.toObject = function toObject(options) {
@@ -8585,17 +8585,17 @@ $root.google = (function() {
 
                 /**
                  * Properties of an ExtensionRange.
-                 * @typedef google.protobuf.DescriptorProto.ExtensionRange$Properties
-                 * @type {Object}
+                 * @interface IExtensionRange
+                 * @memberof google.protobuf.DescriptorProto
                  * @property {number} [start] ExtensionRange start.
                  * @property {number} [end] ExtensionRange end.
                  */
 
                 /**
                  * Constructs a new ExtensionRange.
-                 * @exports google.protobuf.DescriptorProto.ExtensionRange
                  * @constructor
-                 * @param {google.protobuf.DescriptorProto.ExtensionRange$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set
+                 * @memberof google.protobuf.DescriptorProto
                  */
                 function ExtensionRange(properties) {
                     if (properties)
@@ -8618,7 +8618,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new ExtensionRange instance using the specified properties.
-                 * @param {google.protobuf.DescriptorProto.ExtensionRange$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set
                  * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance
                  */
                 ExtensionRange.create = function create(properties) {
@@ -8627,7 +8627,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages.
-                 * @param {google.protobuf.DescriptorProto.ExtensionRange$Properties} message ExtensionRange message or plain object to encode
+                 * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -8643,7 +8643,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages.
-                 * @param {google.protobuf.DescriptorProto.ExtensionRange$Properties} message ExtensionRange message or plain object to encode
+                 * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -8729,7 +8729,7 @@ $root.google = (function() {
                 /**
                  * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified.
                  * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 ExtensionRange.toObject = function toObject(message, options) {
@@ -8749,7 +8749,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a plain object from this ExtensionRange message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 ExtensionRange.prototype.toObject = function toObject(options) {
@@ -8771,17 +8771,17 @@ $root.google = (function() {
 
                 /**
                  * Properties of a ReservedRange.
-                 * @typedef google.protobuf.DescriptorProto.ReservedRange$Properties
-                 * @type {Object}
+                 * @interface IReservedRange
+                 * @memberof google.protobuf.DescriptorProto
                  * @property {number} [start] ReservedRange start.
                  * @property {number} [end] ReservedRange end.
                  */
 
                 /**
                  * Constructs a new ReservedRange.
-                 * @exports google.protobuf.DescriptorProto.ReservedRange
                  * @constructor
-                 * @param {google.protobuf.DescriptorProto.ReservedRange$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set
+                 * @memberof google.protobuf.DescriptorProto
                  */
                 function ReservedRange(properties) {
                     if (properties)
@@ -8804,7 +8804,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new ReservedRange instance using the specified properties.
-                 * @param {google.protobuf.DescriptorProto.ReservedRange$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set
                  * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance
                  */
                 ReservedRange.create = function create(properties) {
@@ -8813,7 +8813,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages.
-                 * @param {google.protobuf.DescriptorProto.ReservedRange$Properties} message ReservedRange message or plain object to encode
+                 * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -8829,7 +8829,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages.
-                 * @param {google.protobuf.DescriptorProto.ReservedRange$Properties} message ReservedRange message or plain object to encode
+                 * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -8915,7 +8915,7 @@ $root.google = (function() {
                 /**
                  * Creates a plain object from a ReservedRange message. Also converts values to other types if specified.
                  * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 ReservedRange.toObject = function toObject(message, options) {
@@ -8935,7 +8935,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a plain object from this ReservedRange message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 ReservedRange.prototype.toObject = function toObject(options) {
@@ -8960,8 +8960,8 @@ $root.google = (function() {
 
             /**
              * Properties of a FieldDescriptorProto.
-             * @typedef google.protobuf.FieldDescriptorProto$Properties
-             * @type {Object}
+             * @interface IFieldDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] FieldDescriptorProto name.
              * @property {number} [number] FieldDescriptorProto number.
              * @property {google.protobuf.FieldDescriptorProto.Label} [label] FieldDescriptorProto label.
@@ -8971,14 +8971,14 @@ $root.google = (function() {
              * @property {string} [defaultValue] FieldDescriptorProto defaultValue.
              * @property {number} [oneofIndex] FieldDescriptorProto oneofIndex.
              * @property {string} [jsonName] FieldDescriptorProto jsonName.
-             * @property {google.protobuf.FieldOptions$Properties} [options] FieldDescriptorProto options.
+             * @property {google.protobuf.IFieldOptions} [options] FieldDescriptorProto options.
              */
 
             /**
              * Constructs a new FieldDescriptorProto.
-             * @exports google.protobuf.FieldDescriptorProto
              * @constructor
-             * @param {google.protobuf.FieldDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function FieldDescriptorProto(properties) {
                 if (properties)
@@ -9043,13 +9043,13 @@ $root.google = (function() {
 
             /**
              * FieldDescriptorProto options.
-             * @type {(google.protobuf.FieldOptions$Properties|null)}
+             * @type {(google.protobuf.IFieldOptions|null)}
              */
             FieldDescriptorProto.prototype.options = null;
 
             /**
              * Creates a new FieldDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.FieldDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance
              */
             FieldDescriptorProto.create = function create(properties) {
@@ -9058,7 +9058,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.FieldDescriptorProto$Properties} message FieldDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9090,7 +9090,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.FieldDescriptorProto$Properties} message FieldDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9356,7 +9356,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FieldDescriptorProto.toObject = function toObject(message, options) {
@@ -9400,7 +9400,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this FieldDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FieldDescriptorProto.prototype.toObject = function toObject(options) {
@@ -9418,8 +9418,8 @@ $root.google = (function() {
             /**
              * Type enum.
              * @name Type
-             * @memberof google.protobuf.FieldDescriptorProto
              * @enum {number}
+             * @memberof google.protobuf.FieldDescriptorProto
              * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value
              * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value
              * @property {number} TYPE_INT64=3 TYPE_INT64 value
@@ -9465,8 +9465,8 @@ $root.google = (function() {
             /**
              * Label enum.
              * @name Label
-             * @memberof google.protobuf.FieldDescriptorProto
              * @enum {number}
+             * @memberof google.protobuf.FieldDescriptorProto
              * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value
              * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value
              * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value
@@ -9486,17 +9486,17 @@ $root.google = (function() {
 
             /**
              * Properties of an OneofDescriptorProto.
-             * @typedef google.protobuf.OneofDescriptorProto$Properties
-             * @type {Object}
+             * @interface IOneofDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] OneofDescriptorProto name.
-             * @property {google.protobuf.OneofOptions$Properties} [options] OneofDescriptorProto options.
+             * @property {google.protobuf.IOneofOptions} [options] OneofDescriptorProto options.
              */
 
             /**
              * Constructs a new OneofDescriptorProto.
-             * @exports google.protobuf.OneofDescriptorProto
              * @constructor
-             * @param {google.protobuf.OneofDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function OneofDescriptorProto(properties) {
                 if (properties)
@@ -9513,13 +9513,13 @@ $root.google = (function() {
 
             /**
              * OneofDescriptorProto options.
-             * @type {(google.protobuf.OneofOptions$Properties|null)}
+             * @type {(google.protobuf.IOneofOptions|null)}
              */
             OneofDescriptorProto.prototype.options = null;
 
             /**
              * Creates a new OneofDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.OneofDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance
              */
             OneofDescriptorProto.create = function create(properties) {
@@ -9528,7 +9528,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.OneofDescriptorProto$Properties} message OneofDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9544,7 +9544,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.OneofDescriptorProto$Properties} message OneofDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9635,7 +9635,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OneofDescriptorProto.toObject = function toObject(message, options) {
@@ -9655,7 +9655,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this OneofDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OneofDescriptorProto.prototype.toObject = function toObject(options) {
@@ -9677,18 +9677,18 @@ $root.google = (function() {
 
             /**
              * Properties of an EnumDescriptorProto.
-             * @typedef google.protobuf.EnumDescriptorProto$Properties
-             * @type {Object}
+             * @interface IEnumDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] EnumDescriptorProto name.
-             * @property {Array.<google.protobuf.EnumValueDescriptorProto$Properties>} [value] EnumDescriptorProto value.
-             * @property {google.protobuf.EnumOptions$Properties} [options] EnumDescriptorProto options.
+             * @property {Array.<google.protobuf.IEnumValueDescriptorProto>} [value] EnumDescriptorProto value.
+             * @property {google.protobuf.IEnumOptions} [options] EnumDescriptorProto options.
              */
 
             /**
              * Constructs a new EnumDescriptorProto.
-             * @exports google.protobuf.EnumDescriptorProto
              * @constructor
-             * @param {google.protobuf.EnumDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function EnumDescriptorProto(properties) {
                 this.value = [];
@@ -9706,19 +9706,19 @@ $root.google = (function() {
 
             /**
              * EnumDescriptorProto value.
-             * @type {Array.<google.protobuf.EnumValueDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IEnumValueDescriptorProto>}
              */
             EnumDescriptorProto.prototype.value = $util.emptyArray;
 
             /**
              * EnumDescriptorProto options.
-             * @type {(google.protobuf.EnumOptions$Properties|null)}
+             * @type {(google.protobuf.IEnumOptions|null)}
              */
             EnumDescriptorProto.prototype.options = null;
 
             /**
              * Creates a new EnumDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.EnumDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance
              */
             EnumDescriptorProto.create = function create(properties) {
@@ -9727,7 +9727,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.EnumDescriptorProto$Properties} message EnumDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9746,7 +9746,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.EnumDescriptorProto$Properties} message EnumDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9861,7 +9861,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumDescriptorProto.toObject = function toObject(message, options) {
@@ -9888,7 +9888,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this EnumDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumDescriptorProto.prototype.toObject = function toObject(options) {
@@ -9910,18 +9910,18 @@ $root.google = (function() {
 
             /**
              * Properties of an EnumValueDescriptorProto.
-             * @typedef google.protobuf.EnumValueDescriptorProto$Properties
-             * @type {Object}
+             * @interface IEnumValueDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] EnumValueDescriptorProto name.
              * @property {number} [number] EnumValueDescriptorProto number.
-             * @property {google.protobuf.EnumValueOptions$Properties} [options] EnumValueDescriptorProto options.
+             * @property {google.protobuf.IEnumValueOptions} [options] EnumValueDescriptorProto options.
              */
 
             /**
              * Constructs a new EnumValueDescriptorProto.
-             * @exports google.protobuf.EnumValueDescriptorProto
              * @constructor
-             * @param {google.protobuf.EnumValueDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function EnumValueDescriptorProto(properties) {
                 if (properties)
@@ -9944,13 +9944,13 @@ $root.google = (function() {
 
             /**
              * EnumValueDescriptorProto options.
-             * @type {(google.protobuf.EnumValueOptions$Properties|null)}
+             * @type {(google.protobuf.IEnumValueOptions|null)}
              */
             EnumValueDescriptorProto.prototype.options = null;
 
             /**
              * Creates a new EnumValueDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.EnumValueDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance
              */
             EnumValueDescriptorProto.create = function create(properties) {
@@ -9959,7 +9959,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.EnumValueDescriptorProto$Properties} message EnumValueDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -9977,7 +9977,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.EnumValueDescriptorProto$Properties} message EnumValueDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10076,7 +10076,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumValueDescriptorProto.toObject = function toObject(message, options) {
@@ -10099,7 +10099,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this EnumValueDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumValueDescriptorProto.prototype.toObject = function toObject(options) {
@@ -10121,18 +10121,18 @@ $root.google = (function() {
 
             /**
              * Properties of a ServiceDescriptorProto.
-             * @typedef google.protobuf.ServiceDescriptorProto$Properties
-             * @type {Object}
+             * @interface IServiceDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] ServiceDescriptorProto name.
-             * @property {Array.<google.protobuf.MethodDescriptorProto$Properties>} [method] ServiceDescriptorProto method.
-             * @property {google.protobuf.ServiceOptions$Properties} [options] ServiceDescriptorProto options.
+             * @property {Array.<google.protobuf.IMethodDescriptorProto>} [method] ServiceDescriptorProto method.
+             * @property {google.protobuf.IServiceOptions} [options] ServiceDescriptorProto options.
              */
 
             /**
              * Constructs a new ServiceDescriptorProto.
-             * @exports google.protobuf.ServiceDescriptorProto
              * @constructor
-             * @param {google.protobuf.ServiceDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function ServiceDescriptorProto(properties) {
                 this.method = [];
@@ -10150,19 +10150,19 @@ $root.google = (function() {
 
             /**
              * ServiceDescriptorProto method.
-             * @type {Array.<google.protobuf.MethodDescriptorProto$Properties>}
+             * @type {Array.<google.protobuf.IMethodDescriptorProto>}
              */
             ServiceDescriptorProto.prototype.method = $util.emptyArray;
 
             /**
              * ServiceDescriptorProto options.
-             * @type {(google.protobuf.ServiceOptions$Properties|null)}
+             * @type {(google.protobuf.IServiceOptions|null)}
              */
             ServiceDescriptorProto.prototype.options = null;
 
             /**
              * Creates a new ServiceDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.ServiceDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance
              */
             ServiceDescriptorProto.create = function create(properties) {
@@ -10171,7 +10171,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.ServiceDescriptorProto$Properties} message ServiceDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10190,7 +10190,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.ServiceDescriptorProto$Properties} message ServiceDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10305,7 +10305,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             ServiceDescriptorProto.toObject = function toObject(message, options) {
@@ -10332,7 +10332,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this ServiceDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             ServiceDescriptorProto.prototype.toObject = function toObject(options) {
@@ -10354,21 +10354,21 @@ $root.google = (function() {
 
             /**
              * Properties of a MethodDescriptorProto.
-             * @typedef google.protobuf.MethodDescriptorProto$Properties
-             * @type {Object}
+             * @interface IMethodDescriptorProto
+             * @memberof google.protobuf
              * @property {string} [name] MethodDescriptorProto name.
              * @property {string} [inputType] MethodDescriptorProto inputType.
              * @property {string} [outputType] MethodDescriptorProto outputType.
-             * @property {google.protobuf.MethodOptions$Properties} [options] MethodDescriptorProto options.
+             * @property {google.protobuf.IMethodOptions} [options] MethodDescriptorProto options.
              * @property {boolean} [clientStreaming] MethodDescriptorProto clientStreaming.
              * @property {boolean} [serverStreaming] MethodDescriptorProto serverStreaming.
              */
 
             /**
              * Constructs a new MethodDescriptorProto.
-             * @exports google.protobuf.MethodDescriptorProto
              * @constructor
-             * @param {google.protobuf.MethodDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function MethodDescriptorProto(properties) {
                 if (properties)
@@ -10397,7 +10397,7 @@ $root.google = (function() {
 
             /**
              * MethodDescriptorProto options.
-             * @type {(google.protobuf.MethodOptions$Properties|null)}
+             * @type {(google.protobuf.IMethodOptions|null)}
              */
             MethodDescriptorProto.prototype.options = null;
 
@@ -10415,7 +10415,7 @@ $root.google = (function() {
 
             /**
              * Creates a new MethodDescriptorProto instance using the specified properties.
-             * @param {google.protobuf.MethodDescriptorProto$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set
              * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance
              */
             MethodDescriptorProto.create = function create(properties) {
@@ -10424,7 +10424,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.MethodDescriptorProto$Properties} message MethodDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10448,7 +10448,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages.
-             * @param {google.protobuf.MethodDescriptorProto$Properties} message MethodDescriptorProto message or plain object to encode
+             * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10571,7 +10571,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified.
              * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MethodDescriptorProto.toObject = function toObject(message, options) {
@@ -10603,7 +10603,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this MethodDescriptorProto message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MethodDescriptorProto.prototype.toObject = function toObject(options) {
@@ -10625,8 +10625,8 @@ $root.google = (function() {
 
             /**
              * Properties of a FileOptions.
-             * @typedef google.protobuf.FileOptions$Properties
-             * @type {Object}
+             * @interface IFileOptions
+             * @memberof google.protobuf
              * @property {string} [javaPackage] FileOptions javaPackage.
              * @property {string} [javaOuterClassname] FileOptions javaOuterClassname.
              * @property {boolean} [javaMultipleFiles] FileOptions javaMultipleFiles.
@@ -10641,14 +10641,14 @@ $root.google = (function() {
              * @property {boolean} [ccEnableArenas] FileOptions ccEnableArenas.
              * @property {string} [objcClassPrefix] FileOptions objcClassPrefix.
              * @property {string} [csharpNamespace] FileOptions csharpNamespace.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] FileOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] FileOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new FileOptions.
-             * @exports google.protobuf.FileOptions
              * @constructor
-             * @param {google.protobuf.FileOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function FileOptions(properties) {
                 this.uninterpretedOption = [];
@@ -10744,13 +10744,13 @@ $root.google = (function() {
 
             /**
              * FileOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             FileOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new FileOptions instance using the specified properties.
-             * @param {google.protobuf.FileOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFileOptions=} [properties] Properties to set
              * @returns {google.protobuf.FileOptions} FileOptions instance
              */
             FileOptions.create = function create(properties) {
@@ -10759,7 +10759,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages.
-             * @param {google.protobuf.FileOptions$Properties} message FileOptions message or plain object to encode
+             * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -10802,7 +10802,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages.
-             * @param {google.protobuf.FileOptions$Properties} message FileOptions message or plain object to encode
+             * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11026,7 +11026,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a FileOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.FileOptions} message FileOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileOptions.toObject = function toObject(message, options) {
@@ -11089,7 +11089,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this FileOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FileOptions.prototype.toObject = function toObject(options) {
@@ -11107,8 +11107,8 @@ $root.google = (function() {
             /**
              * OptimizeMode enum.
              * @name OptimizeMode
-             * @memberof google.protobuf.FileOptions
              * @enum {number}
+             * @memberof google.protobuf.FileOptions
              * @property {number} SPEED=1 SPEED value
              * @property {number} CODE_SIZE=2 CODE_SIZE value
              * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value
@@ -11128,20 +11128,20 @@ $root.google = (function() {
 
             /**
              * Properties of a MessageOptions.
-             * @typedef google.protobuf.MessageOptions$Properties
-             * @type {Object}
+             * @interface IMessageOptions
+             * @memberof google.protobuf
              * @property {boolean} [messageSetWireFormat] MessageOptions messageSetWireFormat.
              * @property {boolean} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor.
              * @property {boolean} [deprecated] MessageOptions deprecated.
              * @property {boolean} [mapEntry] MessageOptions mapEntry.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] MessageOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] MessageOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new MessageOptions.
-             * @exports google.protobuf.MessageOptions
              * @constructor
-             * @param {google.protobuf.MessageOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMessageOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function MessageOptions(properties) {
                 this.uninterpretedOption = [];
@@ -11177,13 +11177,13 @@ $root.google = (function() {
 
             /**
              * MessageOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             MessageOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new MessageOptions instance using the specified properties.
-             * @param {google.protobuf.MessageOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMessageOptions=} [properties] Properties to set
              * @returns {google.protobuf.MessageOptions} MessageOptions instance
              */
             MessageOptions.create = function create(properties) {
@@ -11192,7 +11192,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages.
-             * @param {google.protobuf.MessageOptions$Properties} message MessageOptions message or plain object to encode
+             * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11215,7 +11215,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages.
-             * @param {google.protobuf.MessageOptions$Properties} message MessageOptions message or plain object to encode
+             * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11341,7 +11341,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a MessageOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.MessageOptions} message MessageOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MessageOptions.toObject = function toObject(message, options) {
@@ -11374,7 +11374,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this MessageOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MessageOptions.prototype.toObject = function toObject(options) {
@@ -11396,22 +11396,22 @@ $root.google = (function() {
 
             /**
              * Properties of a FieldOptions.
-             * @typedef google.protobuf.FieldOptions$Properties
-             * @type {Object}
+             * @interface IFieldOptions
+             * @memberof google.protobuf
              * @property {google.protobuf.FieldOptions.CType} [ctype] FieldOptions ctype.
              * @property {boolean} [packed] FieldOptions packed.
              * @property {google.protobuf.FieldOptions.JSType} [jstype] FieldOptions jstype.
              * @property {boolean} [lazy] FieldOptions lazy.
              * @property {boolean} [deprecated] FieldOptions deprecated.
              * @property {boolean} [weak] FieldOptions weak.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] FieldOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] FieldOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new FieldOptions.
-             * @exports google.protobuf.FieldOptions
              * @constructor
-             * @param {google.protobuf.FieldOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFieldOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function FieldOptions(properties) {
                 this.uninterpretedOption = [];
@@ -11459,13 +11459,13 @@ $root.google = (function() {
 
             /**
              * FieldOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             FieldOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new FieldOptions instance using the specified properties.
-             * @param {google.protobuf.FieldOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IFieldOptions=} [properties] Properties to set
              * @returns {google.protobuf.FieldOptions} FieldOptions instance
              */
             FieldOptions.create = function create(properties) {
@@ -11474,7 +11474,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages.
-             * @param {google.protobuf.FieldOptions$Properties} message FieldOptions message or plain object to encode
+             * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11501,7 +11501,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages.
-             * @param {google.protobuf.FieldOptions$Properties} message FieldOptions message or plain object to encode
+             * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11679,7 +11679,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a FieldOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.FieldOptions} message FieldOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FieldOptions.toObject = function toObject(message, options) {
@@ -11718,7 +11718,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this FieldOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             FieldOptions.prototype.toObject = function toObject(options) {
@@ -11736,8 +11736,8 @@ $root.google = (function() {
             /**
              * CType enum.
              * @name CType
-             * @memberof google.protobuf.FieldOptions
              * @enum {number}
+             * @memberof google.protobuf.FieldOptions
              * @property {number} STRING=0 STRING value
              * @property {number} CORD=1 CORD value
              * @property {number} STRING_PIECE=2 STRING_PIECE value
@@ -11753,8 +11753,8 @@ $root.google = (function() {
             /**
              * JSType enum.
              * @name JSType
-             * @memberof google.protobuf.FieldOptions
              * @enum {number}
+             * @memberof google.protobuf.FieldOptions
              * @property {number} JS_NORMAL=0 JS_NORMAL value
              * @property {number} JS_STRING=1 JS_STRING value
              * @property {number} JS_NUMBER=2 JS_NUMBER value
@@ -11774,16 +11774,16 @@ $root.google = (function() {
 
             /**
              * Properties of an OneofOptions.
-             * @typedef google.protobuf.OneofOptions$Properties
-             * @type {Object}
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] OneofOptions uninterpretedOption.
+             * @interface IOneofOptions
+             * @memberof google.protobuf
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] OneofOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new OneofOptions.
-             * @exports google.protobuf.OneofOptions
              * @constructor
-             * @param {google.protobuf.OneofOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IOneofOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function OneofOptions(properties) {
                 this.uninterpretedOption = [];
@@ -11795,13 +11795,13 @@ $root.google = (function() {
 
             /**
              * OneofOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             OneofOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new OneofOptions instance using the specified properties.
-             * @param {google.protobuf.OneofOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IOneofOptions=} [properties] Properties to set
              * @returns {google.protobuf.OneofOptions} OneofOptions instance
              */
             OneofOptions.create = function create(properties) {
@@ -11810,7 +11810,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages.
-             * @param {google.protobuf.OneofOptions$Properties} message OneofOptions message or plain object to encode
+             * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11825,7 +11825,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages.
-             * @param {google.protobuf.OneofOptions$Properties} message OneofOptions message or plain object to encode
+             * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -11919,7 +11919,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an OneofOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.OneofOptions} message OneofOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OneofOptions.toObject = function toObject(message, options) {
@@ -11938,7 +11938,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this OneofOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             OneofOptions.prototype.toObject = function toObject(options) {
@@ -11960,19 +11960,19 @@ $root.google = (function() {
 
             /**
              * Properties of an EnumOptions.
-             * @typedef google.protobuf.EnumOptions$Properties
-             * @type {Object}
+             * @interface IEnumOptions
+             * @memberof google.protobuf
              * @property {boolean} [allowAlias] EnumOptions allowAlias.
              * @property {boolean} [deprecated] EnumOptions deprecated.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] EnumOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] EnumOptions uninterpretedOption.
              * @property {string} [".jspb.test.IsExtension.simpleOption"] EnumOptions .jspb.test.IsExtension.simpleOption.
              */
 
             /**
              * Constructs a new EnumOptions.
-             * @exports google.protobuf.EnumOptions
              * @constructor
-             * @param {google.protobuf.EnumOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function EnumOptions(properties) {
                 this.uninterpretedOption = [];
@@ -11996,7 +11996,7 @@ $root.google = (function() {
 
             /**
              * EnumOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             EnumOptions.prototype.uninterpretedOption = $util.emptyArray;
 
@@ -12008,7 +12008,7 @@ $root.google = (function() {
 
             /**
              * Creates a new EnumOptions instance using the specified properties.
-             * @param {google.protobuf.EnumOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumOptions=} [properties] Properties to set
              * @returns {google.protobuf.EnumOptions} EnumOptions instance
              */
             EnumOptions.create = function create(properties) {
@@ -12017,7 +12017,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages.
-             * @param {google.protobuf.EnumOptions$Properties} message EnumOptions message or plain object to encode
+             * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12038,7 +12038,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages.
-             * @param {google.protobuf.EnumOptions$Properties} message EnumOptions message or plain object to encode
+             * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12156,7 +12156,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an EnumOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.EnumOptions} message EnumOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumOptions.toObject = function toObject(message, options) {
@@ -12186,7 +12186,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this EnumOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumOptions.prototype.toObject = function toObject(options) {
@@ -12208,17 +12208,17 @@ $root.google = (function() {
 
             /**
              * Properties of an EnumValueOptions.
-             * @typedef google.protobuf.EnumValueOptions$Properties
-             * @type {Object}
+             * @interface IEnumValueOptions
+             * @memberof google.protobuf
              * @property {boolean} [deprecated] EnumValueOptions deprecated.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] EnumValueOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] EnumValueOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new EnumValueOptions.
-             * @exports google.protobuf.EnumValueOptions
              * @constructor
-             * @param {google.protobuf.EnumValueOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function EnumValueOptions(properties) {
                 this.uninterpretedOption = [];
@@ -12236,13 +12236,13 @@ $root.google = (function() {
 
             /**
              * EnumValueOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new EnumValueOptions instance using the specified properties.
-             * @param {google.protobuf.EnumValueOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set
              * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance
              */
             EnumValueOptions.create = function create(properties) {
@@ -12251,7 +12251,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages.
-             * @param {google.protobuf.EnumValueOptions$Properties} message EnumValueOptions message or plain object to encode
+             * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12268,7 +12268,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages.
-             * @param {google.protobuf.EnumValueOptions$Properties} message EnumValueOptions message or plain object to encode
+             * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12370,7 +12370,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.EnumValueOptions} message EnumValueOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumValueOptions.toObject = function toObject(message, options) {
@@ -12393,7 +12393,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this EnumValueOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             EnumValueOptions.prototype.toObject = function toObject(options) {
@@ -12415,17 +12415,17 @@ $root.google = (function() {
 
             /**
              * Properties of a ServiceOptions.
-             * @typedef google.protobuf.ServiceOptions$Properties
-             * @type {Object}
+             * @interface IServiceOptions
+             * @memberof google.protobuf
              * @property {boolean} [deprecated] ServiceOptions deprecated.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] ServiceOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] ServiceOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new ServiceOptions.
-             * @exports google.protobuf.ServiceOptions
              * @constructor
-             * @param {google.protobuf.ServiceOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IServiceOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function ServiceOptions(properties) {
                 this.uninterpretedOption = [];
@@ -12443,13 +12443,13 @@ $root.google = (function() {
 
             /**
              * ServiceOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             ServiceOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new ServiceOptions instance using the specified properties.
-             * @param {google.protobuf.ServiceOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IServiceOptions=} [properties] Properties to set
              * @returns {google.protobuf.ServiceOptions} ServiceOptions instance
              */
             ServiceOptions.create = function create(properties) {
@@ -12458,7 +12458,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages.
-             * @param {google.protobuf.ServiceOptions$Properties} message ServiceOptions message or plain object to encode
+             * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12475,7 +12475,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages.
-             * @param {google.protobuf.ServiceOptions$Properties} message ServiceOptions message or plain object to encode
+             * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12577,7 +12577,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.ServiceOptions} message ServiceOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             ServiceOptions.toObject = function toObject(message, options) {
@@ -12600,7 +12600,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this ServiceOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             ServiceOptions.prototype.toObject = function toObject(options) {
@@ -12622,18 +12622,18 @@ $root.google = (function() {
 
             /**
              * Properties of a MethodOptions.
-             * @typedef google.protobuf.MethodOptions$Properties
-             * @type {Object}
+             * @interface IMethodOptions
+             * @memberof google.protobuf
              * @property {boolean} [deprecated] MethodOptions deprecated.
              * @property {google.protobuf.MethodOptions.IdempotencyLevel} [idempotencyLevel] MethodOptions idempotencyLevel.
-             * @property {Array.<google.protobuf.UninterpretedOption$Properties>} [uninterpretedOption] MethodOptions uninterpretedOption.
+             * @property {Array.<google.protobuf.IUninterpretedOption>} [uninterpretedOption] MethodOptions uninterpretedOption.
              */
 
             /**
              * Constructs a new MethodOptions.
-             * @exports google.protobuf.MethodOptions
              * @constructor
-             * @param {google.protobuf.MethodOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMethodOptions=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function MethodOptions(properties) {
                 this.uninterpretedOption = [];
@@ -12657,13 +12657,13 @@ $root.google = (function() {
 
             /**
              * MethodOptions uninterpretedOption.
-             * @type {Array.<google.protobuf.UninterpretedOption$Properties>}
+             * @type {Array.<google.protobuf.IUninterpretedOption>}
              */
             MethodOptions.prototype.uninterpretedOption = $util.emptyArray;
 
             /**
              * Creates a new MethodOptions instance using the specified properties.
-             * @param {google.protobuf.MethodOptions$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IMethodOptions=} [properties] Properties to set
              * @returns {google.protobuf.MethodOptions} MethodOptions instance
              */
             MethodOptions.create = function create(properties) {
@@ -12672,7 +12672,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages.
-             * @param {google.protobuf.MethodOptions$Properties} message MethodOptions message or plain object to encode
+             * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12691,7 +12691,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages.
-             * @param {google.protobuf.MethodOptions$Properties} message MethodOptions message or plain object to encode
+             * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12819,7 +12819,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a MethodOptions message. Also converts values to other types if specified.
              * @param {google.protobuf.MethodOptions} message MethodOptions
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MethodOptions.toObject = function toObject(message, options) {
@@ -12846,7 +12846,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this MethodOptions message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             MethodOptions.prototype.toObject = function toObject(options) {
@@ -12864,8 +12864,8 @@ $root.google = (function() {
             /**
              * IdempotencyLevel enum.
              * @name IdempotencyLevel
-             * @memberof google.protobuf.MethodOptions
              * @enum {number}
+             * @memberof google.protobuf.MethodOptions
              * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value
              * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value
              * @property {number} IDEMPOTENT=2 IDEMPOTENT value
@@ -12885,9 +12885,9 @@ $root.google = (function() {
 
             /**
              * Properties of an UninterpretedOption.
-             * @typedef google.protobuf.UninterpretedOption$Properties
-             * @type {Object}
-             * @property {Array.<google.protobuf.UninterpretedOption.NamePart$Properties>} [name] UninterpretedOption name.
+             * @interface IUninterpretedOption
+             * @memberof google.protobuf
+             * @property {Array.<google.protobuf.UninterpretedOption.INamePart>} [name] UninterpretedOption name.
              * @property {string} [identifierValue] UninterpretedOption identifierValue.
              * @property {number|Long} [positiveIntValue] UninterpretedOption positiveIntValue.
              * @property {number|Long} [negativeIntValue] UninterpretedOption negativeIntValue.
@@ -12898,9 +12898,9 @@ $root.google = (function() {
 
             /**
              * Constructs a new UninterpretedOption.
-             * @exports google.protobuf.UninterpretedOption
              * @constructor
-             * @param {google.protobuf.UninterpretedOption$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function UninterpretedOption(properties) {
                 this.name = [];
@@ -12912,7 +12912,7 @@ $root.google = (function() {
 
             /**
              * UninterpretedOption name.
-             * @type {Array.<google.protobuf.UninterpretedOption.NamePart$Properties>}
+             * @type {Array.<google.protobuf.UninterpretedOption.INamePart>}
              */
             UninterpretedOption.prototype.name = $util.emptyArray;
 
@@ -12954,7 +12954,7 @@ $root.google = (function() {
 
             /**
              * Creates a new UninterpretedOption instance using the specified properties.
-             * @param {google.protobuf.UninterpretedOption$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set
              * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance
              */
             UninterpretedOption.create = function create(properties) {
@@ -12963,7 +12963,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages.
-             * @param {google.protobuf.UninterpretedOption$Properties} message UninterpretedOption message or plain object to encode
+             * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -12990,7 +12990,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages.
-             * @param {google.protobuf.UninterpretedOption$Properties} message UninterpretedOption message or plain object to encode
+             * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -13149,7 +13149,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified.
              * @param {google.protobuf.UninterpretedOption} message UninterpretedOption
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             UninterpretedOption.toObject = function toObject(message, options) {
@@ -13202,7 +13202,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this UninterpretedOption message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             UninterpretedOption.prototype.toObject = function toObject(options) {
@@ -13221,17 +13221,17 @@ $root.google = (function() {
 
                 /**
                  * Properties of a NamePart.
-                 * @typedef google.protobuf.UninterpretedOption.NamePart$Properties
-                 * @type {Object}
+                 * @interface INamePart
+                 * @memberof google.protobuf.UninterpretedOption
                  * @property {string} namePart NamePart namePart.
                  * @property {boolean} isExtension NamePart isExtension.
                  */
 
                 /**
                  * Constructs a new NamePart.
-                 * @exports google.protobuf.UninterpretedOption.NamePart
                  * @constructor
-                 * @param {google.protobuf.UninterpretedOption.NamePart$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set
+                 * @memberof google.protobuf.UninterpretedOption
                  */
                 function NamePart(properties) {
                     if (properties)
@@ -13254,7 +13254,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new NamePart instance using the specified properties.
-                 * @param {google.protobuf.UninterpretedOption.NamePart$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set
                  * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance
                  */
                 NamePart.create = function create(properties) {
@@ -13263,7 +13263,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages.
-                 * @param {google.protobuf.UninterpretedOption.NamePart$Properties} message NamePart message or plain object to encode
+                 * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -13277,7 +13277,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages.
-                 * @param {google.protobuf.UninterpretedOption.NamePart$Properties} message NamePart message or plain object to encode
+                 * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -13365,7 +13365,7 @@ $root.google = (function() {
                 /**
                  * Creates a plain object from a NamePart message. Also converts values to other types if specified.
                  * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 NamePart.toObject = function toObject(message, options) {
@@ -13385,7 +13385,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a plain object from this NamePart message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 NamePart.prototype.toObject = function toObject(options) {
@@ -13410,16 +13410,16 @@ $root.google = (function() {
 
             /**
              * Properties of a SourceCodeInfo.
-             * @typedef google.protobuf.SourceCodeInfo$Properties
-             * @type {Object}
-             * @property {Array.<google.protobuf.SourceCodeInfo.Location$Properties>} [location] SourceCodeInfo location.
+             * @interface ISourceCodeInfo
+             * @memberof google.protobuf
+             * @property {Array.<google.protobuf.SourceCodeInfo.ILocation>} [location] SourceCodeInfo location.
              */
 
             /**
              * Constructs a new SourceCodeInfo.
-             * @exports google.protobuf.SourceCodeInfo
              * @constructor
-             * @param {google.protobuf.SourceCodeInfo$Properties=} [properties] Properties to set
+             * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function SourceCodeInfo(properties) {
                 this.location = [];
@@ -13431,13 +13431,13 @@ $root.google = (function() {
 
             /**
              * SourceCodeInfo location.
-             * @type {Array.<google.protobuf.SourceCodeInfo.Location$Properties>}
+             * @type {Array.<google.protobuf.SourceCodeInfo.ILocation>}
              */
             SourceCodeInfo.prototype.location = $util.emptyArray;
 
             /**
              * Creates a new SourceCodeInfo instance using the specified properties.
-             * @param {google.protobuf.SourceCodeInfo$Properties=} [properties] Properties to set
+             * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set
              * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance
              */
             SourceCodeInfo.create = function create(properties) {
@@ -13446,7 +13446,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages.
-             * @param {google.protobuf.SourceCodeInfo$Properties} message SourceCodeInfo message or plain object to encode
+             * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -13461,7 +13461,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages.
-             * @param {google.protobuf.SourceCodeInfo$Properties} message SourceCodeInfo message or plain object to encode
+             * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -13555,7 +13555,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified.
              * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             SourceCodeInfo.toObject = function toObject(message, options) {
@@ -13574,7 +13574,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this SourceCodeInfo message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             SourceCodeInfo.prototype.toObject = function toObject(options) {
@@ -13593,8 +13593,8 @@ $root.google = (function() {
 
                 /**
                  * Properties of a Location.
-                 * @typedef google.protobuf.SourceCodeInfo.Location$Properties
-                 * @type {Object}
+                 * @interface ILocation
+                 * @memberof google.protobuf.SourceCodeInfo
                  * @property {Array.<number>} [path] Location path.
                  * @property {Array.<number>} [span] Location span.
                  * @property {string} [leadingComments] Location leadingComments.
@@ -13604,9 +13604,9 @@ $root.google = (function() {
 
                 /**
                  * Constructs a new Location.
-                 * @exports google.protobuf.SourceCodeInfo.Location
                  * @constructor
-                 * @param {google.protobuf.SourceCodeInfo.Location$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set
+                 * @memberof google.protobuf.SourceCodeInfo
                  */
                 function Location(properties) {
                     this.path = [];
@@ -13650,7 +13650,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new Location instance using the specified properties.
-                 * @param {google.protobuf.SourceCodeInfo.Location$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set
                  * @returns {google.protobuf.SourceCodeInfo.Location} Location instance
                  */
                 Location.create = function create(properties) {
@@ -13659,7 +13659,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages.
-                 * @param {google.protobuf.SourceCodeInfo.Location$Properties} message Location message or plain object to encode
+                 * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -13690,7 +13690,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages.
-                 * @param {google.protobuf.SourceCodeInfo.Location$Properties} message Location message or plain object to encode
+                 * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -13843,7 +13843,7 @@ $root.google = (function() {
                 /**
                  * Creates a plain object from a Location message. Also converts values to other types if specified.
                  * @param {google.protobuf.SourceCodeInfo.Location} message Location
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Location.toObject = function toObject(message, options) {
@@ -13883,7 +13883,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a plain object from this Location message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Location.prototype.toObject = function toObject(options) {
@@ -13908,16 +13908,16 @@ $root.google = (function() {
 
             /**
              * Properties of a GeneratedCodeInfo.
-             * @typedef google.protobuf.GeneratedCodeInfo$Properties
-             * @type {Object}
-             * @property {Array.<google.protobuf.GeneratedCodeInfo.Annotation$Properties>} [annotation] GeneratedCodeInfo annotation.
+             * @interface IGeneratedCodeInfo
+             * @memberof google.protobuf
+             * @property {Array.<google.protobuf.GeneratedCodeInfo.IAnnotation>} [annotation] GeneratedCodeInfo annotation.
              */
 
             /**
              * Constructs a new GeneratedCodeInfo.
-             * @exports google.protobuf.GeneratedCodeInfo
              * @constructor
-             * @param {google.protobuf.GeneratedCodeInfo$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set
+             * @memberof google.protobuf
              */
             function GeneratedCodeInfo(properties) {
                 this.annotation = [];
@@ -13929,13 +13929,13 @@ $root.google = (function() {
 
             /**
              * GeneratedCodeInfo annotation.
-             * @type {Array.<google.protobuf.GeneratedCodeInfo.Annotation$Properties>}
+             * @type {Array.<google.protobuf.GeneratedCodeInfo.IAnnotation>}
              */
             GeneratedCodeInfo.prototype.annotation = $util.emptyArray;
 
             /**
              * Creates a new GeneratedCodeInfo instance using the specified properties.
-             * @param {google.protobuf.GeneratedCodeInfo$Properties=} [properties] Properties to set
+             * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set
              * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance
              */
             GeneratedCodeInfo.create = function create(properties) {
@@ -13944,7 +13944,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages.
-             * @param {google.protobuf.GeneratedCodeInfo$Properties} message GeneratedCodeInfo message or plain object to encode
+             * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -13959,7 +13959,7 @@ $root.google = (function() {
 
             /**
              * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages.
-             * @param {google.protobuf.GeneratedCodeInfo$Properties} message GeneratedCodeInfo message or plain object to encode
+             * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
@@ -14053,7 +14053,7 @@ $root.google = (function() {
             /**
              * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified.
              * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             GeneratedCodeInfo.toObject = function toObject(message, options) {
@@ -14072,7 +14072,7 @@ $root.google = (function() {
 
             /**
              * Creates a plain object from this GeneratedCodeInfo message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
             GeneratedCodeInfo.prototype.toObject = function toObject(options) {
@@ -14091,8 +14091,8 @@ $root.google = (function() {
 
                 /**
                  * Properties of an Annotation.
-                 * @typedef google.protobuf.GeneratedCodeInfo.Annotation$Properties
-                 * @type {Object}
+                 * @interface IAnnotation
+                 * @memberof google.protobuf.GeneratedCodeInfo
                  * @property {Array.<number>} [path] Annotation path.
                  * @property {string} [sourceFile] Annotation sourceFile.
                  * @property {number} [begin] Annotation begin.
@@ -14101,9 +14101,9 @@ $root.google = (function() {
 
                 /**
                  * Constructs a new Annotation.
-                 * @exports google.protobuf.GeneratedCodeInfo.Annotation
                  * @constructor
-                 * @param {google.protobuf.GeneratedCodeInfo.Annotation$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set
+                 * @memberof google.protobuf.GeneratedCodeInfo
                  */
                 function Annotation(properties) {
                     this.path = [];
@@ -14139,7 +14139,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new Annotation instance using the specified properties.
-                 * @param {google.protobuf.GeneratedCodeInfo.Annotation$Properties=} [properties] Properties to set
+                 * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set
                  * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance
                  */
                 Annotation.create = function create(properties) {
@@ -14148,7 +14148,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages.
-                 * @param {google.protobuf.GeneratedCodeInfo.Annotation$Properties} message Annotation message or plain object to encode
+                 * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -14172,7 +14172,7 @@ $root.google = (function() {
 
                 /**
                  * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages.
-                 * @param {google.protobuf.GeneratedCodeInfo.Annotation$Properties} message Annotation message or plain object to encode
+                 * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
@@ -14290,7 +14290,7 @@ $root.google = (function() {
                 /**
                  * Creates a plain object from an Annotation message. Also converts values to other types if specified.
                  * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Annotation.toObject = function toObject(message, options) {
@@ -14320,7 +14320,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a plain object from this Annotation message. Also converts values to other types if specified.
-                 * @param {$protobuf.ConversionOptions} [options] Conversion options
+                 * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
                 Annotation.prototype.toObject = function toObject(options) {