diff --git a/contracts/DecentHats.sol b/contracts/DecentHats.sol
index 48ce64f1..76f1f491 100644
--- a/contracts/DecentHats.sol
+++ b/contracts/DecentHats.sol
@@ -19,22 +19,22 @@ contract DecentHats {
     }
 
     IHats public hats;
-    address public keyValuePairs;
-    IERC6551Registry public registry;
     address public hatsAccountImplementation;
+    IERC6551Registry public registry;
+    address public keyValuePairs;
 
     bytes32 public constant SALT = keccak256("DecentHats");
 
     constructor(
         IHats _hats,
-        address _keyValuePairs,
+        address _hatsAccountImplementation,
         IERC6551Registry _registry,
-        address _hatsAccountImplementation
+        address _keyValuePairs
     ) {
         hats = _hats;
-        keyValuePairs = _keyValuePairs;
-        registry = _registry;
         hatsAccountImplementation = _hatsAccountImplementation;
+        registry = _registry;
+        keyValuePairs = _keyValuePairs;
     }
 
     function createAndDeclareTree(
diff --git a/test/DecentHats.test.ts b/test/DecentHats.test.ts
index 4c862bc0..6aafe8e4 100644
--- a/test/DecentHats.test.ts
+++ b/test/DecentHats.test.ts
@@ -100,9 +100,9 @@ describe("DecentHats", () => {
       await mockHatsAccountImplementation.getAddress();
     decentHats = await new DecentHats__factory(deployer).deploy(
       mockHatsAddress,
-      await keyValuePairs.getAddress(),
+      mockHatsAccountImplementationAddress,
       await erc6551Registry.getAddress(),
-      mockHatsAccountImplementationAddress
+      await keyValuePairs.getAddress()
     );
     decentHatsAddress = await decentHats.getAddress();