diff --git a/property_tests/arbitraries/candid/candid_definition_arb/index.ts b/property_tests/arbitraries/candid/candid_definition_arb/index.ts
index a6721975f1..bf331d6249 100644
--- a/property_tests/arbitraries/candid/candid_definition_arb/index.ts
+++ b/property_tests/arbitraries/candid/candid_definition_arb/index.ts
@@ -28,13 +28,12 @@ import {
     TupleCandidDefinition,
     VariantCandidDefinition,
     VecCandidDefinition,
-    CandidDefinitionArb as CoolThing,
     CandidDefinitionArb
 } from './types';
 import { BlobDefinitionArb } from '../constructed/blob_arb/definition_arb';
 import { recursiveOptions } from '../recursive';
 
-export function CandidDefinitionArb(): CandidDefinitionArb {
+export function candidDefinitionArb(): CandidDefinitionArb {
     return fc.letrec((tie) => ({
         CandidDefinition: fc.oneof(
             BlobDefinitionArb(),
diff --git a/property_tests/arbitraries/candid/constructed/opt_arb/index.ts b/property_tests/arbitraries/candid/constructed/opt_arb/index.ts
index 1653425980..9453c6548c 100644
--- a/property_tests/arbitraries/candid/constructed/opt_arb/index.ts
+++ b/property_tests/arbitraries/candid/constructed/opt_arb/index.ts
@@ -4,7 +4,7 @@ import { CandidDefinitionArb } from '../../candid_definition_arb/types';
 import { OptDefinitionArb } from './definition_arb';
 import { OptValuesArb } from './values_arb';
 import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_generator';
-import { CandidDefinitionArb as candidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CorrespondingJSType } from '../../corresponding_js_type';
 
 export type Opt = [CorrespondingJSType] | never[];
diff --git a/property_tests/arbitraries/candid/constructed/record_arb/index.ts b/property_tests/arbitraries/candid/constructed/record_arb/index.ts
index 134eaaedb6..4818dfb85b 100644
--- a/property_tests/arbitraries/candid/constructed/record_arb/index.ts
+++ b/property_tests/arbitraries/candid/constructed/record_arb/index.ts
@@ -1,15 +1,12 @@
 import fc from 'fast-check';
 
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
-import {
-    CandidDefinition,
-    CandidDefinitionArb
-} from '../../candid_definition_arb/types';
+import { CandidDefinitionArb } from '../../candid_definition_arb/types';
 import { RecordDefinitionArb } from './definition_arb';
 import { RecordValuesArb } from './values_arb';
 import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_generator';
 import { CorrespondingJSType } from '../../corresponding_js_type';
-import { CandidDefinitionArb as candidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 
 export type Record = {
     [x: string]: CorrespondingJSType;
diff --git a/property_tests/arbitraries/candid/constructed/tuple_arb/index.ts b/property_tests/arbitraries/candid/constructed/tuple_arb/index.ts
index 11ff3c2c91..780fab68b2 100644
--- a/property_tests/arbitraries/candid/constructed/tuple_arb/index.ts
+++ b/property_tests/arbitraries/candid/constructed/tuple_arb/index.ts
@@ -1,5 +1,5 @@
 import { CorrespondingJSType } from '../../corresponding_js_type';
-import { CandidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
 import { CandidDefinition } from '../../candid_definition_arb/types';
 import { TupleDefinitionArb } from './definition_arb';
@@ -11,10 +11,10 @@ export type Tuple = CorrespondingJSType[];
 export type ReturnTuple = Tuple | {};
 
 export function TupleArb(
-    candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
+    fieldCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
 ): fc.Arbitrary<CandidValueAndMeta<Tuple, ReturnTuple>> {
     return CandidValueAndMetaArbGenerator(
-        TupleDefinitionArb(candidDefinitionArb),
+        TupleDefinitionArb(fieldCandidDefinitionArb),
         TupleValuesArb
     );
 }
diff --git a/property_tests/arbitraries/candid/constructed/variant_arb/index.ts b/property_tests/arbitraries/candid/constructed/variant_arb/index.ts
index 1a283c58ef..3abc93b287 100644
--- a/property_tests/arbitraries/candid/constructed/variant_arb/index.ts
+++ b/property_tests/arbitraries/candid/constructed/variant_arb/index.ts
@@ -1,6 +1,6 @@
 import fc from 'fast-check';
 
-import { CandidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CorrespondingJSType } from '../../corresponding_js_type';
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
 import { CandidDefinition } from '../../candid_definition_arb/types';
@@ -13,10 +13,10 @@ export type Variant = {
 };
 
 export function VariantArb(
-    candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
+    fieldCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
 ): fc.Arbitrary<CandidValueAndMeta<Variant>> {
     return CandidValueAndMetaArbGenerator(
-        VariantDefinitionArb(candidDefinitionArb),
+        VariantDefinitionArb(fieldCandidDefinitionArb),
         VariantValuesArb
     );
 }
diff --git a/property_tests/arbitraries/candid/constructed/vec_arb/index.ts b/property_tests/arbitraries/candid/constructed/vec_arb/index.ts
index 3ee04303b3..49a3ea5e3d 100644
--- a/property_tests/arbitraries/candid/constructed/vec_arb/index.ts
+++ b/property_tests/arbitraries/candid/constructed/vec_arb/index.ts
@@ -1,6 +1,6 @@
 import fc from 'fast-check';
 
-import { CandidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CorrespondingJSType } from '../../corresponding_js_type';
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
 import { CandidDefinition } from '../../candid_definition_arb/types';
@@ -20,10 +20,10 @@ export type Vec =
     | BigInt64Array;
 
 export function VecArb(
-    candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
+    elementCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
 ): fc.Arbitrary<CandidValueAndMeta<Vec>> {
     return CandidValueAndMetaArbGenerator(
-        VecDefinitionArb(candidDefinitionArb),
+        VecDefinitionArb(elementCandidDefinitionArb),
         VecValuesArb
     );
 }
diff --git a/property_tests/arbitraries/candid/recursive/index.ts b/property_tests/arbitraries/candid/recursive/index.ts
index bc1d10b9a8..b404c70f61 100644
--- a/property_tests/arbitraries/candid/recursive/index.ts
+++ b/property_tests/arbitraries/candid/recursive/index.ts
@@ -8,7 +8,7 @@ import {
 import { RecursiveDefinitionArb } from './definition_arb';
 import { RecursiveValuesArb } from './values_arb';
 import { CandidValueAndMetaArbGenerator } from '../candid_value_and_meta_arb_generator';
-import { CandidDefinitionArb as candidDefinitionArb } from '../candid_definition_arb';
+import { candidDefinitionArb } from '../candid_definition_arb';
 
 export const recursiveShapes: { [key: string]: RecursiveGlobalDefinition } = {};
 export const recursiveOptions: RecursiveCandidDefinition[] = [];
diff --git a/property_tests/arbitraries/candid/reference/func_arb/index.ts b/property_tests/arbitraries/candid/reference/func_arb/index.ts
index b1b158300e..74d56053a9 100644
--- a/property_tests/arbitraries/candid/reference/func_arb/index.ts
+++ b/property_tests/arbitraries/candid/reference/func_arb/index.ts
@@ -1,7 +1,7 @@
 import fc from 'fast-check';
 import { Principal } from '@dfinity/principal';
 
-import { CandidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
 import { CandidDefinition } from '../../candid_definition_arb/types';
 import { FuncDefinitionArb } from './definition_arb';
@@ -11,10 +11,10 @@ import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_
 export type Func = [Principal, string];
 
 export function FuncArb(
-    candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
+    innerCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
 ): fc.Arbitrary<CandidValueAndMeta<Func>> {
     return CandidValueAndMetaArbGenerator(
-        FuncDefinitionArb(candidDefinitionArb),
+        FuncDefinitionArb(innerCandidDefinitionArb),
         FuncValueArb
     );
 }
diff --git a/property_tests/arbitraries/candid/reference/service_arb/index.ts b/property_tests/arbitraries/candid/reference/service_arb/index.ts
index 8f91b22e82..4aa9a8bb07 100644
--- a/property_tests/arbitraries/candid/reference/service_arb/index.ts
+++ b/property_tests/arbitraries/candid/reference/service_arb/index.ts
@@ -1,7 +1,7 @@
 import fc from 'fast-check';
 import { Principal } from '@dfinity/principal';
 
-import { CandidDefinitionArb } from '../../candid_definition_arb';
+import { candidDefinitionArb } from '../../candid_definition_arb';
 import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
 import { CandidDefinition } from '../../candid_definition_arb/types';
 import { ServiceValueArb } from './values_arb';
@@ -21,10 +21,10 @@ import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_
 // });
 
 export function ServiceArb(
-    candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
+    innerCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
 ): fc.Arbitrary<CandidValueAndMeta<Principal>> {
     return CandidValueAndMetaArbGenerator(
-        ServiceDefinitionArb(candidDefinitionArb),
+        ServiceDefinitionArb(innerCandidDefinitionArb),
         ServiceValueArb
     );
 }