diff --git a/ProtocolBuffers-Swift.podspec b/ProtocolBuffers-Swift.podspec
index ef5fa5a..45c7cbf 100644
--- a/ProtocolBuffers-Swift.podspec
+++ b/ProtocolBuffers-Swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ProtocolBuffers-Swift"
-  s.version      = "3.0.21"
+  s.version      = "3.0.22"
   s.summary      = "Protocol Buffers for Swift"
   s.homepage     = "http://protobuf.io#swift"
   s.license      = "Apache 2.0"
diff --git a/Source/Google.Protobuf.Any.proto.swift b/Source/Google.Protobuf.Any.proto.swift
index 7b12056..4e477b5 100644
--- a/Source/Google.Protobuf.Any.proto.swift
+++ b/Source/Google.Protobuf.Any.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "any.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.Api.proto.swift b/Source/Google.Protobuf.Api.proto.swift
index 3f78b0f..e03fce3 100644
--- a/Source/Google.Protobuf.Api.proto.swift
+++ b/Source/Google.Protobuf.Api.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "api.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.Compiler.Plugin.proto.swift b/Source/Google.Protobuf.Compiler.Plugin.proto.swift
index 8437581..5206767 100644
--- a/Source/Google.Protobuf.Compiler.Plugin.proto.swift
+++ b/Source/Google.Protobuf.Compiler.Plugin.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "plugin.proto"
 /// Syntax "Proto2"
 
diff --git a/Source/Google.Protobuf.Duration.proto.swift b/Source/Google.Protobuf.Duration.proto.swift
index 0eaed68..b82ef06 100644
--- a/Source/Google.Protobuf.Duration.proto.swift
+++ b/Source/Google.Protobuf.Duration.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "duration.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.Empty.proto.swift b/Source/Google.Protobuf.Empty.proto.swift
index a8ec979..cda0b6c 100644
--- a/Source/Google.Protobuf.Empty.proto.swift
+++ b/Source/Google.Protobuf.Empty.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "empty.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.FieldMask.proto.swift b/Source/Google.Protobuf.FieldMask.proto.swift
index b932871..21ea714 100644
--- a/Source/Google.Protobuf.FieldMask.proto.swift
+++ b/Source/Google.Protobuf.FieldMask.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "field_mask.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.SourceContext.proto.swift b/Source/Google.Protobuf.SourceContext.proto.swift
index df45ac4..84501eb 100644
--- a/Source/Google.Protobuf.SourceContext.proto.swift
+++ b/Source/Google.Protobuf.SourceContext.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "source_context.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.Struct.proto.swift b/Source/Google.Protobuf.Struct.proto.swift
index 5e2e1d8..a49d605 100644
--- a/Source/Google.Protobuf.Struct.proto.swift
+++ b/Source/Google.Protobuf.Struct.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "struct.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.SwiftDescriptor.proto.swift b/Source/Google.Protobuf.SwiftDescriptor.proto.swift
index 4bd610d..4fa56f7 100644
--- a/Source/Google.Protobuf.SwiftDescriptor.proto.swift
+++ b/Source/Google.Protobuf.SwiftDescriptor.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "swift-descriptor.proto"
 /// Syntax "Proto2"
 
diff --git a/Source/Google.Protobuf.Timestamp.proto.swift b/Source/Google.Protobuf.Timestamp.proto.swift
index fd039eb..693509f 100644
--- a/Source/Google.Protobuf.Timestamp.proto.swift
+++ b/Source/Google.Protobuf.Timestamp.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "timestamp.proto"
 /// Syntax "Proto3"
 
diff --git a/Source/Google.Protobuf.Type.proto.swift b/Source/Google.Protobuf.Type.proto.swift
index 05b225a..72b6c89 100644
--- a/Source/Google.Protobuf.Type.proto.swift
+++ b/Source/Google.Protobuf.Type.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "type.proto"
 /// Syntax "Proto3"
 
@@ -24,10 +24,10 @@ public extension Google.Protobuf {
     }
 
     /// A light-weight descriptor for a proto message type.
