@@ -30,13 +30,14 @@
 @interface OFCreateWindowsRegistryKeyFailedException: OFException
 {
 	OFWindowsRegistryKey *_registryKey;
 	OFString *_path;
 	DWORD _options;
-	REGSAM _securityAndAccessRights;
+	REGSAM _accessRights;
 	LPSECURITY_ATTRIBUTES _Nullable _securityAttributes;
 	LSTATUS _status;
+	OF_RESERVE_IVARS(OFCreateWindowsRegistryKeyFailedException, 4)
 }
 
 /**
  * @brief The registry key on which creating the subkey failed.
  */
@@ -46,26 +47,25 @@
  * @brief The path for the subkey that could not be created.
  */
 @property (readonly, nonatomic) OFString *path;
 
 /**
- * @brief The options for the subkey that could not be created.
- */
-@property (readonly, nonatomic) DWORD options;
-
-/**
- * @brief The security and access rights for the subkey that could not be
- *	  created.
- */
-@property (readonly, nonatomic) REGSAM securityAndAccessRights;
+ * @brief The access rights for the subkey that could not be created.
+ */
+@property (readonly, nonatomic) REGSAM accessRights;
 
 /**
  * @brief The security options for the subkey that could not be created.
  */
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic)
     LPSECURITY_ATTRIBUTES securityAttributes;
 
+/**
+ * @brief The options for the subkey that could not be created.
+ */
+@property (readonly, nonatomic) DWORD options;
+
 /**
  * @brief The status returned by RegCreateKeyEx().
  */
 @property (readonly, nonatomic) LSTATUS status;
 
@@ -73,24 +73,24 @@
  * @brief Creates a new, autoreleased create Windows registry key failed
  *	  exception.
  *
  * @param registryKey The registry key on which creating the subkey failed
  * @param path The path for the subkey that could not be created
- * @param options The options for the subkey that could not be created
- * @param securityAndAccessRights The security and access rights for the sub
- *				  key that could not be created
+ * @param accessRights The access rights for the sub key that could not be
+ *		       created
  * @param securityAttributes The security options for the subkey that could
  *			     not be created
+ * @param options The options for the subkey that could not be created
  * @param status The status returned by RegCreateKeyEx()
  * @return A new, autoreleased creates Windows registry key failed exception
  */
 + (instancetype)
     exceptionWithRegistryKey: (OFWindowsRegistryKey *)registryKey
 			path: (OFString *)path
-		     options: (DWORD)options
-     securityAndAccessRights: (REGSAM)securityAndAccessRights
+		accessRights: (REGSAM)accessRights
 	  securityAttributes: (nullable LPSECURITY_ATTRIBUTES)securityAttributes
+		     options: (DWORD)options
 		      status: (LSTATUS)status;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
@@ -97,23 +97,23 @@
  * @brief Initializes an already allocated create Windows registry key failed
  *	  exception.
  *
  * @param registryKey The registry key on which creating the subkey failed
  * @param path The path for the subkey that could not be created
- * @param options The options for the subkey that could not be created
- * @param securityAndAccessRights The security and access rights for the sub
- *				  key that could not be created
+ * @param accessRights The access rights for the sub key that could not be
+ *		       created
  * @param securityAttributes The security options for the subkey that could
  *			     not be created
+ * @param options The options for the subkey that could not be created
  * @param status The status returned by RegCreateKeyEx()
  * @return An initialized create Windows registry key failed exception
  */
 - (instancetype)
 	initWithRegistryKey: (OFWindowsRegistryKey *)registryKey
 		       path: (OFString *)path
-		    options: (DWORD)options
-    securityAndAccessRights: (REGSAM)securityAndAccessRights
+	       accessRights: (REGSAM)accessRights
 	 securityAttributes: (nullable LPSECURITY_ATTRIBUTES)securityAttributes
+		    options: (DWORD)options
 		     status: (LSTATUS)status OF_DESIGNATED_INITIALIZER;
 @end
 
 OF_ASSUME_NONNULL_END