docs fixes

docs/docs/dev_docs/contracts/syntax/events.md

@@ -100,11 +100,11 @@ They can be emitted by both public and private functions.
 
 To emit unencrypted logs first import the `emit_unencrypted_log` utility function inside your contract:
 
-#include_code unencrypted_import /yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+#include_code unencrypted_import /yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr rust
 
 Then you can call the function:
 
-#include_code unencrypted_log /yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+#include_code unencrypted_log /yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr rust
 
 Once emitted, unencrypted events are stored in AztecNode and can be queried by anyone:
 <Tabs groupId="events">

docs/docs/dev_docs/contracts/syntax/functions.md

@@ -39,12 +39,12 @@ While `staticcall` and `delegatecall` both have flags in the call context, they
 
 - A special `constructor` function MUST be declared within a contract's scope.
 - A constructor doesn't have a name, because its purpose is clear: to initialize contract state.
-- In Aztec terminology, a constructor is always a '`private` function' (i.e. it cannot be a `public` function, in the current version of the sandbox it cannot call public functions either).
+- In Aztec terminology, a constructor is always a '`private` function' (i.e. it cannot be a `public` function).
 - A constructor behaves almost identically to any other function. It's just important for Aztec to be able to identify this function as special: it may only be called once, and will not be deployed as part of the contract.
 
 An example of a somewhat boring constructor is as follows:
 
-#include_code empty-constructor /yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+#include_code empty-constructor /yarn-project/noir-contracts/src/contracts/test_contract/src/main.nr rust
 
 Although you can have a constructor that does nothing, you might want to do something with it, such as setting the deployer as an owner.
 

docs/docs/dev_docs/tutorials/writing_dapp/contract_interaction.md

@@ -93,15 +93,16 @@ At the time of this writing, there are no events emitted when new private notes
 
 ## Working with public state
 
-While they are [fundamentally differently](../../../concepts/foundation/state_model.md), the API for working with private and public functions and state from `aztec.js` is equivalent. To query the balance in public tokens for our user accounts, we can just call the `publicBalanceOf` view function in the contract:
+While they are [fundamentally differently](../../../concepts/foundation/state_model.md), the API for working with private and public functions and state from `aztec.js` is equivalent. To query the balance in public tokens for our user accounts, we can just call the `balance_of_public` view function in the contract:
 
 #include_code showPublicBalances yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
 
 :::info
-Since this is a public token contract we are working with, we can now query the balance for any address, not just those registered in our local PXE. We can also send funds to addresses for which we don't know their [public encryption key](../../../concepts/foundation/accounts/keys.md#encryption-keys).
+Since this we are working with pubic balances, we can now query the balance for any address, not just those registered in our local PXE. We can also send funds to addresses for which we don't know their [public encryption key](../../../concepts/foundation/accounts/keys.md#encryption-keys).
 :::
 
-Here, since the public token contract does not mint any initial funds upon deployment, the balances for all of our user's accounts will be zero. But we can send a transaction to mint tokens to change this, using very similar code to the one for sending private funds:
+Here, since the token contract does not mint any initial funds upon deployment, the balances for all of our user's accounts will be zero.
+But we can send a transaction to mint tokens, using very similar code to the one for sending private funds:
 
 #include_code mintPublicFunds yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
 
@@ -121,9 +122,9 @@ Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 0
 Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
 ```
 
-Public functions can emit [unencrypted public logs](../../contracts/syntax/events.md#unencrypted-events), which we can query via the PXE interface. In particular, the public token contract emits a generic `Coins minted` whenever the `mint` method is called:
+Public functions can emit [unencrypted logs](../../contracts/syntax/events.md#unencrypted-events), which can be queried via the PXE interface. In particular, the token contract emits a generic `Public tokens minted` whenever the `mint_public` method is called:
 
-#include_code unencrypted_log yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+#include_code unencrypted_log yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr rust
 
 We can extend our code by querying the logs emitted on the last block when the minting transaction is mined:
 

yarn-project/noir-contracts/src/contracts/test_contract/src/main.nr

@@ -21,7 +21,9 @@ contract Test {
     }
 
     #[aztec(private)]
+    // docs:start:empty-constructor
     fn constructor() {}
+    // docs:end:empty-constructor
 
     #[aztec(private)]
     fn getPublicKey(