diff --git a/examples/composite_queries/canisters/canister1/canister1.did b/examples/composite_queries/canisters/canister1/index.did
similarity index 100%
rename from examples/composite_queries/canisters/canister1/canister1.did
rename to examples/composite_queries/canisters/canister1/index.did
diff --git a/examples/composite_queries/canisters/canister1/canister1.ts b/examples/composite_queries/canisters/canister1/index.ts
similarity index 98%
rename from examples/composite_queries/canisters/canister1/canister1.ts
rename to examples/composite_queries/canisters/canister1/index.ts
index 09614d499f..60f11dc438 100644
--- a/examples/composite_queries/canisters/canister1/canister1.ts
+++ b/examples/composite_queries/canisters/canister1/index.ts
@@ -1,5 +1,5 @@
 import { ic, Manual, nat, Principal, query, Service, text, update } from 'azle';
-import Canister2 from '../canister2/canister2';
+import Canister2 from '../canister2';
 
 // Composite query calling a query
 class Canister1 extends Service {
diff --git a/examples/composite_queries/canisters/canister2/canister2.did b/examples/composite_queries/canisters/canister2/index.did
similarity index 100%
rename from examples/composite_queries/canisters/canister2/canister2.did
rename to examples/composite_queries/canisters/canister2/index.did
diff --git a/examples/composite_queries/canisters/canister2/canister2.ts b/examples/composite_queries/canisters/canister2/index.ts
similarity index 95%
rename from examples/composite_queries/canisters/canister2/canister2.ts
rename to examples/composite_queries/canisters/canister2/index.ts
index 0d8d18a056..ead7951851 100644
--- a/examples/composite_queries/canisters/canister2/canister2.ts
+++ b/examples/composite_queries/canisters/canister2/index.ts
@@ -1,5 +1,5 @@
 import { ic, Manual, nat, Principal, query, Service, text, update } from 'azle';
-import Canister3 from '../canister3/canister3';
+import Canister3 from '../canister3';
 
 export default class extends Service {
     canister3 = new Canister3(
diff --git a/examples/composite_queries/canisters/canister3/canister3.did b/examples/composite_queries/canisters/canister3/index.did
similarity index 100%
rename from examples/composite_queries/canisters/canister3/canister3.did
rename to examples/composite_queries/canisters/canister3/index.did
diff --git a/examples/composite_queries/canisters/canister3/canister3.ts b/examples/composite_queries/canisters/canister3/index.ts
similarity index 100%
rename from examples/composite_queries/canisters/canister3/canister3.ts
rename to examples/composite_queries/canisters/canister3/index.ts
diff --git a/examples/composite_queries/dfx.json b/examples/composite_queries/dfx.json
index 881010a286..27b6da5daa 100644
--- a/examples/composite_queries/dfx.json
+++ b/examples/composite_queries/dfx.json
@@ -4,8 +4,8 @@
             "type": "custom",
             "build": "npx azle canister1",
             "root": "canisters/canister1",
-            "ts": "canisters/canister1/canister1.ts",
-            "candid": "canisters/canister1/canister1.did",
+            "ts": "canisters/canister1/index.ts",
+            "candid": "canisters/canister1/index.did",
             "wasm": ".azle/canister1/canister1.wasm.gz",
             "declarations": {
                 "output": "test/dfx_generated/canister1",
@@ -17,8 +17,8 @@
             "type": "custom",
             "build": "npx azle canister2",
             "root": "canisters/canister2",
-            "ts": "canisters/canister2/canister2.ts",
-            "candid": "canisters/canister2/canister2.did",
+            "ts": "canisters/canister2/index.ts",
+            "candid": "canisters/canister2/index.did",
             "wasm": ".azle/canister2/canister2.wasm.gz",
             "declarations": {
                 "output": "test/dfx_generated/canister2",
@@ -30,8 +30,8 @@
             "type": "custom",
             "build": "npx azle canister3",
             "root": "canisters/canister3",
-            "ts": "canisters/canister3/canister3.ts",
-            "candid": "canisters/canister3/canister3.did",
+            "ts": "canisters/canister3/index.ts",
+            "candid": "canisters/canister3/index.did",
             "wasm": ".azle/canister3/canister3.wasm.gz",
             "declarations": {
                 "output": "test/dfx_generated/canister3",