AztecProtocol · Maddiaa0 · Sep 11, 2023 · Sep 6, 2023 · Sep 6, 2023 · Sep 11, 2023
diff --git a/docs/docs/dev_docs/contracts/state_variables.md b/docs/docs/dev_docs/contracts/state_variables.md
@@ -27,15 +27,15 @@ The BoolSerialisationMethods is part of the Aztec stdlib:
 
 It contains methods that instruct its PublicState wrapper how to serialise and deserialise a boolean to and from a Field, which is the data type being saved in the public state tree.
 
-The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation) for the complete list.
+The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation) for the complete list.
 
 ### Custom types
 
 It's possible to create a public state for any types. Simply define methods that guide the PublicState wrapper in serialising the custom type to field(s) to store in the public state tree, and deserialising the field(s) retrieved from the tree back to the custom type.
 
 The methods should be implemented in a struct that conforms to the following interface:
 
-#include_code TypeSerialisationInterface /yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr rust
+#include_code TypeSerialisationInterface /yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr rust
 
 For example, to create a public state for the following type:
 
@@ -115,7 +115,7 @@ Notes are the fundamental elements in the private world.
 
 A note should conform to the following interface:
 
-#include_code NoteInterface /yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr rust
+#include_code NoteInterface /yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr rust
 
 The interplay between a private state variable and its notes can be confusing. Here's a summary to aid intuition:
 
@@ -239,7 +239,7 @@ Because of this limit, we should always consider using the second argument `Note
 
 `NoteGetterOptions` encapsulates a set of configurable options for filtering and retrieving a selection of notes from a database:
 
-#include_code NoteGetterOptions /yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr rust
+#include_code NoteGetterOptions /yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr rust
 
 Developers can design instances of `NoteGetterOptions`, to determine how notes should be filtered and returned to the functions of their smart contracts.
 

diff --git a/docs/docs/dev_docs/getting_started/noir_contracts.md b/docs/docs/dev_docs/getting_started/noir_contracts.md
@@ -61,7 +61,7 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/noir-aztec" }
+aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/aztec-noir" }
 ```
 
 You are now ready to write your own contracts! 

diff --git a/docs/docs/dev_docs/wallets/writing_an_account_contract.md b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
@@ -32,7 +32,7 @@ Public Key:  0x0ede151adaef1cfcc1b3e152ea39f00c5cda3f3857cef00decb049d283672dc71
 
 The important part of this contract is the `entrypoint` function, which will be the first function executed in any transaction originated from this account. This function has two main responsibilities: 1) authenticating the transaction and 2) executing calls. It receives a `payload` with the list of function calls to execute, as well as a signature over that payload.
 
-#include_code entrypoint-struct yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-struct yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 :::info
 Using the `EntrypointPayload` struct is not mandatory. You can package the instructions to be carried out by your account contract however you want. However, the entrypoint payload already provides a set of helper functions, both in Noir and Typescript, that can save you a lot of time when writing a new account contract.
@@ -48,7 +48,7 @@ We authenticate the transaction. To do this, we serialise and Pedersen-hash the
 
 Last, we execute the calls in the payload struct. The `execute_calls` helper function runs through the private and public calls included in the entrypoint payload and executes them:
 
-#include_code entrypoint-execute-calls yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-execute-calls yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 Note the usage of the `_with_packed_args` variant of [`call_public_function` and `call_private_function`](../contracts/functions.md#calling-functions). Due to Noir limitations, we cannot include more than a small number of arguments in a function call. However, we can bypass this restriction by using a hash of the arguments in a function call, which gets automatically expanded to the full set of arguments when the nested call is executed. We call this _argument packing_.
 

diff --git a/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts b/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
@@ -5,7 +5,7 @@ import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
-// These must match the values defined in yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
+// These must match the values defined in yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
 export const ACCOUNT_MAX_PRIVATE_CALLS = 2;
 export const ACCOUNT_MAX_PUBLIC_CALLS = 2;
 

