apple · tbkka · Nov 15, 2017 · Nov 14, 2017 · Nov 14, 2017
diff --git a/DevTools/CollectTests.awk b/DevTools/CollectTests.awk
@@ -38,7 +38,7 @@ BEGIN {
     printf("\n")
     printf("import XCTest\n")
     printf("@testable import SwiftProtobufTests\n")
-    printf("@testable import PluginLibraryTests\n")
+    printf("@testable import SwiftProtobufPluginLibraryTests\n")
     printf("\n")
 }
 

diff --git a/Documentation/PLUGIN.md b/Documentation/PLUGIN.md
@@ -139,7 +139,7 @@ $ protoc --swift_opt=ProtoPathModuleMappings=[path.asciipb] --swift_out=. foo/ba
 ```
 
 The format of that mapping file is defined in
-[swift_protobuf_module_mappings.proto](../Protos/PluginLibrary/swift_protobuf_module_mappings.proto),
+[swift_protobuf_module_mappings.proto](../Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto),
 and files would look something like:
 
 ```

diff --git a/Makefile b/Makefile
@@ -157,7 +157,7 @@ LIBRARY_PROTOS= \
 PLUGIN_PROTOS= \
 	Protos/google/protobuf/compiler/plugin.proto \
 	Protos/google/protobuf/descriptor.proto \
-	Protos/PluginLibrary/swift_protobuf_module_mappings.proto
+	Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
 
 # Protos that are used by the conformance test runner.
 CONFORMANCE_PROTOS= \
@@ -372,7 +372,7 @@ regenerate: \
 	regenerate-plugin-protos \
 	regenerate-test-protos \
 	regenerate-conformance-protos \
-	Tests/PluginLibraryTests/DescriptorTestData.swift
+	Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift
 
 # Rebuild just the protos included in the runtime library
 regenerate-library-protos: build ${PROTOC_GEN_SWIFT}
@@ -387,7 +387,7 @@ regenerate-plugin-protos: build ${PROTOC_GEN_SWIFT}
 	${GENERATE_SRCS} \
 		--tfiws_opt=FileNaming=DropPath \
 		--tfiws_opt=Visibility=Public \
-		--tfiws_out=Sources/PluginLibrary \
+		--tfiws_out=Sources/SwiftProtobufPluginLibrary \
 		${PLUGIN_PROTOS}
 
 # Rebuild just the protos used by the runtime test suite
@@ -400,7 +400,7 @@ regenerate-test-protos: build ${PROTOC_GEN_SWIFT} Protos/generated_swift_names_e
 		--tfiws_out=Tests/SwiftProtobufTests \
 		${TEST_PROTOS}
 
-Tests/PluginLibraryTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT} ${SWIFT_DESCRIPTOR_TEST_PROTOS}
+Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT} ${SWIFT_DESCRIPTOR_TEST_PROTOS}
 	@${PROTOC} \
 		--include_imports \
 		--descriptor_set_out=DescriptorTestData.bin \

