diff --git a/osdep/mac/event_helper.swift b/osdep/mac/event_helper.swift
index fa2cd8e01e..7170136478 100644
--- a/osdep/mac/event_helper.swift
+++ b/osdep/mac/event_helper.swift
@@ -62,15 +62,15 @@ class EventHelper {
     var mpv: OpaquePointer?
     var events: [String:[Int:EventSubscriber]] = [:]
 
-    init?(_ appHub: AppHub, _ mpvHandle: OpaquePointer) {
+    init?(_ appHub: AppHub, _ mpv: OpaquePointer) {
         if !appHub.isApplication {
-            mpv_destroy(mpvHandle)
+            mpv_destroy(mpv)
             return nil
         }
 
         self.appHub = appHub
-        self.mpv = mpvHandle
-        mpv_set_wakeup_callback(mpvHandle, wakeup, TypeHelper.bridge(obj: self))
+        self.mpv = mpv
+        mpv_set_wakeup_callback(mpv, wakeup, TypeHelper.bridge(obj: self))
     }
 
     func subscribe(_ subscriber: any EventSubscriber, event: Event) {
diff --git a/osdep/mac/libmpv_helper.swift b/osdep/mac/libmpv_helper.swift
index 4be6ee6e45..61cac8e74c 100644
--- a/osdep/mac/libmpv_helper.swift
+++ b/osdep/mac/libmpv_helper.swift
@@ -23,13 +23,13 @@ let glDummy: @convention(c) () -> Void = {}
 
 class LibmpvHelper {
     var log: LogHelper
-    var mpvHandle: OpaquePointer?
+    var mpv: OpaquePointer?
     var mpvRenderContext: OpaquePointer?
     var fbo: GLint = 1
     let uninitLock = NSLock()
 
     init(_ mpv: OpaquePointer, _ mpLog: OpaquePointer?) {
-        mpvHandle = mpv
+        self.mpv = mpv
         log = LogHelper(mpLog)
     }
 
@@ -47,7 +47,7 @@ class LibmpvHelper {
                 mpv_render_param()
             ]
 
-            if (mpv_render_context_create(&mpvRenderContext, mpvHandle, &params) < 0) {
+            if (mpv_render_context_create(&mpvRenderContext, mpv, &params) < 0) {
                 log.sendError("Render context init has failed.")
                 exit(1)
             }
@@ -174,8 +174,8 @@ class LibmpvHelper {
         uninitLock.lock()
         mpv_render_context_free(mpvRenderContext)
         mpvRenderContext = nil
-        mpv_destroy(mpvHandle)
-        mpvHandle = nil
+        mpv_destroy(mpv)
+        mpv = nil
         uninitLock.unlock()
     }
 }
diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 36721391c8..1e207b253d 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -30,11 +30,10 @@ class CocoaCB: Common, EventSubscriber {
     }
     var backendState: State = .uninitialized
 
-
-    init(_ mpvHandle: OpaquePointer) {
-        let newlog = mp_log_new(UnsafeMutablePointer(mpvHandle), mp_client_get_log(mpvHandle), "cocoacb")
-        let option = OptionHelper(UnsafeMutablePointer(mpvHandle), mp_client_get_global(mpvHandle))
-        libmpv = LibmpvHelper(mpvHandle, newlog)
+    init(_ mpv: OpaquePointer) {
+        let newlog = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "cocoacb")
+        let option = OptionHelper(UnsafeMutablePointer(mpv), mp_client_get_global(mpv))
+        libmpv = LibmpvHelper(mpv, newlog)
         super.init(option, newlog)
         layer = GLLayer(cocoaCB: self)
         AppHub.shared.event?.subscribe(self, event: .init(name: "MPV_EVENT_SHUTDOWN"))