diff --git a/yarn-project/circuits.js/src/cbind/constants.in.ts b/yarn-project/circuits.js/src/cbind/constants.in.ts
@@ -39,7 +39,7 @@ async function main(): Promise<void> {
     processEnumNoir(privateStateNoteGeneratorIndexEnum, 'PRIVATE_STATE_NOTE_GENERATOR_INDEX__') +
     processEnumNoir(privateStateTypeEnum, 'PRIVATE_STATE_TYPE__');
 
-  const noirTargetPath = join(__dirname, '../../../noir-libs/noir-aztec/src/constants_gen.nr');
+  const noirTargetPath = join(__dirname, '../../../noir-libs/aztec-noir/src/constants_gen.nr');
   fs.writeFileSync(noirTargetPath, resultNoir);
 
   // Solidity

diff --git a/yarn-project/noir-contracts/README.md b/yarn-project/noir-contracts/README.md
@@ -122,7 +122,7 @@ It has prebuilt binaries and is super easy to install using `noirup`
    compiler_version = "0.7.1"
 
    [dependencies]
-   aztec = { path = "../../../../noir-libs/noir-aztec" }
+   aztec = { path = "../../../../noir-libs/aztec-noir" }
    ```
 
 4. Replace the content of the generated `example_contract/src/main.nr` file with your contract code.

diff --git a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 easy_private_state = { path = "../../../../noir-libs/easy-private-state"}
diff --git a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml b/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 safe_math = { path = "../../../../noir-libs/safe-math" }
diff --git a/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 non_native = { path = "../non_native_token_contract"}
diff --git a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
@@ -7,6 +7,6 @@ type = "contract"
 
 [dependencies]
 # highlight-next-line:importing-aztec
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 # docs:end:importing-aztec
diff --git a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-libs/noir-aztec/Nargo.toml → yarn-project/noir-libs/aztec-noir/Nargo.toml b/yarn-project/noir-libs/noir-aztec/Nargo.toml → yarn-project/noir-libs/aztec-noir/Nargo.toml
diff --git a/yarn-project/noir-libs/noir-aztec/src/abi.nr → yarn-project/noir-libs/aztec-noir/src/abi.nr b/yarn-project/noir-libs/noir-aztec/src/abi.nr → yarn-project/noir-libs/aztec-noir/src/abi.nr
diff --git a/...noir-libs/noir-aztec/src/constants_gen.nr → ...noir-libs/aztec-noir/src/constants_gen.nr b/...noir-libs/noir-aztec/src/constants_gen.nr → ...noir-libs/aztec-noir/src/constants_gen.nr
diff --git a/...oject/noir-libs/noir-aztec/src/context.nr → ...oject/noir-libs/aztec-noir/src/context.nr b/...oject/noir-libs/noir-aztec/src/context.nr → ...oject/noir-libs/aztec-noir/src/context.nr
diff --git a/...ct/noir-libs/noir-aztec/src/entrypoint.nr → ...ct/noir-libs/aztec-noir/src/entrypoint.nr b/...ct/noir-libs/noir-aztec/src/entrypoint.nr → ...ct/noir-libs/aztec-noir/src/entrypoint.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/lib.nr → yarn-project/noir-libs/aztec-noir/src/lib.nr b/yarn-project/noir-libs/noir-aztec/src/lib.nr → yarn-project/noir-libs/aztec-noir/src/lib.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/log.nr → yarn-project/noir-libs/aztec-noir/src/log.nr b/yarn-project/noir-libs/noir-aztec/src/log.nr → yarn-project/noir-libs/aztec-noir/src/log.nr
diff --git a/...ect/noir-libs/noir-aztec/src/messaging.nr → ...ect/noir-libs/aztec-noir/src/messaging.nr b/...ect/noir-libs/noir-aztec/src/messaging.nr → ...ect/noir-libs/aztec-noir/src/messaging.nr
diff --git a/...c/messaging/get_commitment_getter_data.nr → ...c/messaging/get_commitment_getter_data.nr b/...c/messaging/get_commitment_getter_data.nr → ...c/messaging/get_commitment_getter_data.nr
diff --git a/...r-aztec/src/messaging/l1_to_l2_message.nr → ...ec-noir/src/messaging/l1_to_l2_message.nr b/...r-aztec/src/messaging/l1_to_l2_message.nr → ...ec-noir/src/messaging/l1_to_l2_message.nr
diff --git a/...messaging/l1_to_l2_message_getter_data.nr → ...messaging/l1_to_l2_message_getter_data.nr b/...messaging/l1_to_l2_message_getter_data.nr → ...messaging/l1_to_l2_message_getter_data.nr
diff --git a/...-project/noir-libs/noir-aztec/src/note.nr → ...-project/noir-libs/aztec-noir/src/note.nr b/...-project/noir-libs/noir-aztec/src/note.nr → ...-project/noir-libs/aztec-noir/src/note.nr
diff --git a/...oir-libs/noir-aztec/src/note/lifecycle.nr → ...oir-libs/aztec-noir/src/note/lifecycle.nr b/...oir-libs/noir-aztec/src/note/lifecycle.nr → ...oir-libs/aztec-noir/src/note/lifecycle.nr
diff --git a/...r-libs/noir-aztec/src/note/note_getter.nr → ...r-libs/aztec-noir/src/note/note_getter.nr b/...r-libs/noir-aztec/src/note/note_getter.nr → ...r-libs/aztec-noir/src/note/note_getter.nr
diff --git a/...oir-aztec/src/note/note_getter_options.nr → ...ztec-noir/src/note/note_getter_options.nr b/...oir-aztec/src/note/note_getter_options.nr → ...ztec-noir/src/note/note_getter_options.nr
diff --git a/...oir-libs/noir-aztec/src/note/note_hash.nr → ...oir-libs/aztec-noir/src/note/note_hash.nr b/...oir-libs/noir-aztec/src/note/note_hash.nr → ...oir-libs/aztec-noir/src/note/note_hash.nr
diff --git a/...r-libs/noir-aztec/src/note/note_header.nr → ...r-libs/aztec-noir/src/note/note_header.nr b/...r-libs/noir-aztec/src/note/note_header.nr → ...r-libs/aztec-noir/src/note/note_header.nr
diff --git a/...ibs/noir-aztec/src/note/note_interface.nr → ...ibs/aztec-noir/src/note/note_interface.nr b/...ibs/noir-aztec/src/note/note_interface.nr → ...ibs/aztec-noir/src/note/note_interface.nr
diff --git a/...oir-aztec/src/note/note_viewer_options.nr → ...ztec-noir/src/note/note_viewer_options.nr b/...oir-aztec/src/note/note_viewer_options.nr → ...ztec-noir/src/note/note_viewer_options.nr
diff --git a/...ct/noir-libs/noir-aztec/src/note/utils.nr → ...ct/noir-libs/aztec-noir/src/note/utils.nr b/...ct/noir-libs/noir-aztec/src/note/utils.nr → ...ct/noir-libs/aztec-noir/src/note/utils.nr
diff --git a/...roject/noir-libs/noir-aztec/src/oracle.nr → ...roject/noir-libs/aztec-noir/src/oracle.nr b/...roject/noir-libs/noir-aztec/src/oracle.nr → ...roject/noir-libs/aztec-noir/src/oracle.nr
@@ -1,3 +1,7 @@
+// docs:start:oracles-module
+/// Oracles module
+// docs:end:oracles-module
+
 mod arguments;
 mod call_private_function;
 mod context;

diff --git a/...r-libs/noir-aztec/src/oracle/arguments.nr → ...r-libs/aztec-noir/src/oracle/arguments.nr b/...r-libs/noir-aztec/src/oracle/arguments.nr → ...r-libs/aztec-noir/src/oracle/arguments.nr
diff --git a/...aztec/src/oracle/call_private_function.nr → ...-noir/src/oracle/call_private_function.nr b/...aztec/src/oracle/call_private_function.nr → ...-noir/src/oracle/call_private_function.nr
diff --git a/...noir-aztec/src/oracle/compute_selector.nr → ...aztec-noir/src/oracle/compute_selector.nr b/...noir-aztec/src/oracle/compute_selector.nr → ...aztec-noir/src/oracle/compute_selector.nr
diff --git a/...oir-libs/noir-aztec/src/oracle/context.nr → ...oir-libs/aztec-noir/src/oracle/context.nr b/...oir-libs/noir-aztec/src/oracle/context.nr → ...oir-libs/aztec-noir/src/oracle/context.nr
diff --git a/...oir-aztec/src/oracle/create_commitment.nr → ...ztec-noir/src/oracle/create_commitment.nr b/...oir-aztec/src/oracle/create_commitment.nr → ...ztec-noir/src/oracle/create_commitment.nr
diff --git a/...r-libs/noir-aztec/src/oracle/debug_log.nr → ...r-libs/aztec-noir/src/oracle/debug_log.nr b/...r-libs/noir-aztec/src/oracle/debug_log.nr → ...r-libs/aztec-noir/src/oracle/debug_log.nr
diff --git a/...rc/oracle/enqueue_public_function_call.nr → ...rc/oracle/enqueue_public_function_call.nr b/...rc/oracle/enqueue_public_function_call.nr → ...rc/oracle/enqueue_public_function_call.nr
diff --git a/...s/noir-aztec/src/oracle/get_commitment.nr → ...s/aztec-noir/src/oracle/get_commitment.nr b/...s/noir-aztec/src/oracle/get_commitment.nr → ...s/aztec-noir/src/oracle/get_commitment.nr
diff --git a/...-aztec/src/oracle/get_l1_to_l2_message.nr → ...c-noir/src/oracle/get_l1_to_l2_message.nr b/...-aztec/src/oracle/get_l1_to_l2_message.nr → ...c-noir/src/oracle/get_l1_to_l2_message.nr
diff --git a/...s/noir-aztec/src/oracle/get_public_key.nr → ...s/aztec-noir/src/oracle/get_public_key.nr b/...s/noir-aztec/src/oracle/get_public_key.nr → ...s/aztec-noir/src/oracle/get_public_key.nr
diff --git a/...s/noir-aztec/src/oracle/get_secret_key.nr → ...s/aztec-noir/src/oracle/get_secret_key.nr b/...s/noir-aztec/src/oracle/get_secret_key.nr → ...s/aztec-noir/src/oracle/get_secret_key.nr
diff --git a/...t/noir-libs/noir-aztec/src/oracle/logs.nr → ...t/noir-libs/aztec-noir/src/oracle/logs.nr b/...t/noir-libs/noir-aztec/src/oracle/logs.nr → ...t/noir-libs/aztec-noir/src/oracle/logs.nr
diff --git a/.../noir-libs/noir-aztec/src/oracle/notes.nr → .../noir-libs/aztec-noir/src/oracle/notes.nr b/.../noir-libs/noir-aztec/src/oracle/notes.nr → .../noir-libs/aztec-noir/src/oracle/notes.nr
diff --git a/...libs/noir-aztec/src/oracle/public_call.nr → ...libs/aztec-noir/src/oracle/public_call.nr b/...libs/noir-aztec/src/oracle/public_call.nr → ...libs/aztec-noir/src/oracle/public_call.nr
diff --git a/...t/noir-libs/noir-aztec/src/oracle/rand.nr → ...t/noir-libs/aztec-noir/src/oracle/rand.nr b/...t/noir-libs/noir-aztec/src/oracle/rand.nr → ...t/noir-libs/aztec-noir/src/oracle/rand.nr
diff --git a/...oir-libs/noir-aztec/src/oracle/storage.nr → ...oir-libs/aztec-noir/src/oracle/storage.nr b/...oir-libs/noir-aztec/src/oracle/storage.nr → ...oir-libs/aztec-noir/src/oracle/storage.nr
diff --git a/...noir-aztec/src/private_call_stack_item.nr → ...aztec-noir/src/private_call_stack_item.nr b/...noir-aztec/src/private_call_stack_item.nr → ...aztec-noir/src/private_call_stack_item.nr
diff --git a/.../noir-aztec/src/public_call_stack_item.nr → .../aztec-noir/src/public_call_stack_item.nr b/.../noir-aztec/src/public_call_stack_item.nr → .../aztec-noir/src/public_call_stack_item.nr
diff --git a/...ct/noir-libs/noir-aztec/src/state_vars.nr → ...ct/noir-libs/aztec-noir/src/state_vars.nr b/...ct/noir-libs/noir-aztec/src/state_vars.nr → ...ct/noir-libs/aztec-noir/src/state_vars.nr
diff --git a/...tec/src/state_vars/immutable_singleton.nr → ...oir/src/state_vars/immutable_singleton.nr b/...tec/src/state_vars/immutable_singleton.nr → ...oir/src/state_vars/immutable_singleton.nr
diff --git a/...oir-libs/noir-aztec/src/state_vars/map.nr → ...oir-libs/aztec-noir/src/state_vars/map.nr b/...oir-libs/noir-aztec/src/state_vars/map.nr → ...oir-libs/aztec-noir/src/state_vars/map.nr
diff --git a/...noir-aztec/src/state_vars/public_state.nr → ...aztec-noir/src/state_vars/public_state.nr b/...noir-aztec/src/state_vars/public_state.nr → ...aztec-noir/src/state_vars/public_state.nr
diff --git a/...oir-libs/noir-aztec/src/state_vars/set.nr → ...oir-libs/aztec-noir/src/state_vars/set.nr b/...oir-libs/noir-aztec/src/state_vars/set.nr → ...oir-libs/aztec-noir/src/state_vars/set.nr
diff --git a/...bs/noir-aztec/src/state_vars/singleton.nr → ...bs/aztec-noir/src/state_vars/singleton.nr b/...bs/noir-aztec/src/state_vars/singleton.nr → ...bs/aztec-noir/src/state_vars/singleton.nr
diff --git a/...project/noir-libs/noir-aztec/src/types.nr → ...project/noir-libs/aztec-noir/src/types.nr b/...project/noir-libs/noir-aztec/src/types.nr → ...project/noir-libs/aztec-noir/src/types.nr
diff --git a/...t/noir-libs/noir-aztec/src/types/point.nr → ...t/noir-libs/aztec-noir/src/types/point.nr b/...t/noir-libs/noir-aztec/src/types/point.nr → ...t/noir-libs/aztec-noir/src/types/point.nr
diff --git a/...oir-aztec/src/types/type_serialisation.nr → ...ztec-noir/src/types/type_serialisation.nr b/...oir-aztec/src/types/type_serialisation.nr → ...ztec-noir/src/types/type_serialisation.nr
diff --git a/.../type_serialisation/bool_serialisation.nr → .../type_serialisation/bool_serialisation.nr b/.../type_serialisation/bool_serialisation.nr → .../type_serialisation/bool_serialisation.nr
diff --git a/...type_serialisation/field_serialisation.nr → ...type_serialisation/field_serialisation.nr b/...type_serialisation/field_serialisation.nr → ...type_serialisation/field_serialisation.nr
diff --git a/...s/type_serialisation/u32_serialisation.nr → ...s/type_serialisation/u32_serialisation.nr b/...s/type_serialisation/u32_serialisation.nr → ...s/type_serialisation/u32_serialisation.nr
diff --git a/...ect/noir-libs/noir-aztec/src/types/vec.nr → ...ect/noir-libs/aztec-noir/src/types/vec.nr b/...ect/noir-libs/noir-aztec/src/types/vec.nr → ...ect/noir-libs/aztec-noir/src/types/vec.nr
diff --git a/...project/noir-libs/noir-aztec/src/utils.nr → ...project/noir-libs/aztec-noir/src/utils.nr b/...project/noir-libs/noir-aztec/src/utils.nr → ...project/noir-libs/aztec-noir/src/utils.nr
diff --git a/yarn-project/noir-libs/easy-private-state/Nargo.toml b/yarn-project/noir-libs/easy-private-state/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
+aztec = { path = "../aztec-noir" }
 value_note = { path = "../value-note" }
diff --git a/yarn-project/noir-libs/value-note/Nargo.toml b/yarn-project/noir-libs/value-note/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
+aztec = { path = "../aztec-noir" }