diff --git a/src/actions/setConfirmPeriodBlocks.ts b/src/actions/setConfirmPeriodBlocks.ts
index 47b951a5..0a268a4e 100644
--- a/src/actions/setConfirmPeriodBlocks.ts
+++ b/src/actions/setConfirmPeriodBlocks.ts
@@ -7,12 +7,12 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetConfirmPeriodBlocksParameters<Curried extends boolean = false> = Prettify<
-  WithAccount<WithContractAddress<{ newPeriod: bigint }, 'rollupAdminLogic', Curried>>
+  WithAccount<ActionParameters<{ newPeriod: bigint }, 'rollupAdminLogic', Curried>>
 >;
 
 export type SetConfirmPeriodBlocksReturnType = PrepareTransactionRequestReturnType;
diff --git a/src/actions/setExtraChallengeTimeBlocks.ts b/src/actions/setExtraChallengeTimeBlocks.ts
index 4f35ce27..e12e82ba 100644
--- a/src/actions/setExtraChallengeTimeBlocks.ts
+++ b/src/actions/setExtraChallengeTimeBlocks.ts
@@ -7,12 +7,12 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetExtraChallengeTimeBlocksParameters<Curried extends boolean = false> = Prettify<
-  WithAccount<WithContractAddress<{ newExtraTimeBlocks: bigint }, 'rollupAdminLogic', Curried>>
+  WithAccount<ActionParameters<{ newExtraTimeBlocks: bigint }, 'rollupAdminLogic', Curried>>
 >;
 
 export type SetExtraChallengeTimeBlocksReturnType = PrepareTransactionRequestReturnType;
diff --git a/src/actions/setMinimumAssertionPeriod.ts b/src/actions/setMinimumAssertionPeriod.ts
index 051b7bc4..5e5269cd 100644
--- a/src/actions/setMinimumAssertionPeriod.ts
+++ b/src/actions/setMinimumAssertionPeriod.ts
@@ -7,12 +7,12 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetMinimumAssertionPeriodParameters<Curried extends boolean = false> = Prettify<
-  WithAccount<WithContractAddress<{ newPeriod: bigint }, 'rollupAdminLogic', Curried>>
+  WithAccount<ActionParameters<{ newPeriod: bigint }, 'rollupAdminLogic', Curried>>
 >;
 
 export type SetMinimumAssertionPeriodReturnType = PrepareTransactionRequestReturnType;
diff --git a/src/actions/setValidator.ts b/src/actions/setValidator.ts
index 1163e68b..fb215578 100644
--- a/src/actions/setValidator.ts
+++ b/src/actions/setValidator.ts
@@ -8,13 +8,13 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetIsValidatorParameters<Curried extends boolean = false> = Prettify<
   WithAccount<
-    WithContractAddress<
+    ActionParameters<
       {
         add: Address[];
         remove: Address[];
diff --git a/src/actions/setValidatorWhitelistDisabled.ts b/src/actions/setValidatorWhitelistDisabled.ts
index a6ecd8eb..0bd1a66a 100644
--- a/src/actions/setValidatorWhitelistDisabled.ts
+++ b/src/actions/setValidatorWhitelistDisabled.ts
@@ -7,12 +7,12 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetValidatorWhitelistDisabledParameters<Curried extends boolean = false> = Prettify<
-  WithAccount<WithContractAddress<{}, 'rollupAdminLogic', Curried>>
+  WithAccount<ActionParameters<{}, 'rollupAdminLogic', Curried>>
 >;
 
 export type SetValidatorWhitelistDisabledReturnType = PrepareTransactionRequestReturnType;
diff --git a/src/actions/setWasmModuleRoot.ts b/src/actions/setWasmModuleRoot.ts
index d9be7561..3613dd8b 100644
--- a/src/actions/setWasmModuleRoot.ts
+++ b/src/actions/setWasmModuleRoot.ts
@@ -8,13 +8,13 @@ import {
   encodeFunctionData,
 } from 'viem';
 import { rollupAdminLogic } from '../contracts';
-import { WithAccount, WithContractAddress } from '../types/Actions';
+import { WithAccount, ActionParameters } from '../types/Actions';
 import { Prettify } from '../types/utils';
 import { getRollupAddress } from '../getRollupAddress';
 
 export type SetWasmModuleRootParameters<Curried extends boolean = false> = Prettify<
   WithAccount<
-    WithContractAddress<
+    ActionParameters<
       {
         newWasmModuleRoot: Hex;
       },