diff --git a/Package.swift b/Package.swift
@@ -12,10 +12,10 @@ import PackageDescription
 let package = Package(
   name: "SwiftProtobuf",
   targets: [
-    Target(name: "PluginLibrary",
+    Target(name: "SwiftProtobufPluginLibrary",
            dependencies: ["SwiftProtobuf"]),
     Target(name: "protoc-gen-swift",
-           dependencies: ["PluginLibrary", "SwiftProtobuf"]),
+           dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     Target(name: "Conformance",
            dependencies: ["SwiftProtobuf"]),
   ]

diff --git a/[email protected] b/[email protected]
@@ -16,19 +16,20 @@ let package = Package(
   products: [
     .executable(name: "protoc-gen-swift", targets: ["protoc-gen-swift"]),
     .library(name: "SwiftProtobuf", type: .static, targets: ["SwiftProtobuf"]),
+    .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
     .target(name: "SwiftProtobuf"),
-    .target(name: "PluginLibrary",
+    .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
-            dependencies: ["PluginLibrary", "SwiftProtobuf"]),
+            dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
-    .testTarget(name: "PluginLibraryTests",
-                dependencies: ["PluginLibrary"]),
+    .testTarget(name: "SwiftProtobufPluginLibraryTests",
+                dependencies: ["SwiftProtobufPluginLibrary"]),
   ],
   swiftLanguageVersions: [3, 4]
 )
diff --git a/...rary/swift_protobuf_module_mappings.proto → ...rary/swift_protobuf_module_mappings.proto b/...rary/swift_protobuf_module_mappings.proto → ...rary/swift_protobuf_module_mappings.proto
@@ -1,4 +1,4 @@
-// Protos/PluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
+// Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
 //
 // This source file is part of the Swift.org open source project
 //

diff --git a/Protos/pluginlib_descriptor_test.proto b/Protos/pluginlib_descriptor_test.proto
@@ -10,7 +10,7 @@
 //
 // -----------------------------------------------------------------------------
 ///
-/// Test proto for Tests/PluginLibraryTests/Test_Descriptor.swift
+/// Test proto for Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift
 ///
 // -----------------------------------------------------------------------------
 

diff --git a/...y/swift_protobuf_module_mappings.pb.swift → ...y/swift_protobuf_module_mappings.pb.swift b/...y/swift_protobuf_module_mappings.pb.swift → ...y/swift_protobuf_module_mappings.pb.swift
@@ -1,12 +1,12 @@
 // DO NOT EDIT.
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: PluginLibrary/swift_protobuf_module_mappings.proto
+// Source: SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
 //
 // For information on using the generated types, please see the documenation:
 //   https://github.com/apple/swift-protobuf/
 
-// Protos/PluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
+// Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
 //
 // This source file is part of the Swift.org open source project
 //

diff --git a/Reference/pluginlib_descriptor_test.pb.swift b/Reference/pluginlib_descriptor_test.pb.swift
@@ -18,7 +18,7 @@
 //
 // -----------------------------------------------------------------------------
 ///
-/// Test proto for Tests/PluginLibraryTests/Test_Descriptor.swift
+/// Test proto for Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift
 ///
 // -----------------------------------------------------------------------------
 

diff --git a/Sources/PluginLibrary/Array+Extensions.swift → ...tobufPluginLibrary/Array+Extensions.swift b/Sources/PluginLibrary/Array+Extensions.swift → ...tobufPluginLibrary/Array+Extensions.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/Array+Extensions.swift - Additions to Arrays
+// Sources/SwiftProtobufPluginLibrary/Array+Extensions.swift - Additions to Arrays
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/CodePrinter.swift → ...ftProtobufPluginLibrary/CodePrinter.swift b/Sources/PluginLibrary/CodePrinter.swift → ...ftProtobufPluginLibrary/CodePrinter.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/CodePrinter.swift - Code output
+// Sources/SwiftProtobufPluginLibrary/CodePrinter.swift - Code output
 //
 // Copyright (c) 2014 - 2016 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...PluginLibrary/Descriptor+Extensions.swift → ...PluginLibrary/Descriptor+Extensions.swift b/...PluginLibrary/Descriptor+Extensions.swift → ...PluginLibrary/Descriptor+Extensions.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/Descriptor+Extensions.swift - Additions to Descriptor
+// Sources/SwiftProtobufPluginLibrary/Descriptor+Extensions.swift - Additions to Descriptor
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/Descriptor.swift → ...iftProtobufPluginLibrary/Descriptor.swift b/Sources/PluginLibrary/Descriptor.swift → ...iftProtobufPluginLibrary/Descriptor.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/Descriptor.swift - Descriptor wrappers
+// Sources/SwiftProtobufPluginLibrary/Descriptor.swift - Descriptor wrappers
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/FieldNumbers.swift → ...tProtobufPluginLibrary/FieldNumbers.swift b/Sources/PluginLibrary/FieldNumbers.swift → ...tProtobufPluginLibrary/FieldNumbers.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/FieldNumbers.swift - Proto Field numbers
+// Sources/SwiftProtobufPluginLibrary/FieldNumbers.swift - Proto Field numbers
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 ///
-/// Field numbers needed by PluginLibrary since they currently aren't generated.
+/// Field numbers needed by SwiftProtobufPluginLibrary since they currently aren't generated.
 ///
 // -----------------------------------------------------------------------------
 

diff --git a/...er_CodeGeneratorResponse+Extensions.swift → ...er_CodeGeneratorResponse+Extensions.swift b/...er_CodeGeneratorResponse+Extensions.swift → ...er_CodeGeneratorResponse+Extensions.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/Google_Protobuf_Compiler_CodeGeneratorResponse+Extensions.swift - CodeGeneratorResponse extensions
+// Sources/SwiftProtobufPluginLibrary/Google_Protobuf_Compiler_CodeGeneratorResponse+Extensions.swift - CodeGeneratorResponse extensions
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/..._Protobuf_SourceCodeInfo+Extensions.swift → ..._Protobuf_SourceCodeInfo+Extensions.swift b/..._Protobuf_SourceCodeInfo+Extensions.swift → ..._Protobuf_SourceCodeInfo+Extensions.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/Google_Protobuf_SourceCodeInfo+Extensions.swift - SourceCodeInfo Additions
+// Sources/SwiftProtobufPluginLibrary/Google_Protobuf_SourceCodeInfo+Extensions.swift - SourceCodeInfo Additions
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/HashableArray.swift → ...ProtobufPluginLibrary/HashableArray.swift b/Sources/PluginLibrary/HashableArray.swift → ...ProtobufPluginLibrary/HashableArray.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/HashableArray.swift - Wrapper array to support hashing
+// Sources/SwiftProtobufPluginLibrary/HashableArray.swift - Wrapper array to support hashing
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/NamingUtils.swift → ...ftProtobufPluginLibrary/NamingUtils.swift b/Sources/PluginLibrary/NamingUtils.swift → ...ftProtobufPluginLibrary/NamingUtils.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/NamingUtils.swift - Utilities for generating names
+// Sources/SwiftProtobufPluginLibrary/NamingUtils.swift - Utilities for generating names
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...inLibrary/ProtoFileToModuleMappings.swift → ...inLibrary/ProtoFileToModuleMappings.swift b/...inLibrary/ProtoFileToModuleMappings.swift → ...inLibrary/ProtoFileToModuleMappings.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/ProtoPathModuleMappings.swift - Helpers for module mappings option
+// Sources/SwiftProtobufPluginLibrary/ProtoPathModuleMappings.swift - Helpers for module mappings option
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/.../PluginLibrary/ProvidesLocationPath.swift → ...fPluginLibrary/ProvidesLocationPath.swift b/.../PluginLibrary/ProvidesLocationPath.swift → ...fPluginLibrary/ProvidesLocationPath.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/ProvidesLocationPath.swift - Proto Field numbers
+// Sources/SwiftProtobufPluginLibrary/ProvidesLocationPath.swift - Proto Field numbers
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...nLibrary/ProvidesSourceCodeLocation.swift → ...nLibrary/ProvidesSourceCodeLocation.swift b/...nLibrary/ProvidesSourceCodeLocation.swift → ...nLibrary/ProvidesSourceCodeLocation.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/ProvidesSourceCodeLocation.swift - SourceCodeInfo.Location provider
+// Sources/SwiftProtobufPluginLibrary/ProvidesSourceCodeLocation.swift - SourceCodeInfo.Location provider
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/SwiftLanguage.swift → ...ProtobufPluginLibrary/SwiftLanguage.swift b/Sources/PluginLibrary/SwiftLanguage.swift → ...ProtobufPluginLibrary/SwiftLanguage.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/SwiftLanguage.swift - Swift language utilities
+// Sources/SwiftProtobufPluginLibrary/SwiftLanguage.swift - Swift language utilities
 //
 // Copyright (c) 2014 - 2016 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...ces/PluginLibrary/SwiftProtobufInfo.swift → ...obufPluginLibrary/SwiftProtobufInfo.swift b/...ces/PluginLibrary/SwiftProtobufInfo.swift → ...obufPluginLibrary/SwiftProtobufInfo.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/LibraryInfo.swift - Helpers info about the SwiftProtobuf library
+// Sources/SwiftProtobufPluginLibrary/LibraryInfo.swift - Helpers info about the SwiftProtobuf library
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...es/PluginLibrary/SwiftProtobufNamer.swift → ...bufPluginLibrary/SwiftProtobufNamer.swift b/...es/PluginLibrary/SwiftProtobufNamer.swift → ...bufPluginLibrary/SwiftProtobufNamer.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/SwiftProtobufNamer.swift - A helper that generates SwiftProtobuf names.
+// Sources/SwiftProtobufPluginLibrary/SwiftProtobufNamer.swift - A helper that generates SwiftProtobuf names.
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/...ginLibrary/UnicodeScalar+Extensions.swift → ...ginLibrary/UnicodeScalar+Extensions.swift b/...ginLibrary/UnicodeScalar+Extensions.swift → ...ginLibrary/UnicodeScalar+Extensions.swift
@@ -1,4 +1,4 @@
-// Sources/PluginLibrary/UnicodeScalar+Extensions.swift - Utilities for working with UnicodeScalars
+// Sources/SwiftProtobufPluginLibrary/UnicodeScalar+Extensions.swift - Utilities for working with UnicodeScalars
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

diff --git a/Sources/PluginLibrary/descriptor.pb.swift → ...ProtobufPluginLibrary/descriptor.pb.swift b/Sources/PluginLibrary/descriptor.pb.swift → ...ProtobufPluginLibrary/descriptor.pb.swift
diff --git a/Sources/PluginLibrary/plugin.pb.swift → ...wiftProtobufPluginLibrary/plugin.pb.swift b/Sources/PluginLibrary/plugin.pb.swift → ...wiftProtobufPluginLibrary/plugin.pb.swift
diff --git a/...y/swift_protobuf_module_mappings.pb.swift → ...y/swift_protobuf_module_mappings.pb.swift b/...y/swift_protobuf_module_mappings.pb.swift → ...y/swift_protobuf_module_mappings.pb.swift
@@ -1,12 +1,12 @@
 // DO NOT EDIT.
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: PluginLibrary/swift_protobuf_module_mappings.proto
+// Source: SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
 //
 // For information on using the generated types, please see the documenation:
 //   https://github.com/apple/swift-protobuf/
 
-// Protos/PluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
+// Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
 //
 // This source file is part of the Swift.org open source project
 //

diff --git a/Sources/protoc-gen-swift/Descriptor+Extensions.swift b/Sources/protoc-gen-swift/Descriptor+Extensions.swift
@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 
 extension FileDescriptor {
   /// True if this file should perserve unknown enums within the enum.

diff --git a/Sources/protoc-gen-swift/EnumGenerator.swift b/Sources/protoc-gen-swift/EnumGenerator.swift
@@ -13,7 +13,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 /// The name of the case used to represent unrecognized values in proto3.

diff --git a/Sources/protoc-gen-swift/ExtensionSetGenerator.swift b/Sources/protoc-gen-swift/ExtensionSetGenerator.swift
@@ -15,7 +15,7 @@
 ///
 // -----------------------------------------------------------------------------
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 /// Provides the generation for proto2 syntax extensions in a file.

diff --git a/Sources/protoc-gen-swift/FieldGenerator.swift b/Sources/protoc-gen-swift/FieldGenerator.swift
@@ -14,7 +14,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 

diff --git a/Sources/protoc-gen-swift/FileGenerator.swift b/Sources/protoc-gen-swift/FileGenerator.swift
@@ -15,7 +15,7 @@
 ///
 // -----------------------------------------------------------------------------
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 

diff --git a/Sources/protoc-gen-swift/GeneratorOptions.swift b/Sources/protoc-gen-swift/GeneratorOptions.swift
@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 
 class GeneratorOptions {
   enum OutputNaming : String {

diff --git a/Sources/protoc-gen-swift/Google_Protobuf_DescriptorProto+Extensions.swift b/Sources/protoc-gen-swift/Google_Protobuf_DescriptorProto+Extensions.swift
@@ -14,7 +14,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 extension Google_Protobuf_DescriptorProto.ExtensionRange {

diff --git a/Sources/protoc-gen-swift/Google_Protobuf_FileDescriptorProto+Extensions.swift b/Sources/protoc-gen-swift/Google_Protobuf_FileDescriptorProto+Extensions.swift
@@ -13,7 +13,7 @@
 ///
 // -----------------------------------------------------------------------------
 
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 extension Google_Protobuf_FileDescriptorProto {

diff --git a/Sources/protoc-gen-swift/MessageFieldGenerator.swift b/Sources/protoc-gen-swift/MessageFieldGenerator.swift
@@ -13,7 +13,7 @@
 ///
 // -----------------------------------------------------------------------------
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 

diff --git a/Sources/protoc-gen-swift/MessageGenerator.swift b/Sources/protoc-gen-swift/MessageGenerator.swift
@@ -15,7 +15,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 class MessageGenerator {

diff --git a/Sources/protoc-gen-swift/MessageStorageClassGenerator.swift b/Sources/protoc-gen-swift/MessageStorageClassGenerator.swift
@@ -14,7 +14,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 /// Generates the `_StorageClass` used for messages that employ copy-on-write

diff --git a/Sources/protoc-gen-swift/OneofGenerator.swift b/Sources/protoc-gen-swift/OneofGenerator.swift
@@ -13,7 +13,7 @@
 ///
 // -----------------------------------------------------------------------------
 import Foundation
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 import SwiftProtobuf
 
 class OneofGenerator {

diff --git a/Sources/protoc-gen-swift/main.swift b/Sources/protoc-gen-swift/main.swift
@@ -21,7 +21,7 @@
 
 import Foundation
 import SwiftProtobuf
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 
 extension Google_Protobuf_Compiler_Version {
   fileprivate var versionString: String {

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -5,7 +5,7 @@
 
 import XCTest
 @testable import SwiftProtobufTests
-@testable import PluginLibraryTests
+@testable import SwiftProtobufPluginLibraryTests
 
 
 extension Test_Descriptor {

diff --git a/...LibraryTests/Descriptor+TestHelpers.swift → ...LibraryTests/Descriptor+TestHelpers.swift b/...LibraryTests/Descriptor+TestHelpers.swift → ...LibraryTests/Descriptor+TestHelpers.swift
@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 
-import PluginLibrary
+import SwiftProtobufPluginLibrary
 
 extension Google_Protobuf_FileDescriptorProto {
   init(name: String, dependencies: [String] = [], publicDependencies: [Int32] = []) {