diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2c58c7e7e1..283a45483b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,8 +66,8 @@ jobs:
                   [
                     "tests/property/candid_rpc/class_api/service",
                     "tests/property/candid_rpc/class_api/stable_b_tree_map",
-                    "tests/property/candid_rpc/functional_syntax/service",
-                    "tests/property/candid_rpc/functional_syntax/stable_b_tree_map",
+                    "tests/property/candid_rpc/functional_api/service",
+                    "tests/property/candid_rpc/functional_api/stable_b_tree_map",
                     "tests/end_to_end/http_server/ethers_base",
                     "tests/end_to_end/http_server/http_outcall_fetch",
                     "tests/end_to_end/http_server/ic_evm_rpc",
@@ -108,38 +108,38 @@ jobs:
                     "tests/property/candid_rpc/class_api/tuple",
                     "tests/property/candid_rpc/class_api/variant",
                     "tests/property/candid_rpc/class_api/vec",
-                    "tests/property/candid_rpc/functional_syntax/blob",
-                    "tests/property/candid_rpc/functional_syntax/bool",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/http_request",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/http_request_update",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/init",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/inspect_message",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/post_upgrade",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/pre_upgrade",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/query",
-                    "tests/property/candid_rpc/functional_syntax/canister_methods/update",
-                    "tests/property/candid_rpc/functional_syntax/float32",
-                    "tests/property/candid_rpc/functional_syntax/float64",
-                    "tests/property/candid_rpc/functional_syntax/func",
-                    "tests/property/candid_rpc/functional_syntax/int",
-                    "tests/property/candid_rpc/functional_syntax/int16",
-                    "tests/property/candid_rpc/functional_syntax/int32",
-                    "tests/property/candid_rpc/functional_syntax/int64",
-                    "tests/property/candid_rpc/functional_syntax/int8",
-                    "tests/property/candid_rpc/functional_syntax/nat",
-                    "tests/property/candid_rpc/functional_syntax/nat16",
-                    "tests/property/candid_rpc/functional_syntax/nat32",
-                    "tests/property/candid_rpc/functional_syntax/nat64",
-                    "tests/property/candid_rpc/functional_syntax/nat8",
-                    "tests/property/candid_rpc/functional_syntax/null",
-                    "tests/property/candid_rpc/functional_syntax/opt",
-                    "tests/property/candid_rpc/functional_syntax/principal",
-                    "tests/property/candid_rpc/functional_syntax/record",
-                    "tests/property/candid_rpc/functional_syntax/recursive",
-                    "tests/property/candid_rpc/functional_syntax/text",
-                    "tests/property/candid_rpc/functional_syntax/tuple",
-                    "tests/property/candid_rpc/functional_syntax/variant",
-                    "tests/property/candid_rpc/functional_syntax/vec",
+                    "tests/property/candid_rpc/functional_api/blob",
+                    "tests/property/candid_rpc/functional_api/bool",
+                    "tests/property/candid_rpc/functional_api/canister_methods/http_request",
+                    "tests/property/candid_rpc/functional_api/canister_methods/http_request_update",
+                    "tests/property/candid_rpc/functional_api/canister_methods/init",
+                    "tests/property/candid_rpc/functional_api/canister_methods/inspect_message",
+                    "tests/property/candid_rpc/functional_api/canister_methods/post_upgrade",
+                    "tests/property/candid_rpc/functional_api/canister_methods/pre_upgrade",
+                    "tests/property/candid_rpc/functional_api/canister_methods/query",
+                    "tests/property/candid_rpc/functional_api/canister_methods/update",
+                    "tests/property/candid_rpc/functional_api/float32",
+                    "tests/property/candid_rpc/functional_api/float64",
+                    "tests/property/candid_rpc/functional_api/func",
+                    "tests/property/candid_rpc/functional_api/int",
+                    "tests/property/candid_rpc/functional_api/int16",
+                    "tests/property/candid_rpc/functional_api/int32",
+                    "tests/property/candid_rpc/functional_api/int64",
+                    "tests/property/candid_rpc/functional_api/int8",
+                    "tests/property/candid_rpc/functional_api/nat",
+                    "tests/property/candid_rpc/functional_api/nat16",
+                    "tests/property/candid_rpc/functional_api/nat32",
+                    "tests/property/candid_rpc/functional_api/nat64",
+                    "tests/property/candid_rpc/functional_api/nat8",
+                    "tests/property/candid_rpc/functional_api/null",
+                    "tests/property/candid_rpc/functional_api/opt",
+                    "tests/property/candid_rpc/functional_api/principal",
+                    "tests/property/candid_rpc/functional_api/record",
+                    "tests/property/candid_rpc/functional_api/recursive",
+                    "tests/property/candid_rpc/functional_api/text",
+                    "tests/property/candid_rpc/functional_api/tuple",
+                    "tests/property/candid_rpc/functional_api/variant",
+                    "tests/property/candid_rpc/functional_api/vec",
                     "tests/end_to_end/candid_rpc/class_syntax/async_await",
                     "tests/end_to_end/candid_rpc/class_syntax/audio_recorder",
                     "tests/end_to_end/candid_rpc/class_syntax/bitcoin",