From 8d5c378bb108b5f3b78ce763d810d56bc048371b Mon Sep 17 00:00:00 2001
From: Cheethas <47148561+cheethas@users.noreply.github.com>
Date: Wed, 6 Sep 2023 18:39:14 +0100
Subject: [PATCH 1/3] chore(aztec-noir): rename noir-aztec to aztec-noir

---
 docs/docs/dev_docs/contracts/state_variables.md           | 8 ++++----
 docs/docs/dev_docs/getting_started/noir_contracts.md      | 2 +-
 docs/docs/dev_docs/wallets/writing_an_account_contract.md | 4 ++--
 .../aztec.js/src/account/entrypoint/entrypoint_payload.ts | 2 +-
 yarn-project/circuits.js/src/cbind/constants.in.ts        | 2 +-
 yarn-project/noir-contracts/README.md                     | 2 +-
 .../src/contracts/child_contract/Nargo.toml               | 2 +-
 .../src/contracts/docs_example_contract/Nargo.toml        | 2 +-
 .../src/contracts/easy_private_token_contract/Nargo.toml  | 2 +-
 .../src/contracts/ecdsa_account_contract/Nargo.toml       | 2 +-
 .../src/contracts/escrow_contract/Nargo.toml              | 2 +-
 .../example_public_state_increment_BROKE/Nargo.toml       | 2 +-
 .../src/contracts/import_test_contract/Nargo.toml         | 2 +-
 .../src/contracts/lending_contract/Nargo.toml             | 2 +-
 .../src/contracts/multi_transfer_contract/Nargo.toml      | 2 +-
 .../src/contracts/native_token_contract/Nargo.toml        | 2 +-
 .../src/contracts/non_native_token_contract/Nargo.toml    | 2 +-
 .../src/contracts/parent_contract/Nargo.toml              | 2 +-
 .../src/contracts/pending_commitments_contract/Nargo.toml | 2 +-
 .../src/contracts/pokeable_token_contract/Nargo.toml      | 2 +-
 .../src/contracts/price_feed_contract/Nargo.toml          | 2 +-
 .../contracts/private_token_airdrop_contract/Nargo.toml   | 2 +-
 .../src/contracts/private_token_contract/Nargo.toml       | 2 +-
 .../src/contracts/public_token_contract/Nargo.toml        | 2 +-
 .../src/contracts/schnorr_account_contract/Nargo.toml     | 2 +-
 .../schnorr_auth_witness_account_contract/Nargo.toml      | 2 +-
 .../schnorr_hardcoded_account_contract/Nargo.toml         | 2 +-
 .../schnorr_single_key_account_contract/Nargo.toml        | 2 +-
 .../noir-contracts/src/contracts/test_contract/Nargo.toml | 2 +-
 .../src/contracts/uniswap_contract/Nargo.toml             | 2 +-
 .../noir-libs/{noir-aztec => aztec-noir}/Nargo.toml       | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/abi.nr       | 0
 .../{noir-aztec => aztec-noir}/src/constants_gen.nr       | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/context.nr   | 0
 .../{noir-aztec => aztec-noir}/src/entrypoint.nr          | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/lib.nr       | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/log.nr       | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/messaging.nr | 0
 .../src/messaging/get_commitment_getter_data.nr           | 0
 .../src/messaging/l1_to_l2_message.nr                     | 0
 .../src/messaging/l1_to_l2_message_getter_data.nr         | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/note.nr      | 0
 .../{noir-aztec => aztec-noir}/src/note/lifecycle.nr      | 0
 .../{noir-aztec => aztec-noir}/src/note/note_getter.nr    | 0
 .../src/note/note_getter_options.nr                       | 0
 .../{noir-aztec => aztec-noir}/src/note/note_hash.nr      | 0
 .../{noir-aztec => aztec-noir}/src/note/note_header.nr    | 0
 .../{noir-aztec => aztec-noir}/src/note/note_interface.nr | 0
 .../src/note/note_viewer_options.nr                       | 0
 .../{noir-aztec => aztec-noir}/src/note/utils.nr          | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/oracle.nr    | 4 ++++
 .../{noir-aztec => aztec-noir}/src/oracle/arguments.nr    | 0
 .../src/oracle/call_private_function.nr                   | 0
 .../src/oracle/compute_selector.nr                        | 0
 .../{noir-aztec => aztec-noir}/src/oracle/context.nr      | 0
 .../src/oracle/create_commitment.nr                       | 0
 .../{noir-aztec => aztec-noir}/src/oracle/debug_log.nr    | 0
 .../src/oracle/enqueue_public_function_call.nr            | 0
 .../src/oracle/get_commitment.nr                          | 0
 .../src/oracle/get_l1_to_l2_message.nr                    | 0
 .../src/oracle/get_public_key.nr                          | 0
 .../src/oracle/get_secret_key.nr                          | 0
 .../{noir-aztec => aztec-noir}/src/oracle/logs.nr         | 0
 .../{noir-aztec => aztec-noir}/src/oracle/notes.nr        | 0
 .../{noir-aztec => aztec-noir}/src/oracle/public_call.nr  | 0
 .../{noir-aztec => aztec-noir}/src/oracle/rand.nr         | 0
 .../{noir-aztec => aztec-noir}/src/oracle/storage.nr      | 0
 .../src/private_call_stack_item.nr                        | 0
 .../src/public_call_stack_item.nr                         | 0
 .../{noir-aztec => aztec-noir}/src/state_vars.nr          | 0
 .../src/state_vars/immutable_singleton.nr                 | 0
 .../{noir-aztec => aztec-noir}/src/state_vars/map.nr      | 0
 .../src/state_vars/public_state.nr                        | 0
 .../{noir-aztec => aztec-noir}/src/state_vars/set.nr      | 0
 .../src/state_vars/singleton.nr                           | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/types.nr     | 0
 .../{noir-aztec => aztec-noir}/src/types/point.nr         | 0
 .../src/types/type_serialisation.nr                       | 0
 .../src/types/type_serialisation/bool_serialisation.nr    | 0
 .../src/types/type_serialisation/field_serialisation.nr   | 0
 .../src/types/type_serialisation/u32_serialisation.nr     | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/types/vec.nr | 0
 .../noir-libs/{noir-aztec => aztec-noir}/src/utils.nr     | 0
 83 files changed, 38 insertions(+), 34 deletions(-)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/Nargo.toml (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/abi.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/constants_gen.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/context.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/entrypoint.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/lib.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/log.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/messaging.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/messaging/get_commitment_getter_data.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/messaging/l1_to_l2_message.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/messaging/l1_to_l2_message_getter_data.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/lifecycle.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_getter.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_getter_options.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_hash.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_header.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_interface.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/note_viewer_options.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/note/utils.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle.nr (78%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/arguments.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/call_private_function.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/compute_selector.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/context.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/create_commitment.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/debug_log.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/enqueue_public_function_call.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/get_commitment.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/get_l1_to_l2_message.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/get_public_key.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/get_secret_key.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/logs.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/notes.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/public_call.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/rand.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/oracle/storage.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/private_call_stack_item.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/public_call_stack_item.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars/immutable_singleton.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars/map.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars/public_state.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars/set.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/state_vars/singleton.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/point.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/type_serialisation.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/type_serialisation/bool_serialisation.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/type_serialisation/field_serialisation.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/type_serialisation/u32_serialisation.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/types/vec.nr (100%)
 rename yarn-project/noir-libs/{noir-aztec => aztec-noir}/src/utils.nr (100%)

diff --git a/docs/docs/dev_docs/contracts/state_variables.md b/docs/docs/dev_docs/contracts/state_variables.md
index e1176840d8e..e34fc06e363 100644
--- a/docs/docs/dev_docs/contracts/state_variables.md
+++ b/docs/docs/dev_docs/contracts/state_variables.md
@@ -27,7 +27,7 @@ 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
 
@@ -35,7 +35,7 @@ It's possible to create a public state for any types. Simply define methods that
 
 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
index df52447c4d8..e6b9e3a96f8 100644
--- 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
index a305e0015c1..b6ddc219c5d 100644
--- 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
index 0a6dc8b1559..56bc26c9207 100644
--- 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
index 09a621cf895..68bf902704b 100644
--- 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
index 0bc3fd8b345..b4631099f63 100644
--- 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
index ee16960f684..013af3ce22e 100644
--- 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
index add81444e03..7826fffbf0d 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
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
index b12c667a3a7..4b8208cc51b 100644
--- 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"}
\ No newline at end of file
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
index fafe0d80e0d..999b75a218a 100644
--- 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
index 1659fd53bd1..4077357a075 100644
--- 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
index ecf14c9d70b..cd763da925d 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
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
index 1dfaf41bec9..21840bab59b 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
index 4efdd16534d..8233a8c530c 100644
--- 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" }
\ No newline at end of file
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
index d6220bfb1eb..60b38119554 100644
--- 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
index dd0dcb29369..42a0a9313a4 100644
--- 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"}
\ No newline at end of file
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
index a114d29bd83..d6c7fef03e1 100644
--- 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"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
index 5c12622f00f..850b3ad14e5 100644
--- 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
index 052b4bff730..1c0e84969da 100644
--- 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
index 0e36de1f22c..4a8af37b776 100644
--- 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"}
\ No newline at end of file
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
index 51ff213ea6d..be6246ac397 100644
--- 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
index b198e85407d..9f21c40d77e 100644
--- 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"}
\ No newline at end of file
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
index 4bdd80daff0..0eb35564eec 100644
--- 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
\ No newline at end of file
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
index 3f6be8e4142..04489c04c7e 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
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
index 1ea6bf3dbe6..84c123fadee 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
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
index 922b93267d0..77bd89399b3 100644
--- 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
index 4c754d368ef..218d93ac79d 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
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
index f21b6ca513c..d1eff41f9ae 100644
--- 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
index fd7213c7a9a..1d564c16ddd 100644
--- 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
index d02ae559dd1..21daac464fd 100644
--- 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 b/yarn-project/noir-libs/aztec-noir/Nargo.toml
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/Nargo.toml
rename to yarn-project/noir-libs/aztec-noir/Nargo.toml
diff --git a/yarn-project/noir-libs/noir-aztec/src/abi.nr b/yarn-project/noir-libs/aztec-noir/src/abi.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/abi.nr
rename to yarn-project/noir-libs/aztec-noir/src/abi.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr b/yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/constants_gen.nr
rename to yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/context.nr b/yarn-project/noir-libs/aztec-noir/src/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr b/yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
rename to yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/lib.nr b/yarn-project/noir-libs/aztec-noir/src/lib.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/lib.nr
rename to yarn-project/noir-libs/aztec-noir/src/lib.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/log.nr b/yarn-project/noir-libs/aztec-noir/src/log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/log.nr
rename to yarn-project/noir-libs/aztec-noir/src/log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging.nr b/yarn-project/noir-libs/aztec-noir/src/messaging.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note.nr b/yarn-project/noir-libs/aztec-noir/src/note.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note.nr
rename to yarn-project/noir-libs/aztec-noir/src/note.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr b/yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_header.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_header.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/utils.nr b/yarn-project/noir-libs/aztec-noir/src/note/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/utils.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle.nr b/yarn-project/noir-libs/aztec-noir/src/oracle.nr
similarity index 78%
rename from yarn-project/noir-libs/noir-aztec/src/oracle.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle.nr
index 838821db45f..056617ed42f 100644
--- a/yarn-project/noir-libs/noir-aztec/src/oracle.nr
+++ b/yarn-project/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/yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/context.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types.nr b/yarn-project/noir-libs/aztec-noir/src/types.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types.nr
rename to yarn-project/noir-libs/aztec-noir/src/types.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/point.nr b/yarn-project/noir-libs/aztec-noir/src/types/point.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/point.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/point.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/vec.nr b/yarn-project/noir-libs/aztec-noir/src/types/vec.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/vec.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/vec.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/utils.nr b/yarn-project/noir-libs/aztec-noir/src/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/utils.nr

From 98e203fc76fec72d0cf10012814f9dac27f5fa20 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:38:25 +0000
Subject: [PATCH 2/3] fix

---
 yarn-project/noir-libs/easy-private-state/Nargo.toml | 2 +-
 yarn-project/noir-libs/value-note/Nargo.toml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn-project/noir-libs/easy-private-state/Nargo.toml b/yarn-project/noir-libs/easy-private-state/Nargo.toml
index 04f0f4266cf..eef8798d8c8 100644
--- 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" }
\ No newline at end of file
diff --git a/yarn-project/noir-libs/value-note/Nargo.toml b/yarn-project/noir-libs/value-note/Nargo.toml
index e20a368c651..7f527d67f21 100644
--- 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" }
\ No newline at end of file
+aztec = { path = "../aztec-noir" }
\ No newline at end of file

From add7567e983fa2b78e0e419a44e6c76d429642cb Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Mon, 11 Sep 2023 13:59:03 +0000
Subject: [PATCH 3/3] fix: update straggler

---
 .../noir-contracts/src/contracts/card_game_contract/Nargo.toml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
index 40f9e3fbffa..58853dc1a57 100644
--- a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/card_game_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"}