diff --git a/OpenVPN Adapter/OpenVPNConfiguration.mm b/OpenVPN Adapter/OpenVPNConfiguration.mm
index 2745241..7cee211 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration.mm	
+++ b/OpenVPN Adapter/OpenVPNConfiguration.mm	
@@ -6,7 +6,7 @@
 //
 //
 
-#import "OpenVPNConfigurationValues.h"
+#import "OpenVPNValues.h"
 #import "OpenVPNConfiguration.h"
 #import "OpenVPNConfiguration+Internal.h"
 
@@ -314,7 +314,7 @@ using namespace openvpn;
 }
 
 - (NSDictionary<NSString *,NSString *> *)peerInfo {
-    if (_config.peerInfo.size() == 0) {
+    if (_config.peerInfo.empty()) {
         return nil;
     }
     
diff --git a/OpenVPN Adapter/OpenVPNConfigurationValues.h b/OpenVPN Adapter/OpenVPNValues.h
similarity index 100%
rename from OpenVPN Adapter/OpenVPNConfigurationValues.h
rename to OpenVPN Adapter/OpenVPNValues.h
diff --git a/OpenVPN Adapter/OpenVPNConfigurationValues.mm b/OpenVPN Adapter/OpenVPNValues.mm
similarity index 97%
rename from OpenVPN Adapter/OpenVPNConfigurationValues.mm
rename to OpenVPN Adapter/OpenVPNValues.mm
index 5e1df44..53737cd 100644
--- a/OpenVPN Adapter/OpenVPNConfigurationValues.mm	
+++ b/OpenVPN Adapter/OpenVPNValues.mm	
@@ -6,7 +6,7 @@
 //
 //
 
-#import "OpenVPNConfigurationValues.h"
+#import "OpenVPNValues.h"
 
 NSString * const OpenVPNTransportProtocolUDPValue = @"udp";
 NSString * const OpenVPNTransportProtocolTCPValue = @"tcp";