diff --git a/OpenVPN Adapter/OpenVPNClient.h b/OpenVPN Adapter/OpenVPNClient.h
index 08cb11c..4ffad1e 100644
--- a/OpenVPN Adapter/OpenVPNClient.h	
+++ b/OpenVPN Adapter/OpenVPNClient.h	
@@ -44,20 +44,22 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)establishTunnel;
 - (CFSocketNativeHandle)socketHandle;
 
-- (void)clientEvent:(NSString *)eventName message:(nullable NSString *)message;
-- (void)clientError:(NSString *)errorName fatal:(BOOL)fatal message:(nullable NSString *)message;
-- (void)clientLog:(NSString *)logMessage;
+- (void)clientEventName:(NSString *)eventName message:(nullable NSString *)message;
+- (void)clientErrorName:(NSString *)errorName fatal:(BOOL)fatal message:(nullable NSString *)message;
+- (void)clientLogMessage:(NSString *)logMessage;
 
 - (void)tick;
 
 - (void)resetSettings;
 @end
 
+NS_ASSUME_NONNULL_END
+
 using namespace openvpn;
 
 class OpenVPNClient : public ClientAPI::OpenVPNClient {
 public:
-    OpenVPNClient(id<OpenVPNClientDelegate> _delegate);
+    OpenVPNClient(id<OpenVPNClientDelegate> _Nonnull delegate);
     
     bool tun_builder_new() override;
     
@@ -93,7 +95,7 @@ public:
     void clock_tick() override;
     
 private:
-    __weak id<OpenVPNClientDelegate> delegate;
+    __weak id<OpenVPNClientDelegate> _Nonnull delegate;
 };
 
-NS_ASSUME_NONNULL_END
+
diff --git a/OpenVPN Adapter/OpenVPNClient.mm b/OpenVPN Adapter/OpenVPNClient.mm
index efdb96f..9e371a2 100644
--- a/OpenVPN Adapter/OpenVPNClient.mm	
+++ b/OpenVPN Adapter/OpenVPNClient.mm	
@@ -153,15 +153,15 @@ void OpenVPNClient::event(const ClientAPI::Event& ev) {
     NSString *message = [NSString stringWithUTF8String:ev.info.c_str()];
     
     if (ev.error) {
-        [this->delegate clientError:name fatal:ev.fatal message:message.length ? message : nil];
+        [this->delegate clientErrorName:name fatal:ev.fatal message:message.length ? message : nil];
     } else {
-        [this->delegate clientEvent:name message:message.length ? message : nil];
+        [this->delegate clientEventName:name message:message.length ? message : nil];
     }
 }
 
 void OpenVPNClient::log(const ClientAPI::LogInfo& log) {
     NSString *logMessage = [NSString stringWithUTF8String:log.text.c_str()];
-    [this->delegate clientLog:logMessage];
+    [this->delegate clientLogMessage:logMessage];
 }
 
 void OpenVPNClient::clock_tick() {