-    final public class `Type` : GeneratedMessage {
-        public typealias BuilderType = Google.Protobuf.`Type`.Builder
+    final public class ProtoType : GeneratedMessage {
+        public typealias BuilderType = Google.Protobuf.ProtoType.Builder
 
-        public static func == (lhs: Google.Protobuf.`Type`, rhs: Google.Protobuf.`Type`) -> Bool {
+        public static func == (lhs: Google.Protobuf.ProtoType, rhs: Google.Protobuf.ProtoType) -> Bool {
             if lhs === rhs {
                 return true
             }
@@ -109,23 +109,23 @@ public extension Google.Protobuf {
             memoizedSerializedSize = serialize_size
             return serialize_size
         }
-        public class func getBuilder() -> Google.Protobuf.`Type`.Builder {
-            return Google.Protobuf.`Type`.classBuilder() as! Google.Protobuf.`Type`.Builder
+        public class func getBuilder() -> Google.Protobuf.ProtoType.Builder {
+            return Google.Protobuf.ProtoType.classBuilder() as! Google.Protobuf.ProtoType.Builder
         }
-        public func getBuilder() -> Google.Protobuf.`Type`.Builder {
-            return classBuilder() as! Google.Protobuf.`Type`.Builder
+        public func getBuilder() -> Google.Protobuf.ProtoType.Builder {
+            return classBuilder() as! Google.Protobuf.ProtoType.Builder
         }
         override public class func classBuilder() -> ProtocolBuffersMessageBuilder {
-            return Google.Protobuf.`Type`.Builder()
+            return Google.Protobuf.ProtoType.Builder()
         }
         override public func classBuilder() -> ProtocolBuffersMessageBuilder {
-            return Google.Protobuf.`Type`.Builder()
+            return Google.Protobuf.ProtoType.Builder()
         }
-        public func toBuilder() throws -> Google.Protobuf.`Type`.Builder {
-            return try Google.Protobuf.`Type`.builderWithPrototype(prototype:self)
+        public func toBuilder() throws -> Google.Protobuf.ProtoType.Builder {
+            return try Google.Protobuf.ProtoType.builderWithPrototype(prototype:self)
         }
-        public class func builderWithPrototype(prototype:Google.Protobuf.`Type`) throws -> Google.Protobuf.`Type`.Builder {
-            return try Google.Protobuf.`Type`.Builder().mergeFrom(other:prototype)
+        public class func builderWithPrototype(prototype:Google.Protobuf.ProtoType) throws -> Google.Protobuf.ProtoType.Builder {
+            return try Google.Protobuf.ProtoType.Builder().mergeFrom(other:prototype)
         }
         override public func encode() throws -> Dictionary<String,Any> {
             guard isInitialized() else {
@@ -164,11 +164,11 @@ public extension Google.Protobuf {
             }
             return jsonMap
         }
-        override class public func decode(jsonMap:Dictionary<String,Any>) throws -> Google.Protobuf.`Type` {
-            return try Google.Protobuf.`Type`.Builder.decodeToBuilder(jsonMap:jsonMap).build()
+        override class public func decode(jsonMap:Dictionary<String,Any>) throws -> Google.Protobuf.ProtoType {
+            return try Google.Protobuf.ProtoType.Builder.decodeToBuilder(jsonMap:jsonMap).build()
         }
-        override class public func fromJSON(data:Data) throws -> Google.Protobuf.`Type` {
-            return try Google.Protobuf.`Type`.Builder.fromJSONToBuilder(data:data).build()
+        override class public func fromJSON(data:Data) throws -> Google.Protobuf.ProtoType {
+            return try Google.Protobuf.ProtoType.Builder.fromJSONToBuilder(data:data).build()
         }
         override public func getDescription(indent:String) throws -> String {
             var output = ""
@@ -233,16 +233,16 @@ public extension Google.Protobuf {
         //Meta information declaration start
 
         override public class func className() -> String {
-            return "Google.Protobuf.`Type`"
+            return "Google.Protobuf.ProtoType"
         }
         override public func className() -> String {
-            return "Google.Protobuf.`Type`"
+            return "Google.Protobuf.ProtoType"
         }
         //Meta information declaration end
 
         final public class Builder : GeneratedMessageBuilder {
-            fileprivate var builderResult:Google.Protobuf.`Type` = Google.Protobuf.`Type`()
-            public func getMessage() -> Google.Protobuf.`Type` {
+            fileprivate var builderResult:Google.Protobuf.ProtoType = Google.Protobuf.ProtoType()
+            public func getMessage() -> Google.Protobuf.ProtoType {
                 return builderResult
             }
 
@@ -265,12 +265,12 @@ public extension Google.Protobuf {
                 }
             }
             @discardableResult
-            public func setName(_ value:String) -> Google.Protobuf.`Type`.Builder {
+            public func setName(_ value:String) -> Google.Protobuf.ProtoType.Builder {
                 self.name = value
                 return self
             }
             @discardableResult
-            public func clearName() -> Google.Protobuf.`Type`.Builder{
+            public func clearName() -> Google.Protobuf.ProtoType.Builder{
                 builderResult.hasName = false
                 builderResult.name = nil
                 return self
@@ -285,12 +285,12 @@ public extension Google.Protobuf {
                 }
             }
             @discardableResult
-            public func setFields(_ value:Array<Google.Protobuf.Field>) -> Google.Protobuf.`Type`.Builder {
+            public func setFields(_ value:Array<Google.Protobuf.Field>) -> Google.Protobuf.ProtoType.Builder {
                 self.fields = value
                 return self
             }
             @discardableResult
-            public func clearFields() -> Google.Protobuf.`Type`.Builder {
+            public func clearFields() -> Google.Protobuf.ProtoType.Builder {
                 builderResult.fields.removeAll(keepingCapacity: false)
                 return self
             }
@@ -305,12 +305,12 @@ public extension Google.Protobuf {
                 }
             }
             @discardableResult
-            public func setOneofs(_ value:Array<String>) -> Google.Protobuf.`Type`.Builder {
+            public func setOneofs(_ value:Array<String>) -> Google.Protobuf.ProtoType.Builder {
                 self.oneofs = value
                 return self
             }
             @discardableResult
-            public func clearOneofs() -> Google.Protobuf.`Type`.Builder {
+            public func clearOneofs() -> Google.Protobuf.ProtoType.Builder {
                 builderResult.oneofs.removeAll(keepingCapacity: false)
                 return self
             }
@@ -324,12 +324,12 @@ public extension Google.Protobuf {
                 }
             }
             @discardableResult
-            public func setOptions(_ value:Array<Google.Protobuf.Option>) -> Google.Protobuf.`Type`.Builder {
+            public func setOptions(_ value:Array<Google.Protobuf.Option>) -> Google.Protobuf.ProtoType.Builder {
                 self.options = value
                 return self
             }
             @discardableResult
-            public func clearOptions() -> Google.Protobuf.`Type`.Builder {
+            public func clearOptions() -> Google.Protobuf.ProtoType.Builder {
                 builderResult.options.removeAll(keepingCapacity: false)
                 return self
             }
@@ -367,12 +367,12 @@ public extension Google.Protobuf {
                 return sourceContextBuilder_
             }
             @discardableResult
-            public func setSourceContext(_ value:Google.Protobuf.SourceContext!) -> Google.Protobuf.`Type`.Builder {
+            public func setSourceContext(_ value:Google.Protobuf.SourceContext!) -> Google.Protobuf.ProtoType.Builder {
                 self.sourceContext = value
                 return self
             }
             @discardableResult
-            public func mergeSourceContext(value:Google.Protobuf.SourceContext) throws -> Google.Protobuf.`Type`.Builder {
+            public func mergeSourceContext(value:Google.Protobuf.SourceContext) throws -> Google.Protobuf.ProtoType.Builder {
                 if builderResult.hasSourceContext {
                     builderResult.sourceContext = try Google.Protobuf.SourceContext.builderWithPrototype(prototype:builderResult.sourceContext).mergeFrom(other: value).buildPartial()
                 } else {
@@ -382,7 +382,7 @@ public extension Google.Protobuf {
                 return self
             }
             @discardableResult
-            public func clearSourceContext() -> Google.Protobuf.`Type`.Builder {
+            public func clearSourceContext() -> Google.Protobuf.ProtoType.Builder {
                 sourceContextBuilder_ = nil
                 builderResult.hasSourceContext = false
                 builderResult.sourceContext = nil
@@ -394,24 +394,24 @@ public extension Google.Protobuf {
                 }
             }
             @discardableResult
-            override public func clear() -> Google.Protobuf.`Type`.Builder {
-                builderResult = Google.Protobuf.`Type`()
+            override public func clear() -> Google.Protobuf.ProtoType.Builder {
+                builderResult = Google.Protobuf.ProtoType()
                 return self
             }
-            override public func clone() throws -> Google.Protobuf.`Type`.Builder {
-                return try Google.Protobuf.`Type`.builderWithPrototype(prototype:builderResult)
+            override public func clone() throws -> Google.Protobuf.ProtoType.Builder {
+                return try Google.Protobuf.ProtoType.builderWithPrototype(prototype:builderResult)
             }
-            override public func build() throws -> Google.Protobuf.`Type` {
+            override public func build() throws -> Google.Protobuf.ProtoType {
                 try checkInitialized()
                 return buildPartial()
             }
-            public func buildPartial() -> Google.Protobuf.`Type` {
-                let returnMe:Google.Protobuf.`Type` = builderResult
+            public func buildPartial() -> Google.Protobuf.ProtoType {
+                let returnMe:Google.Protobuf.ProtoType = builderResult
                 return returnMe
             }
             @discardableResult
-            public func mergeFrom(other:Google.Protobuf.`Type`) throws -> Google.Protobuf.`Type`.Builder {
-                if other == Google.Protobuf.`Type`() {
+            public func mergeFrom(other:Google.Protobuf.ProtoType) throws -> Google.Protobuf.ProtoType.Builder {
+                if other == Google.Protobuf.ProtoType() {
                     return self
                 }
                 if other.hasName {
@@ -433,11 +433,11 @@ public extension Google.Protobuf {
                 return self
             }
             @discardableResult
-            override public func mergeFrom(codedInputStream: CodedInputStream) throws -> Google.Protobuf.`Type`.Builder {
+            override public func mergeFrom(codedInputStream: CodedInputStream) throws -> Google.Protobuf.ProtoType.Builder {
                 return try mergeFrom(codedInputStream: codedInputStream, extensionRegistry:ExtensionRegistry())
             }
             @discardableResult
-            override public func mergeFrom(codedInputStream: CodedInputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.`Type`.Builder {
+            override public func mergeFrom(codedInputStream: CodedInputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.ProtoType.Builder {
                 let unknownFieldsBuilder:UnknownFieldSet.Builder = try UnknownFieldSet.builderWithUnknownFields(copyFrom:self.unknownFields)
                 while (true) {
                     let protobufTag = try codedInputStream.readTag()
@@ -478,8 +478,8 @@ public extension Google.Protobuf {
                     }
                 }
             }
-            class override public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Google.Protobuf.`Type`.Builder {
-                let resultDecodedBuilder = Google.Protobuf.`Type`.Builder()
+            class override public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Google.Protobuf.ProtoType.Builder {
+                let resultDecodedBuilder = Google.Protobuf.ProtoType.Builder()
                 if let jsonValueName = jsonMap["name"] as? String {
                     resultDecodedBuilder.name = jsonValueName
                 }
@@ -514,12 +514,12 @@ public extension Google.Protobuf {
                 }
                 return resultDecodedBuilder
             }
-            override class public func fromJSONToBuilder(data:Data) throws -> Google.Protobuf.`Type`.Builder {
+            override class public func fromJSONToBuilder(data:Data) throws -> Google.Protobuf.ProtoType.Builder {
                 let jsonData = try JSONSerialization.jsonObject(with:data, options: JSONSerialization.ReadingOptions(rawValue: 0))
                 guard let jsDataCast = jsonData as? Dictionary<String,Any> else {
                   throw ProtocolBuffersError.invalidProtocolBuffer("Invalid JSON data")
                 }
-                return try Google.Protobuf.`Type`.Builder.decodeToBuilder(jsonMap:jsDataCast)
+                return try Google.Protobuf.ProtoType.Builder.decodeToBuilder(jsonMap:jsDataCast)
             }
         }
 
@@ -2434,34 +2434,34 @@ public extension Google.Protobuf {
     }
 
 }
-extension Google.Protobuf.`Type`: GeneratedMessageProtocol {
-    public class func parseArrayDelimitedFrom(inputStream: InputStream) throws -> Array<Google.Protobuf.`Type`> {
-        var mergedArray = Array<Google.Protobuf.`Type`>()
+extension Google.Protobuf.ProtoType: GeneratedMessageProtocol {
+    public class func parseArrayDelimitedFrom(inputStream: InputStream) throws -> Array<Google.Protobuf.ProtoType> {
+        var mergedArray = Array<Google.Protobuf.ProtoType>()
         while let value = try parseDelimitedFrom(inputStream: inputStream) {
           mergedArray.append(value)
         }
         return mergedArray
     }
-    public class func parseDelimitedFrom(inputStream: InputStream) throws -> Google.Protobuf.`Type`? {
-        return try Google.Protobuf.`Type`.Builder().mergeDelimitedFrom(inputStream: inputStream)?.build()
+    public class func parseDelimitedFrom(inputStream: InputStream) throws -> Google.Protobuf.ProtoType? {
+        return try Google.Protobuf.ProtoType.Builder().mergeDelimitedFrom(inputStream: inputStream)?.build()
     }
-    public class func parseFrom(data: Data) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(data: data, extensionRegistry:Google.Protobuf.TypeRoot.default.extensionRegistry).build()
+    public class func parseFrom(data: Data) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(data: data, extensionRegistry:Google.Protobuf.TypeRoot.default.extensionRegistry).build()
     }
-    public class func parseFrom(data: Data, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(data: data, extensionRegistry:extensionRegistry).build()
+    public class func parseFrom(data: Data, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(data: data, extensionRegistry:extensionRegistry).build()
     }
-    public class func parseFrom(inputStream: InputStream) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(inputStream: inputStream).build()
+    public class func parseFrom(inputStream: InputStream) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(inputStream: inputStream).build()
     }
-    public class func parseFrom(inputStream: InputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(inputStream: inputStream, extensionRegistry:extensionRegistry).build()
+    public class func parseFrom(inputStream: InputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(inputStream: inputStream, extensionRegistry:extensionRegistry).build()
     }
-    public class func parseFrom(codedInputStream: CodedInputStream) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(codedInputStream: codedInputStream).build()
+    public class func parseFrom(codedInputStream: CodedInputStream) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(codedInputStream: codedInputStream).build()
     }
-    public class func parseFrom(codedInputStream: CodedInputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.`Type` {
-        return try Google.Protobuf.`Type`.Builder().mergeFrom(codedInputStream: codedInputStream, extensionRegistry:extensionRegistry).build()
+    public class func parseFrom(codedInputStream: CodedInputStream, extensionRegistry:ExtensionRegistry) throws -> Google.Protobuf.ProtoType {
+        return try Google.Protobuf.ProtoType.Builder().mergeFrom(codedInputStream: codedInputStream, extensionRegistry:extensionRegistry).build()
     }
     public subscript(key: String) -> Any? {
         switch key {
@@ -2474,8 +2474,8 @@ extension Google.Protobuf.`Type`: GeneratedMessageProtocol {
         }
     }
 }
-extension Google.Protobuf.`Type`.Builder: GeneratedMessageBuilderProtocol {
-    public typealias GeneratedMessageType = Google.Protobuf.`Type`
+extension Google.Protobuf.ProtoType.Builder: GeneratedMessageBuilderProtocol {
+    public typealias GeneratedMessageType = Google.Protobuf.ProtoType
     public subscript(key: String) -> Any? {
         get { 
             switch key {
diff --git a/Source/Google.Protobuf.Wrappers.proto.swift b/Source/Google.Protobuf.Wrappers.proto.swift
index 0d58ba9..31f83b0 100644
--- a/Source/Google.Protobuf.Wrappers.proto.swift
+++ b/Source/Google.Protobuf.Wrappers.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "wrappers.proto"
 /// Syntax "Proto3"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift
index 30dea9e..5c7aa1f 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "performance.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift
index a9676ee..678ba02 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "foo.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift
index addc6a6..e2c5f84 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "foo.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift
index 5dbc51c..db5012c 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_no_generic_services.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift
index cd2fb45..58b6652 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_enormous_descriptor.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift
index 4c8f1cc..423d298 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_arena.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift
index de0d13a..1452d7d 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_no_arena_import.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift
index 1dfc712..42b7c78 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_no_field_presence.proto"
 /// Syntax "Proto3"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift
index 2d047d7..2031929 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_proto3_arena.proto"
 /// Syntax "Proto3"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift
index 311e112..f66f1e4 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_preserve_unknown_enum.proto"
 /// Syntax "Proto3"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift
index 2320449..b4bf8ca 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift
index 09c2e4b..d19d32f 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_custom_options.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift
index 8bae099..56e3482 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_embed_optimize_for.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift
index 939d7d4..b3facd3 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_lite.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift
index cb835b6..60ae98d 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_lite_imports_nonlite.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift
index 411eecc..08427b6 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_mset.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift
index 95f6ddb..6d5b6d0 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_optimize_for.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift
index 2239103..5a46261 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_well_known_types.proto"
 /// Syntax "Proto3"
 
@@ -71,7 +71,7 @@ public extension ProtobufUnittest {
         public fileprivate(set) var hasStructField:Bool = false
         public fileprivate(set) var timestampField:Google.Protobuf.Timestamp!
         public fileprivate(set) var hasTimestampField:Bool = false
-        public fileprivate(set) var typeField:Google.Protobuf.`Type`!
+        public fileprivate(set) var typeField:Google.Protobuf.ProtoType!
         public fileprivate(set) var hasTypeField:Bool = false
         public fileprivate(set) var int32Field:Google.Protobuf.Int32Value!
         public fileprivate(set) var hasInt32Field:Bool = false
@@ -822,7 +822,7 @@ public extension ProtobufUnittest {
                 builderResult.timestampField = nil
                 return self
             }
-            public var typeField:Google.Protobuf.`Type`! {
+            public var typeField:Google.Protobuf.ProtoType! {
                 get {
                     if typeFieldBuilder_ != nil {
                         builderResult.typeField = typeFieldBuilder_.getMessage()
@@ -839,14 +839,14 @@ public extension ProtobufUnittest {
                     return builderResult.hasTypeField
                 }
             }
-            fileprivate var typeFieldBuilder_:Google.Protobuf.`Type`.Builder! {
+            fileprivate var typeFieldBuilder_:Google.Protobuf.ProtoType.Builder! {
                 didSet {
                     builderResult.hasTypeField = true
                 }
             }
-            public func getTypeFieldBuilder() -> Google.Protobuf.`Type`.Builder {
+            public func getTypeFieldBuilder() -> Google.Protobuf.ProtoType.Builder {
                 if typeFieldBuilder_ == nil {
-                    typeFieldBuilder_ = Google.Protobuf.`Type`.Builder()
+                    typeFieldBuilder_ = Google.Protobuf.ProtoType.Builder()
                     builderResult.typeField = typeFieldBuilder_.getMessage()
                     if typeField != nil {
                         try! typeFieldBuilder_.mergeFrom(other: typeField)
@@ -855,14 +855,14 @@ public extension ProtobufUnittest {
                 return typeFieldBuilder_
             }
             @discardableResult
-            public func setTypeField(_ value:Google.Protobuf.`Type`!) -> ProtobufUnittest.TestWellKnownTypes.Builder {
+            public func setTypeField(_ value:Google.Protobuf.ProtoType!) -> ProtobufUnittest.TestWellKnownTypes.Builder {
                 self.typeField = value
                 return self
             }
             @discardableResult
-            public func mergeTypeField(value:Google.Protobuf.`Type`) throws -> ProtobufUnittest.TestWellKnownTypes.Builder {
+            public func mergeTypeField(value:Google.Protobuf.ProtoType) throws -> ProtobufUnittest.TestWellKnownTypes.Builder {
                 if builderResult.hasTypeField {
-                    builderResult.typeField = try Google.Protobuf.`Type`.builderWithPrototype(prototype:builderResult.typeField).mergeFrom(other: value).buildPartial()
+                    builderResult.typeField = try Google.Protobuf.ProtoType.builderWithPrototype(prototype:builderResult.typeField).mergeFrom(other: value).buildPartial()
                 } else {
                     builderResult.typeField = value
                 }
@@ -1068,7 +1068,7 @@ public extension ProtobufUnittest {
                         timestampField = subBuilder.buildPartial()
 
                     case 74:
-                        let subBuilder:Google.Protobuf.`Type`.Builder = Google.Protobuf.`Type`.Builder()
+                        let subBuilder:Google.Protobuf.ProtoType.Builder = Google.Protobuf.ProtoType.Builder()
                         if hasTypeField {
                             try subBuilder.mergeFrom(other: typeField)
                         }
@@ -1126,7 +1126,7 @@ public extension ProtobufUnittest {
 
                 }
                 if let jsonValueTypeField = jsonMap["typeField"] as? Dictionary<String,Any> {
-                    resultDecodedBuilder.typeField = try Google.Protobuf.`Type`.Builder.decodeToBuilder(jsonMap:jsonValueTypeField).build()
+                    resultDecodedBuilder.typeField = try Google.Protobuf.ProtoType.Builder.decodeToBuilder(jsonMap:jsonValueTypeField).build()
 
                 }
                 if let jsonValueInt32Field = jsonMap["int32Field"] as? Dictionary<String,Any> {
@@ -1253,7 +1253,7 @@ extension ProtobufUnittest.TestWellKnownTypes.Builder: GeneratedMessageBuilderPr
                 }
                 self.timestampField = newSubscriptValue
             case "typeField":
-                guard let newSubscriptValue = newSubscriptValue as? Google.Protobuf.`Type` else {
+                guard let newSubscriptValue = newSubscriptValue as? Google.Protobuf.ProtoType else {
                     return
                 }
                 self.typeField = newSubscriptValue
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift
index ef484c1..3ca646d 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_import.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift
index 71f0275..c2e608f 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_import_lite.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift
index 7f590c2..9730ad4 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_import_public.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift
index c7bc189..c9ef2f2 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_import_public_lite.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift
index 169e88f..bab1d0a 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_no_arena.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift
index e8475a8..9e77be1 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_maps.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift
index 835c9e2..e8af77f 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_drop_unknown_fields.proto"
 /// Syntax "Proto3"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift
index c5d7600..111eb42 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_empty.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift
index 2a49c2e..dbd634d 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_error_type.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift
index 77d9a0c..b102ef3 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_struct.proto"
 /// Syntax "Proto2"
 
diff --git a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift
index 0737233..d95fc79 100644
--- a/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift
+++ b/plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift
@@ -1,5 +1,5 @@
 /// Generated by the Protocol Buffers 3.3.0 compiler.  DO NOT EDIT!
-/// Protobuf-swift version: 3.0.20
+/// Protobuf-swift version: 3.0.21
 /// Source file "unittest_threading.proto"
 /// Syntax "Proto3"