diff --git a/Sources/SwiftSignal/Utils.swift b/Sources/SwiftSignal/Utils.swift
index 504aaa0f..e5134f02 100644
--- a/Sources/SwiftSignal/Utils.swift
+++ b/Sources/SwiftSignal/Utils.swift
@@ -45,7 +45,7 @@ func invokeFnReturningOptionalPublicKey(fn: (UnsafeMutablePointer<OpaquePointer?
 func invokeFnReturningCiphertextMessage(fn: (UnsafeMutablePointer<OpaquePointer?>?) -> SignalFfiErrorRef?) throws -> CiphertextMessage {
     var handle : OpaquePointer?
     try CheckError(fn(&handle))
-    return CiphertextMessage(raw_ptr: handle)
+    return CiphertextMessage(owned: handle)
 }
 
 func withIdentityKeyStore<Result>(_ store: IdentityKeyStore, _ body: (UnsafePointer<SignalIdentityKeyStore>) throws -> Result) throws -> Result {
diff --git a/Sources/SwiftSignal/messages/CiphertextMessage.swift b/Sources/SwiftSignal/messages/CiphertextMessage.swift
index 460d564d..21c2d211 100644
--- a/Sources/SwiftSignal/messages/CiphertextMessage.swift
+++ b/Sources/SwiftSignal/messages/CiphertextMessage.swift
@@ -9,8 +9,8 @@ class CiphertextMessage {
         signal_ciphertext_message_destroy(handle)
     }
 
-    internal init(raw_ptr: OpaquePointer?) {
-        handle = raw_ptr;
+    internal init(owned raw_ptr: OpaquePointer?) {
+        handle = raw_ptr
     }
 
     func serialize() throws -> [UInt8] {
diff --git a/Sources/SwiftSignal/messages/PreKeySignalMessage.swift b/Sources/SwiftSignal/messages/PreKeySignalMessage.swift
index ac193f13..fab252ff 100644
--- a/Sources/SwiftSignal/messages/PreKeySignalMessage.swift
+++ b/Sources/SwiftSignal/messages/PreKeySignalMessage.swift
@@ -70,7 +70,7 @@ class PreKeySignalMessage {
     func getSignalMessage() throws -> SignalMessage {
         var m : OpaquePointer?
         try CheckError(signal_pre_key_signal_message_get_signal_message(&m, handle))
-        return SignalMessage(raw_ptr: m)
+        return SignalMessage(owned: m)
     }
 
     internal func nativeHandle() -> OpaquePointer? {
diff --git a/Sources/SwiftSignal/messages/SignalMessage.swift b/Sources/SwiftSignal/messages/SignalMessage.swift
index 6e2a7515..9632e698 100644
--- a/Sources/SwiftSignal/messages/SignalMessage.swift
+++ b/Sources/SwiftSignal/messages/SignalMessage.swift
@@ -8,7 +8,7 @@ class SignalMessage {
         signal_message_destroy(handle)
     }
 
-    internal init(raw_ptr: OpaquePointer?) {
+    internal init(owned raw_ptr: OpaquePointer?) {
         handle = raw_ptr
     }