Index: iOS/AddSiteController.swift
==================================================================
--- iOS/AddSiteController.swift
+++ iOS/AddSiteController.swift
@@ -20,11 +20,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 import UIKit
 import ObjFW
-import ObjFW_Bridge
+import ObjFWBridge
 
 class AddSiteController: UITableViewController {
     @IBOutlet var nameField: UITextField?
     @IBOutlet var lengthField: UITextField?
     @IBOutlet var legacySwitch: UISwitch?

Index: iOS/CryptoPassphrase.xcodeproj/project.pbxproj
==================================================================
--- iOS/CryptoPassphrase.xcodeproj/project.pbxproj
+++ iOS/CryptoPassphrase.xcodeproj/project.pbxproj
@@ -17,13 +17,13 @@
 		4B5BCEFF22B5E36900E551BD /* ShowDetailsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */; };
 		4B93656E22B5ADA00099DD08 /* HTTPServerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */; };
 		4B93657022B5AE2C0099DD08 /* AboutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656F22B5AE2C0099DD08 /* AboutController.swift */; };
 		4B93657222B5B1FB0099DD08 /* AddSiteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93657122B5B1FB0099DD08 /* AddSiteController.swift */; };
 		4B9525251F96BB900095F259 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525231F96BB820095F259 /* ObjFW.framework */; };
-		4B9525261F96BB900095F259 /* ObjFW_Bridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525241F96BB820095F259 /* ObjFW_Bridge.framework */; };
+		4B9525261F96BB900095F259 /* ObjFWBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525241F96BB820095F259 /* ObjFWBridge.framework */; };
 		4B9525291F994CD30095F259 /* ObjFW.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525231F96BB820095F259 /* ObjFW.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		4B95252A1F9953350095F259 /* ObjFW_Bridge.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525241F96BB820095F259 /* ObjFW_Bridge.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		4B95252A1F9953350095F259 /* ObjFWBridge.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525241F96BB820095F259 /* ObjFWBridge.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; };
 		4BA115D31DA9432D007ED4EA /* NewPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; };
 		4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA115D51DA94390007ED4EA /* UIKit.framework */; };
 		4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */; };
 		4BF4C3A022B602F50034FCED /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4C39F22B602F50034FCED /* main.m */; };
@@ -34,12 +34,12 @@
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 12;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				4B95252A1F9953350095F259 /* ObjFW_Bridge.framework in Embed Frameworks */,
 				4B9525291F994CD30095F259 /* ObjFW.framework in Embed Frameworks */,
+				4B95252A1F9953350095F259 /* ObjFWBridge.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -58,11 +58,11 @@
 		4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowDetailsController.swift; sourceTree = "<group>"; };
 		4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPServerDelegate.swift; sourceTree = "<group>"; };
 		4B93656F22B5AE2C0099DD08 /* AboutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutController.swift; sourceTree = "<group>"; };
 		4B93657122B5B1FB0099DD08 /* AddSiteController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteController.swift; sourceTree = "<group>"; };
 		4B9525231F96BB820095F259 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = ObjFW/Frameworks/ObjFW.framework; sourceTree = "<group>"; };
-		4B9525241F96BB820095F259 /* ObjFW_Bridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW_Bridge.framework; path = ObjFW/Frameworks/ObjFW_Bridge.framework; sourceTree = "<group>"; };
+		4B9525241F96BB820095F259 /* ObjFWBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFWBridge.framework; path = ObjFW/Frameworks/ObjFWBridge.framework; sourceTree = "<group>"; };
 		4BA115CD1DA9432D007ED4EA /* LegacyPasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyPasswordGenerator.h; path = ../LegacyPasswordGenerator.h; sourceTree = "<group>"; };
 		4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LegacyPasswordGenerator.m; path = ../LegacyPasswordGenerator.m; sourceTree = "<group>"; };
 		4BA115CF1DA9432D007ED4EA /* NewPasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NewPasswordGenerator.h; path = ../NewPasswordGenerator.h; sourceTree = "<group>"; };
 		4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NewPasswordGenerator.m; path = ../NewPasswordGenerator.m; sourceTree = "<group>"; };
 		4BA115D11DA9432D007ED4EA /* PasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PasswordGenerator.h; path = ../PasswordGenerator.h; sourceTree = "<group>"; };
@@ -77,11 +77,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */,
 				4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */,
 				4B9525251F96BB900095F259 /* ObjFW.framework in Frameworks */,
-				4B9525261F96BB900095F259 /* ObjFW_Bridge.framework in Frameworks */,
+				4B9525261F96BB900095F259 /* ObjFWBridge.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
@@ -139,11 +139,11 @@
 		};
 		4BA115D41DA94390007ED4EA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				4B9525231F96BB820095F259 /* ObjFW.framework */,
-				4B9525241F96BB820095F259 /* ObjFW_Bridge.framework */,
+				4B9525241F96BB820095F259 /* ObjFWBridge.framework */,
 				4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */,
 				4BA115D51DA94390007ED4EA /* UIKit.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

Index: iOS/ShowDetailsController.swift
==================================================================
--- iOS/ShowDetailsController.swift
+++ iOS/ShowDetailsController.swift
@@ -20,11 +20,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 import UIKit
 import ObjFW
-import ObjFW_Bridge
+import ObjFWBridge
 
 class ShowDetailsController: UITableViewController, UITextFieldDelegate {
     @IBOutlet var nameField: UITextField?
     @IBOutlet var lengthField: UITextField?
     @IBOutlet var legacySwitch: UISwitch?

Index: iOS/SiteStorage.swift
==================================================================
--- iOS/SiteStorage.swift
+++ iOS/SiteStorage.swift
@@ -19,11 +19,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 import ObjFW
-import ObjFW_Bridge
+import ObjFWBridge
 
 class SiteStorage: OFObject {
     private typealias Storage =
         OFMutableDictionary<OFString, OFDictionary<OFNumber, AnyObject>>
 

Index: iOS/main.m
==================================================================
--- iOS/main.m
+++ iOS/main.m
@@ -18,13 +18,13 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
-#import <ObjFW/ObjFW.h>
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import UIKit;
+@import ObjFW;
+@import ObjFWBridge;
 
 #import "CryptoPassphrase-Swift.h"
 
 @interface OFAppDelegate: OFObject <OFApplicationDelegate>
 @end