diff --git a/remappings.txt b/remappings.txt
index 5ebbf61..680c3dd 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -3,3 +3,5 @@
 @aragon/osx/=lib/osx/packages/contracts/src/
 @ensdomains/ens-contracts/=lib/ens-contracts/
 @layerzero/=lib/solidity-examples/contracts/
+@layerzero/=lib/solidity-examples/contracts/
+forge-std/=lib/forge-std/src/
diff --git a/script/2.OptimisticTokenVotingPlugin.s.sol b/script/2.OptimisticTokenVotingPlugin.s.sol
index 99b545b..4542a93 100644
--- a/script/2.OptimisticTokenVotingPlugin.s.sol
+++ b/script/2.OptimisticTokenVotingPlugin.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import {Script, console2} from "forge-std/Script.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {OptimisticLzVotingPluginSetup} from "../src/OptimisticLzVotingPluginSetup.sol";
+import {OptimisticLzVotingPluginSetup} from "../src/setup/OptimisticLzVotingPluginSetup.sol";
 import {OptimisticLzVotingPlugin} from "../src/OptimisticLzVotingPlugin.sol";
 import {DAOFactory} from "@aragon/osx/framework/dao/DAOFactory.sol";
 import {GovernanceERC20} from "@aragon/osx/token/ERC20/governance/GovernanceERC20.sol";
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
index bf1ed30..8c566d8 100644
--- a/script/Deploy.s.sol
+++ b/script/Deploy.s.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.13;
 
 import {VmSafe} from "forge-std/Vm.sol";
 import {Script, console2} from "forge-std/Script.sol";
-import {OptimisticTokenVotingPluginSetup} from "../src/setup/OptimisticTokenVotingPluginSetup.sol";
+import {OptimisticLzVotingPluginSetup} from "../src/setup/OptimisticLzVotingPluginSetup.sol";
 import {MultisigPluginSetup} from "../src/setup/MultisigPluginSetup.sol";
 import {EmergencyMultisigPluginSetup} from "../src/setup/EmergencyMultisigPluginSetup.sol";
-import {OptimisticTokenVotingPlugin} from "../src/OptimisticTokenVotingPlugin.sol";
+import {OptimisticLzVotingPlugin} from "../src/OptimisticLzVotingPlugin.sol";
 import {GovernanceERC20} from "@aragon/osx/token/ERC20/governance/GovernanceERC20.sol";
 import {GovernanceWrappedERC20} from "@aragon/osx/token/ERC20/governance/GovernanceWrappedERC20.sol";
 import {PluginRepoFactory} from "@aragon/osx/framework/plugin/repo/PluginRepoFactory.sol";
@@ -252,7 +252,7 @@ contract Deploy is Script {
         returns (address, PluginRepo, IPluginSetup.PreparedSetupData memory)
     {
         // Deploy plugin setup
-        OptimisticTokenVotingPluginSetup pluginSetup = new OptimisticTokenVotingPluginSetup(
+        OptimisticLzVotingPluginSetup pluginSetup = new OptimisticLzVotingPluginSetup(
                 GovernanceERC20(governanceERC20Base),
                 GovernanceWrappedERC20(governanceWrappedERC20Base)
             );
@@ -268,17 +268,20 @@ contract Deploy is Script {
             );
 
         // Plugin settings
-        OptimisticTokenVotingPlugin.OptimisticGovernanceSettings
-            memory votingSettings = OptimisticTokenVotingPlugin
+        OptimisticLzVotingPlugin.OptimisticGovernanceSettings
+            memory votingSettings = OptimisticLzVotingPlugin
                 .OptimisticGovernanceSettings(
                     200000, // minVetoRatio - 20%
                     0, // minDuration (the condition will enforce it)
                     0 // minProposerVotingPower
                 );
 
-        OptimisticTokenVotingPluginSetup.TokenSettings
-            memory tokenSettings = OptimisticTokenVotingPluginSetup
-                .TokenSettings(tokenAddress, "", "");
+        OptimisticLzVotingPluginSetup.TokenSettings
+            memory tokenSettings = OptimisticLzVotingPluginSetup.TokenSettings(
+                tokenAddress,
+                "",
+                ""
+            );
 
         address[] memory holders = new address[](0);
         uint256[] memory amounts = new uint256[](0);
diff --git a/src/conditions/StandardProposalCondition.sol b/src/conditions/StandardProposalCondition.sol
index 229154c..4705556 100644
--- a/src/conditions/StandardProposalCondition.sol
+++ b/src/conditions/StandardProposalCondition.sol
@@ -5,7 +5,8 @@ pragma solidity ^0.8.17;
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IPermissionCondition} from "@aragon/osx/core/permission/IPermissionCondition.sol";
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
-import {OptimisticTokenVotingPlugin} from "../OptimisticTokenVotingPlugin.sol";
+import {OptimisticLzVotingPlugin} from "../OptimisticLzVotingPlugin.sol";
+
 // import {PermissionCondition} from "@aragon/osx/core/permission/PermissionCondition.sol";
 
 /// @title PermissionCondition
@@ -44,7 +45,7 @@ contract StandardProposalCondition is ERC165, IPermissionCondition {
         // Is it createProposal()?
         if (
             _getSelector(_data) !=
-            OptimisticTokenVotingPlugin.createProposal.selector
+            OptimisticLzVotingPlugin.createProposal.selector
         ) {
             return false;
         }
diff --git a/test/OptimisticTokenVotingPluginSetup.t.sol b/test/OptimisticTokenVotingPluginSetup.t.sol
index 0baf6a4..8c629ff 100644
--- a/test/OptimisticTokenVotingPluginSetup.t.sol
+++ b/test/OptimisticTokenVotingPluginSetup.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import {Test, console2} from "forge-std/Test.sol";
 import {OptimisticLzVotingPlugin} from "../src/OptimisticLzVotingPlugin.sol";
-import {OptimisticLzVotingPluginSetup} from "../src/OptimisticLzVotingPluginSetup.sol";
+import {OptimisticLzVotingPluginSetup} from "../src/setup/OptimisticLzVotingPluginSetup.sol";
 import {GovernanceERC20} from "@aragon/osx/token/ERC20/governance/GovernanceERC20.sol";
 import {GovernanceWrappedERC20} from "@aragon/osx/token/ERC20/governance/GovernanceWrappedERC20.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";