From 104094fad52fe2575d7782fe255da9b805f9a3cd Mon Sep 17 00:00:00 2001
From: YamenMerhi <yamennmerhi@gmail.com>
Date: Mon, 27 Nov 2023 18:07:55 +0200
Subject: [PATCH 1/3] refactor!: change event signature for operator functions

---
 .../LSP7DigitalAsset/ILSP7DigitalAsset.sol     | 18 +++++++++---------
 .../LSP7DigitalAsset/LSP7DigitalAssetCore.sol  | 12 ++++++------
 .../ILSP8IdentifiableDigitalAsset.sol          |  8 ++++----
 .../LSP8IdentifiableDigitalAssetCore.sol       |  4 ++--
 .../extensions/LSP8CompatibleERC721.sol        |  4 ++--
 .../LSP8CompatibleERC721InitAbstract.sol       |  4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/contracts/LSP7DigitalAsset/ILSP7DigitalAsset.sol b/contracts/LSP7DigitalAsset/ILSP7DigitalAsset.sol
index 2e8e3b8fb..17ec39e30 100644
--- a/contracts/LSP7DigitalAsset/ILSP7DigitalAsset.sol
+++ b/contracts/LSP7DigitalAsset/ILSP7DigitalAsset.sol
@@ -39,7 +39,7 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      * @param amount The amount of tokens `operator` address has access to from `tokenOwner`
      * @param operatorNotificationData The data to notify the operator about via LSP1.
      */
-    event AuthorizedOperator(
+    event OperatorAuthorizationChanged(
         address indexed operator,
         address indexed tokenOwner,
         uint256 indexed amount,
@@ -53,10 +53,10 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      * @param notified Bool indicating whether the operator has been notified or not
      * @param operatorNotificationData The data to notify the operator about via LSP1.
      */
-    event RevokedOperator(
+    event OperatorRevoked(
         address indexed operator,
         address indexed tokenOwner,
-        bool notified,
+        bool indexed notified,
         bytes operatorNotificationData
     );
 
@@ -112,7 +112,7 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      * @custom:requirements
      * - `operator` cannot be the zero address.
      *
-     * @custom:events {AuthorizedOperator} when allowance is given to a new operator or
+     * @custom:events {OperatorAuthorizationChanged} when allowance is given to a new operator or
      * an existing operator's allowance is updated.
      */
     function authorizeOperator(
@@ -133,7 +133,7 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      * - `operator` cannot be calling address.
      * - `operator` cannot be the zero address.
      *
-     * @custom:events {RevokedOperator} event with address of the operator being revoked for the caller (token holder).
+     * @custom:events {OperatorRevoked} event with address of the operator being revoked for the caller (token holder).
      */
     function revokeOperator(
         address operator,
@@ -159,7 +159,7 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      *  - `operator` cannot be the same address as `msg.sender`
      *  - `operator` cannot be the zero address.
      *
-     * @custom:events {AuthorizedOperator} indicating the updated allowance
+     * @custom:events {OperatorAuthorizationChanged} indicating the updated allowance
      */
     function increaseAllowance(
         address operator,
@@ -179,8 +179,8 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      * Notify the operator based on the LSP1-UniversalReceiver standard
      *
      * @custom:events
-     *  - {AuthorizedOperator} event indicating the updated allowance after decreasing it.
-     *  - {RevokeOperator} event if `subtractedAmount` is the full allowance,
+     *  - {OperatorAuthorizationChanged} event indicating the updated allowance after decreasing it.
+     *  - {OperatorRevoked} event if `subtractedAmount` is the full allowance,
      *    indicating `operator` does not have any alauthorizedAmountForlowance left for `msg.sender`.
      *
      * @param operator The operator to decrease allowance for `msg.sender`
@@ -245,7 +245,7 @@ interface ILSP7DigitalAsset is IERC165, IERC725Y {
      *
      * @custom:events
      * - {Transfer} event when tokens get successfully transferred.
-     * - if the transfer is triggered by an operator, either the {AuthorizedOperator} event will be emitted with the updated allowance or the {RevokedOperator}
+     * - if the transfer is triggered by an operator, either the {OperatorAuthorizationChanged} event will be emitted with the updated allowance or the {OperatorRevoked}
      * event will be emitted if the operator has no more allowance left.
      *
      * @custom:hint The `force` parameter **MUST be set to `true`** to transfer tokens to Externally Owned Accounts (EOAs)
diff --git a/contracts/LSP7DigitalAsset/LSP7DigitalAssetCore.sol b/contracts/LSP7DigitalAsset/LSP7DigitalAssetCore.sol
index 3efb9f6ce..8d4ccdd43 100644
--- a/contracts/LSP7DigitalAsset/LSP7DigitalAssetCore.sol
+++ b/contracts/LSP7DigitalAsset/LSP7DigitalAssetCore.sol
@@ -315,8 +315,8 @@ abstract contract LSP7DigitalAssetCore is ILSP7DigitalAsset {
      * @param operatorNotificationData The data to send to the universalReceiver function of the operator in case of notifying
      *
      * @custom:events
-     * - {RevokedOperator} event when operator's allowance is set to `0`.
-     * - {AuthorizedOperator} event when operator's allowance is set to any other amount.
+     * - {OperatorRevoked} event when operator's allowance is set to `0`.
+     * - {OperatorAuthorizationChanged} event when operator's allowance is set to any other amount.
      *
      * @custom:requirements
      * - `operator` cannot be the zero address.
@@ -341,7 +341,7 @@ abstract contract LSP7DigitalAssetCore is ILSP7DigitalAsset {
 
         if (allowance != 0) {
             _operators[tokenOwner].add(operator);
-            emit AuthorizedOperator(
+            emit OperatorAuthorizationChanged(
                 operator,
                 tokenOwner,
                 allowance,
@@ -349,7 +349,7 @@ abstract contract LSP7DigitalAssetCore is ILSP7DigitalAsset {
             );
         } else {
             _operators[tokenOwner].remove(operator);
-            emit RevokedOperator(
+            emit OperatorRevoked(
                 operator,
                 tokenOwner,
                 notified,
@@ -482,8 +482,8 @@ abstract contract LSP7DigitalAssetCore is ILSP7DigitalAsset {
      * @param amountToSpend The amount of tokens to substract in allowance of `operator`.
      *
      * @custom:events
-     * - {RevokedOperator} event when operator's allowance is set to `0`.
-     * - {AuthorizedOperator} event when operator's allowance is set to any other amount.
+     * - {OperatorRevoked} event when operator's allowance is set to `0`.
+     * - {OperatorAuthorizationChanged} event when operator's allowance is set to any other amount.
      *
      * @custom:requirements
      * - The `amountToSpend` MUST be at least the allowance granted to `operator` (accessible via {`authorizedAmountFor}`)
diff --git a/contracts/LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol b/contracts/LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol
index 918289303..ddacb98e4 100644
--- a/contracts/LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol
+++ b/contracts/LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol
@@ -39,7 +39,7 @@ interface ILSP8IdentifiableDigitalAsset is IERC165, IERC725Y {
      * @param tokenId The tokenId `operator` address has access on behalf of `tokenOwner`.
      * @param operatorNotificationData The data to notify the operator about via LSP1.
      */
-    event AuthorizedOperator(
+    event OperatorAuthorizationChanged(
         address indexed operator,
         address indexed tokenOwner,
         bytes32 indexed tokenId,
@@ -54,7 +54,7 @@ interface ILSP8IdentifiableDigitalAsset is IERC165, IERC725Y {
      * @param notified Bool indicating whether the operator has been notified or not
      * @param operatorNotificationData The data to notify the operator about via LSP1.
      */
-    event RevokedOperator(
+    event OperatorRevoked(
         address indexed operator,
         address indexed tokenOwner,
         bytes32 indexed tokenId,
@@ -116,7 +116,7 @@ interface ILSP8IdentifiableDigitalAsset is IERC165, IERC725Y {
      * - the owner of a `tokenId` cannot grant itself as an `operator` (`operator` cannot be the calling address).
      * - `operator` cannot be the zero address.
      *
-     * @custom:events {AuthorizedOperator} event.
+     * @custom:events {OperatorAuthorizationChanged} event.
      */
     function authorizeOperator(
         address operator,
@@ -139,7 +139,7 @@ interface ILSP8IdentifiableDigitalAsset is IERC165, IERC725Y {
      * - the owner of a `tokenId` cannot grant revoke itself as an `operator` (`operator` cannot be the calling address).
      * - `operator` cannot be the zero address.
      *
-     * @custom:events {RevokedOperator} event with address of the operator being revoked for the caller (token owner)..
+     * @custom:events {OperatorRevoked} event with address of the operator being revoked for the caller (token owner)..
      */
     function revokeOperator(
         address operator,
diff --git a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetCore.sol b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetCore.sol
index 1cc6cfc24..d04f2e360 100644
--- a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetCore.sol
+++ b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetCore.sol
@@ -140,7 +140,7 @@ abstract contract LSP8IdentifiableDigitalAssetCore is
         bool isAdded = _operators[tokenId].add(operator);
         if (!isAdded) revert LSP8OperatorAlreadyAuthorized(operator, tokenId);
 
-        emit AuthorizedOperator(
+        emit OperatorAuthorizationChanged(
             operator,
             tokenOwner,
             tokenId,
@@ -296,7 +296,7 @@ abstract contract LSP8IdentifiableDigitalAssetCore is
         bool isRemoved = _operators[tokenId].remove(operator);
         if (!isRemoved) revert LSP8NonExistingOperator(operator, tokenId);
 
-        emit RevokedOperator(
+        emit OperatorRevoked(
             operator,
             tokenOwner,
             tokenId,
diff --git a/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol b/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol
index 5bb539fb7..926c31c7f 100644
--- a/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol
+++ b/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol
@@ -316,7 +316,7 @@ abstract contract LSP8CompatibleERC721 is
      * @inheritdoc LSP8IdentifiableDigitalAssetCore
      *
      * @custom:events
-     * - LSP7 {AuthorizedOperator} event.
+     * - LSP7 {OperatorAuthorizationChanged} event.
      * - ERC721 {Approval} event.
      */
     function authorizeOperator(
@@ -344,7 +344,7 @@ abstract contract LSP8CompatibleERC721 is
         bool isAdded = _operators[tokenId].add(operator);
         if (!isAdded) revert LSP8OperatorAlreadyAuthorized(operator, tokenId);
 
-        emit AuthorizedOperator(
+        emit OperatorAuthorizationChanged(
             operator,
             tokenOwner,
             tokenId,
diff --git a/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol b/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol
index 1f57d45f2..fa17a9514 100644
--- a/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol
+++ b/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol
@@ -325,7 +325,7 @@ abstract contract LSP8CompatibleERC721InitAbstract is
      * @inheritdoc LSP8IdentifiableDigitalAssetCore
      *
      * @custom:events
-     * - LSP7 {AuthorizedOperator} event.
+     * - LSP7 {OperatorAuthorizationChanged} event.
      * - ERC721 {Approval} event.
      */
     function authorizeOperator(
@@ -353,7 +353,7 @@ abstract contract LSP8CompatibleERC721InitAbstract is
         bool isAdded = _operators[tokenId].add(operator);
         if (!isAdded) revert LSP8OperatorAlreadyAuthorized(operator, tokenId);
 
-        emit AuthorizedOperator(
+        emit OperatorAuthorizationChanged(
             operator,
             tokenOwner,
             tokenId,

From 6368be5efb2dad2d8e1d6956af871877741c71f0 Mon Sep 17 00:00:00 2001
From: YamenMerhi <yamennmerhi@gmail.com>
Date: Mon, 27 Nov 2023 18:08:20 +0200
Subject: [PATCH 2/3] test: change operator event names

---
 .../LSP7CompatibleERC20.behaviour.ts          | 14 +++---
 .../LSP7DigitalAsset.behaviour.ts             | 48 +++++++++----------
 .../LSP8CompatibleERC721.behaviour.ts         |  8 ++--
 .../LSP8IdentifiableDigitalAsset.behaviour.ts | 18 +++----
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts b/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
index 6d5783c0c..df9df8bbd 100644
--- a/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
+++ b/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
@@ -83,7 +83,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
         const tx = await context.lsp7CompatibleERC20.approve(operator, authorizedAmount);
 
         await expect(tx)
-          .to.emit(context.lsp7CompatibleERC20, 'AuthorizedOperator')
+          .to.emit(context.lsp7CompatibleERC20, 'OperatorAuthorizationChanged')
           .withArgs(operator, tokenOwner, authorizedAmount, '0x');
 
         await expect(tx)
@@ -107,7 +107,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
           });
 
           await expect(tx)
-            .to.emit(context.lsp7CompatibleERC20, 'AuthorizedOperator')
+            .to.emit(context.lsp7CompatibleERC20, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, amount, '0x');
 
           await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -127,7 +127,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
           const tx = await context.lsp7CompatibleERC20.approve(operator, amount);
 
           await expect(tx)
-            .to.emit(context.lsp7CompatibleERC20, 'AuthorizedOperator')
+            .to.emit(context.lsp7CompatibleERC20, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, amount, '0x');
 
           expect(
@@ -153,7 +153,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
           const tx = await context.lsp7CompatibleERC20.approve(operator, authorizedAmount);
 
           await expect(tx)
-            .to.emit(context.lsp7CompatibleERC20, 'AuthorizedOperator')
+            .to.emit(context.lsp7CompatibleERC20, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, authorizedAmount, '0x');
 
           await expect(tx)
@@ -180,7 +180,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
           const tx = await context.lsp7CompatibleERC20.approve(operator, authorizedAmount);
 
           await expect(tx)
-            .to.emit(context.lsp7CompatibleERC20, 'RevokedOperator')
+            .to.emit(context.lsp7CompatibleERC20, 'OperatorRevoked')
             .withArgs(operator, tokenOwner, false, '0x');
 
           await expect(tx)
@@ -203,7 +203,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
             });
 
             await expect(tx)
-              .to.emit(context.lsp7CompatibleERC20, 'RevokedOperator')
+              .to.emit(context.lsp7CompatibleERC20, 'OperatorRevoked')
               .withArgs(operator, tokenOwner, false, '0x');
 
             expect(tx).to.not.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -222,7 +222,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
             const tx = await context.lsp7CompatibleERC20.approve(operator, 0);
 
             await expect(tx)
-              .to.emit(context.lsp7CompatibleERC20, 'RevokedOperator')
+              .to.emit(context.lsp7CompatibleERC20, 'OperatorRevoked')
               .withArgs(operator, tokenOwner, false, '0x');
 
             expect(
diff --git a/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts b/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
index 7b6efc916..39721683a 100644
--- a/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
+++ b/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
@@ -200,7 +200,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             const tx = await context.lsp7.authorizeOperator(operator, amount, '0x');
 
             await expect(tx)
-              .to.emit(context.lsp7, 'AuthorizedOperator')
+              .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, amount, '0x');
 
             expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(amount);
@@ -225,7 +225,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
               const tx = await context.lsp7.authorizeOperator(operator, amount, '0x');
 
               await expect(tx)
-                .to.emit(context.lsp7, 'AuthorizedOperator')
+                .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
                 .withArgs(operator, tokenOwner, amount, '0x');
 
               expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(amount);
@@ -274,7 +274,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           });
 
           await expect(tx)
-            .to.emit(context.lsp7, 'AuthorizedOperator')
+            .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, amount, '0xaabbccdd');
 
           await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -292,7 +292,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           const tx = await context.lsp7.authorizeOperator(operator, amount, '0xaabbccdd');
 
           await expect(tx)
-            .to.emit(context.lsp7, 'AuthorizedOperator')
+            .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, amount, '0xaabbccdd');
 
           expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(amount);
@@ -309,7 +309,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         const tx = await context.lsp7.authorizeOperator(operator, amount, '0x');
 
         await expect(tx)
-          .to.emit(context.lsp7, 'AuthorizedOperator')
+          .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
           .withArgs(operator, tokenOwner, amount, '0x');
 
         expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(amount);
@@ -349,7 +349,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             const tx = await context.lsp7.increaseAllowance(operator, addedAmount, '0x');
 
             await expect(tx)
-              .to.emit(context.lsp7, 'AuthorizedOperator')
+              .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, expectedNewAllowance, '0x');
 
             expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(
@@ -406,7 +406,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             );
 
             await expect(tx)
-              .to.emit(context.lsp7, 'AuthorizedOperator')
+              .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, expectedNewAllowance, '0x');
 
             expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(
@@ -436,7 +436,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         const tx = await context.lsp7.authorizeOperator(operator, amount, '0x');
 
         await expect(tx)
-          .to.emit(context.lsp7, 'AuthorizedOperator')
+          .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
           .withArgs(operator, tokenOwner, amount, '0x');
 
         expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(amount);
@@ -474,7 +474,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
 
       describe('when there was an allowance before for the operator', () => {
         describe("when decreasing the operator's allowance by an amount smaller than the full allowance", () => {
-          it("should decrease the operator's allowance by the `subtractedAmount` + emit `AuthorizedOperator` event", async () => {
+          it("should decrease the operator's allowance by the `subtractedAmount` + emit `OperatorAuthorizationChanged` event", async () => {
             const operator = context.accounts.operator.address;
             const tokenOwner = context.accounts.owner.address;
 
@@ -487,7 +487,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             const expectedNewAllowance = allowanceBefore.sub(subtractedAmount);
 
             await expect(tx)
-              .to.emit(context.lsp7, 'AuthorizedOperator')
+              .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, expectedNewAllowance, '0x');
 
             expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(
@@ -497,7 +497,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         });
 
         describe("when decreasing the operator's allowance by the full allowance", () => {
-          it("should set the operator's allowance to zero + emit `RevokedOperator` event", async () => {
+          it("should set the operator's allowance to zero + emit `OperatorRevoked` event", async () => {
             const operator = context.accounts.operator.address;
             const tokenOwner = context.accounts.owner.address;
 
@@ -508,7 +508,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             const expectedNewAllowance = 0;
 
             await expect(tx)
-              .to.emit(context.lsp7, 'RevokedOperator')
+              .to.emit(context.lsp7, 'OperatorRevoked')
               .withArgs(operator, tokenOwner, true, '0x');
 
             expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(
@@ -559,7 +559,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         // effects
         const tx = await context.lsp7.revokeOperator(operator, false, '0x');
         await expect(tx)
-          .to.emit(context.lsp7, 'RevokedOperator')
+          .to.emit(context.lsp7, 'OperatorRevoked')
           .withArgs(operator, tokenOwner, false, '0x');
 
         // post-conditions
@@ -582,7 +582,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         // effects
         const tx = await context.lsp7.revokeOperator(operator, false, '0x');
         await expect(tx)
-          .to.emit(context.lsp7, 'RevokedOperator')
+          .to.emit(context.lsp7, 'OperatorRevoked')
           .withArgs(operator, tokenOwner, false, '0x');
 
         // post-conditions
@@ -626,7 +626,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         });
 
         await expect(tx)
-          .to.emit(context.lsp7, 'RevokedOperator')
+          .to.emit(context.lsp7, 'OperatorRevoked')
           .withArgs(operator, tokenOwner, true, '0xaabbccdd');
 
         await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -663,7 +663,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
 
         await expect(context.lsp7.revokeOperator(operator, false, '0xaabbccdd')).to.emit(
           context.lsp7,
-          'RevokedOperator',
+          'OperatorRevoked',
         );
       });
     });
@@ -810,11 +810,11 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
 
             if (postIsOperatorFor.eq('0')) {
               await expect(tx)
-                .to.emit(context.lsp7, 'RevokedOperator')
+                .to.emit(context.lsp7, 'OperatorRevoked')
                 .withArgs(context.accounts.operator.address, from, false, '0x');
             } else {
               await expect(tx)
-                .to.emit(context.lsp7, 'AuthorizedOperator')
+                .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
                 .withArgs(context.accounts.operator.address, from, postIsOperatorFor, '0x');
             }
           }
@@ -1282,7 +1282,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
 
                 if (postIsOperatorFor.eq('0')) {
                   await expect(tx)
-                    .to.emit(context.lsp7, 'RevokedOperator')
+                    .to.emit(context.lsp7, 'OperatorRevoked')
                     .withArgs(
                       context.accounts.operator.address,
                       from[index],
@@ -1292,7 +1292,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     );
                 } else {
                   await expect(tx)
-                    .to.emit(context.lsp7, 'AuthorizedOperator')
+                    .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
                     .withArgs(context.accounts.operator.address, from, postIsOperatorFor, '');
                 }
               }
@@ -1960,7 +1960,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             );
         });
 
-        it('should have emitted a `RevokedOperator` event', async () => {
+        it('should have emitted a `OperatorRevoked` event', async () => {
           const operator = context.accounts.operator;
           const amount = operatorAllowance;
 
@@ -1970,7 +1970,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           await expect(
             context.lsp7.connect(operator).burn(context.accounts.owner.address, amount, '0x'),
           )
-            .to.emit(context.lsp7, 'RevokedOperator')
+            .to.emit(context.lsp7, 'OperatorRevoked')
             .withArgs(operator.address, context.accounts.owner.address, false, '0x');
         });
       });
@@ -2054,7 +2054,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             );
         });
 
-        it("should emit an `AuthorizedOperator` event with the updated operator's allowance", async () => {
+        it("should emit an `OperatorAuthorizationChanged` event with the updated operator's allowance", async () => {
           const amount = 10;
           assert.isBelow(amount, operatorAllowance);
 
@@ -2063,7 +2063,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           await expect(
             context.lsp7.connect(operator).burn(context.accounts.owner.address, amount, '0x'),
           )
-            .to.emit(context.lsp7, 'AuthorizedOperator')
+            .to.emit(context.lsp7, 'OperatorAuthorizationChanged')
             .withArgs(
               operator.address,
               context.accounts.owner.address,
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
index edf0b2ad7..00bb4c36f 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
@@ -220,7 +220,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
             const tx = await context.lsp8CompatibleERC721.approve(operator, tokenId);
 
             await expect(tx)
-              .to.emit(context.lsp8CompatibleERC721, 'AuthorizedOperator')
+              .to.emit(context.lsp8CompatibleERC721, 'OperatorAuthorizationChanged')
               .withArgs(operator, context.accounts.owner.address, tokenIdAsBytes32(tokenId), '0x');
 
             await expect(tx)
@@ -241,7 +241,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
               });
 
               await expect(tx)
-                .to.emit(context.lsp8CompatibleERC721, 'AuthorizedOperator')
+                .to.emit(context.lsp8CompatibleERC721, 'OperatorAuthorizationChanged')
                 .withArgs(operator, tokenOwner, tokenIdAsBytes32(tokenId), '0x');
 
               await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -264,7 +264,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
               const tx = await context.lsp8CompatibleERC721.approve(operator, tokenId);
 
               await expect(tx)
-                .to.emit(context.lsp8CompatibleERC721, 'AuthorizedOperator')
+                .to.emit(context.lsp8CompatibleERC721, 'OperatorAuthorizationChanged')
                 .withArgs(operator, tokenOwner, tokenIdAsBytes32(tokenId), '0x');
 
               expect(
@@ -748,7 +748,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
         .withArgs(from, to, ethers.BigNumber.from(tokenId));
 
       await expect(tx)
-        .to.emit(context.lsp8CompatibleERC721, 'RevokedOperator')
+        .to.emit(context.lsp8CompatibleERC721, 'OperatorRevoked')
         .withArgs(context.accounts.operator.address, from, tokenIdAsBytes32(tokenId), false, '0x');
 
       // post-conditions
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
index f03a712ae..7fccfd663 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
@@ -255,7 +255,7 @@ export const shouldBehaveLikeLSP8 = (
           const tx = await context.lsp8.authorizeOperator(operator, tokenId, '0x');
 
           await expect(tx)
-            .to.emit(context.lsp8, 'AuthorizedOperator')
+            .to.emit(context.lsp8, 'OperatorAuthorizationChanged')
             .withArgs(operator, tokenOwner, tokenId, '0x');
 
           expect(await context.lsp8.isOperatorFor(operator, tokenId)).to.be.true;
@@ -303,7 +303,7 @@ export const shouldBehaveLikeLSP8 = (
             });
 
             await expect(tx)
-              .to.emit(context.lsp8, 'AuthorizedOperator')
+              .to.emit(context.lsp8, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, tokenId, '0xaabbccdd');
 
             await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -321,7 +321,7 @@ export const shouldBehaveLikeLSP8 = (
             const tx = await context.lsp8.authorizeOperator(operator, tokenId, '0xaabbccdd');
 
             await expect(tx)
-              .to.emit(context.lsp8, 'AuthorizedOperator')
+              .to.emit(context.lsp8, 'OperatorAuthorizationChanged')
               .withArgs(operator, tokenOwner, tokenId, '0xaabbccdd');
 
             expect(await context.lsp8.isOperatorFor(operator, tokenId)).to.be.true;
@@ -384,7 +384,7 @@ export const shouldBehaveLikeLSP8 = (
           // effects
           const tx = await context.lsp8.revokeOperator(operator, tokenId, false, '0x');
           await expect(tx)
-            .to.emit(context.lsp8, 'RevokedOperator')
+            .to.emit(context.lsp8, 'OperatorRevoked')
             .withArgs(operator, tokenOwner, tokenId, false, '0x');
 
           // post-conditions
@@ -437,7 +437,7 @@ export const shouldBehaveLikeLSP8 = (
           });
 
           await expect(tx)
-            .to.emit(context.lsp8, 'RevokedOperator')
+            .to.emit(context.lsp8, 'OperatorRevoked')
             .withArgs(operator, tokenOwner, tokenId, true, '0xaabbccdd');
 
           await expect(tx).to.emit(tokenReceiverWithLSP1, 'UniversalReceiver');
@@ -678,11 +678,11 @@ export const shouldBehaveLikeLSP8 = (
           .withArgs(operator.address, from, to, tokenId, force, data);
 
         await expect(tx)
-          .to.emit(context.lsp8, 'RevokedOperator')
+          .to.emit(context.lsp8, 'OperatorRevoked')
           .withArgs(context.accounts.operator.address, from, tokenId, false, '0x');
 
         await expect(tx)
-          .to.emit(context.lsp8, 'RevokedOperator')
+          .to.emit(context.lsp8, 'OperatorRevoked')
           .withArgs(context.accounts.anotherOperator.address, from, tokenId, false, '0x');
 
         // post-conditions
@@ -1100,7 +1100,7 @@ export const shouldBehaveLikeLSP8 = (
                 data[index],
               );
             await expect(tx)
-              .to.emit(context.lsp8, 'RevokedOperator')
+              .to.emit(context.lsp8, 'OperatorRevoked')
               .withArgs(
                 context.accounts.operator.address,
                 from[index],
@@ -1109,7 +1109,7 @@ export const shouldBehaveLikeLSP8 = (
                 '0x',
               );
             await expect(tx)
-              .to.emit(context.lsp8, 'RevokedOperator')
+              .to.emit(context.lsp8, 'OperatorRevoked')
               .withArgs(
                 context.accounts.anotherOperator.address,
                 from[index],

From 4583f070dace895eaa11f93e24384f0e14f28088 Mon Sep 17 00:00:00 2001
From: YamenMerhi <yamennmerhi@gmail.com>
Date: Mon, 27 Nov 2023 18:08:31 +0200
Subject: [PATCH 3/3] docs: generate docs

---
 .../LSP7DigitalAsset/LSP7DigitalAsset.md      | 86 +++++++++----------
 .../extensions/LSP7Burnable.md                | 86 +++++++++----------
 .../extensions/LSP7CappedSupply.md            | 86 +++++++++----------
 .../extensions/LSP7CompatibleERC20.md         | 86 +++++++++----------
 .../presets/LSP7CompatibleERC20Mintable.md    | 86 +++++++++----------
 .../LSP7DigitalAsset/presets/LSP7Mintable.md  | 86 +++++++++----------
 .../LSP8IdentifiableDigitalAsset.md           | 84 +++++++++---------
 .../extensions/LSP8Burnable.md                | 84 +++++++++---------
 .../extensions/LSP8CappedSupply.md            | 84 +++++++++---------
 .../extensions/LSP8CompatibleERC721.md        | 86 +++++++++----------
 .../extensions/LSP8Enumerable.md              | 84 +++++++++---------
 .../presets/LSP8CompatibleERC721Mintable.md   | 86 +++++++++----------
 .../presets/LSP8Mintable.md                   | 84 +++++++++---------
 13 files changed, 554 insertions(+), 554 deletions(-)

diff --git a/docs/contracts/LSP7DigitalAsset/LSP7DigitalAsset.md b/docs/contracts/LSP7DigitalAsset/LSP7DigitalAsset.md
index 3900f03f1..53f1af642 100644
--- a/docs/contracts/LSP7DigitalAsset/LSP7DigitalAsset.md
+++ b/docs/contracts/LSP7DigitalAsset/LSP7DigitalAsset.md
@@ -1126,34 +1126,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7DigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1182,43 +1154,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7DigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7DigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1229,11 +1205,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7DigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.md b/docs/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.md
index be7904c07..e3b45d356 100644
--- a/docs/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.md
+++ b/docs/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.md
@@ -1151,34 +1151,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1207,43 +1179,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1254,11 +1230,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.md b/docs/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.md
index ce8ec9237..c53455529 100644
--- a/docs/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.md
+++ b/docs/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.md
@@ -1125,34 +1125,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1181,43 +1153,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1228,11 +1204,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.md b/docs/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.md
index 4f96f2746..e18beae8e 100644
--- a/docs/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.md
+++ b/docs/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.md
@@ -1241,34 +1241,6 @@ Emitted when the allowance of a `spender` for an `owner` is set by a call to [`a
 
 <br/>
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7CompatibleERC20.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1297,43 +1269,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7CompatibleERC20.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7CompatibleERC20.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1344,11 +1320,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7CompatibleERC20.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.md b/docs/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.md
index 44601bc29..072e1a6e9 100644
--- a/docs/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.md
+++ b/docs/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.md
@@ -1275,34 +1275,6 @@ Emitted when the allowance of a `spender` for an `owner` is set by a call to [`a
 
 <br/>
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7CompatibleERC20Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1331,43 +1303,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7CompatibleERC20Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7CompatibleERC20Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1378,11 +1354,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7CompatibleERC20Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP7DigitalAsset/presets/LSP7Mintable.md b/docs/contracts/LSP7DigitalAsset/presets/LSP7Mintable.md
index 3c6bf9d9b..e4a619bde 100644
--- a/docs/contracts/LSP7DigitalAsset/presets/LSP7Mintable.md
+++ b/docs/contracts/LSP7DigitalAsset/presets/LSP7Mintable.md
@@ -1188,34 +1188,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP7Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol)
-- Event signature: `AuthorizedOperator(address,address,uint256,bytes)`
-- Event topic hash: `0x0744b3de98efaff36606a0e67662fb8697adb0ed49d90730bdb4bbf885f30597`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` for `amount` tokens.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                             |
-| -------------------------- | :-------: | ----------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
-| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
-| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1244,43 +1216,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP7Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,uint256,bytes)`
+- Event topic hash: `0xf772a43bfdf4729b196e3fb54a818b91a2ca6c49d10b2e16278752f9f515c25d`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, uint256 indexed amount, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` for `amount` tokens.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                             |
+| -------------------------- | :-------: | ----------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator                                   |
+| `tokenOwner` **`indexed`** | `address` | The token owner                                                         |
+| `amount` **`indexed`**     | `uint256` | The amount of tokens `operator` address has access to from `tokenOwner` |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                         |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP7Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol)
-- Event signature: `RevokedOperator(address,address,bool,bytes)`
-- Event topic hash: `0x66015c8835ee443e5bc280176609215a5035da4bae05bdef994596d7e43aae22`
+- Event signature: `OperatorRevoked(address,address,bool,bytes)`
+- Event topic hash: `0x0ebf5762d8855cbe012d2ca42fb33a81175e17c8a8751f8859931ba453bd4167`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bool indexed notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`authorizedAmountFor(...)`](#`authorizedamountfor) to `0`.
@@ -1291,11 +1267,35 @@ Emitted when `tokenOwner` disables `operator` for `amount` tokens and set its [`
 | -------------------------- | :-------: | ------------------------------------------------------------- |
 | `operator` **`indexed`**   | `address` | The address revoked from operating                            |
 | `tokenOwner` **`indexed`** | `address` | The token owner                                               |
-| `notified`                 |  `bool`   | Bool indicating whether the operator has been notified or not |
+| `notified` **`indexed`**   |  `bool`   | Bool indicating whether the operator has been notified or not |
 | `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.               |
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-7-DigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-7-DigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP7Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.md b/docs/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.md
index c2e4b5192..ac791e9b1 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.md
@@ -1123,34 +1123,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8IdentifiableDigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1179,43 +1151,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8IdentifiableDigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8IdentifiableDigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1232,6 +1208,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8IdentifiableDigitalAsset.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.md b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.md
index 039e018b9..eef9d7857 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.md
@@ -1149,34 +1149,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1205,43 +1177,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1258,6 +1234,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8Burnable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.md b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.md
index 683016cdb..aa8d0ab24 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.md
@@ -1123,34 +1123,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1179,43 +1151,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1232,6 +1208,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8CappedSupply.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.md b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.md
index 666d1384b..b5ebc9b24 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.md
@@ -128,7 +128,7 @@ Allow an `operator` address to transfer or burn a specific `tokenId` on behalf o
 
 **Emitted events:**
 
-- LSP7 [`AuthorizedOperator`](#authorizedoperator) event.
+- LSP7 [`OperatorAuthorizationChanged`](#operatorauthorizationchanged) event.
 - ERC721 [`Approval`](#approval) event.
 
 </blockquote>
@@ -1487,34 +1487,6 @@ Emitted when `account` grants or revokes permission to `operator` to transfer th
 
 <br/>
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8CompatibleERC721.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1543,43 +1515,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8CompatibleERC721.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8CompatibleERC721.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1596,6 +1572,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8CompatibleERC721.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.md b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.md
index 075c11a2c..55a509af9 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.md
@@ -1151,34 +1151,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8Enumerable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1207,43 +1179,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8Enumerable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8Enumerable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1260,6 +1236,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8Enumerable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.md b/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.md
index e5effdcc1..b605d13da 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.md
@@ -135,7 +135,7 @@ Allow an `operator` address to transfer or burn a specific `tokenId` on behalf o
 
 **Emitted events:**
 
-- LSP7 [`AuthorizedOperator`](#authorizedoperator) event.
+- LSP7 [`OperatorAuthorizationChanged`](#operatorauthorizationchanged) event.
 - ERC721 [`Approval`](#approval) event.
 
 </blockquote>
@@ -1529,34 +1529,6 @@ Emitted when `account` grants or revokes permission to `operator` to transfer th
 
 <br/>
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8CompatibleERC721Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1585,43 +1557,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8CompatibleERC721Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8CompatibleERC721Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1638,6 +1614,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8CompatibleERC721Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References
diff --git a/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.md b/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.md
index 5bf7ffb76..ac79ec132 100644
--- a/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.md
+++ b/docs/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.md
@@ -1187,34 +1187,6 @@ CALL opcode, passing the [`msg.data`](#msg.data) appended with the 20 bytes of t
 
 ## Events
 
-### AuthorizedOperator
-
-:::note References
-
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#authorizedoperator)
-- Solidity implementation: [`LSP8Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol)
-- Event signature: `AuthorizedOperator(address,address,bytes32,bytes)`
-- Event topic hash: `0x0052e433f2d4225671bc164dd1cdc9a76044356091f27ad234798bd0cbf08349`
-
-:::
-
-```solidity
-event AuthorizedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
-```
-
-Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
-
-#### Parameters
-
-| Name                       |   Type    | Description                                                          |
-| -------------------------- | :-------: | -------------------------------------------------------------------- |
-| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
-| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
-| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
-| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
-
-<br/>
-
 ### DataChanged
 
 :::note References
@@ -1243,43 +1215,47 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
 
 <br/>
 
-### OwnershipTransferred
+### OperatorAuthorizationChanged
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorauthorizationchanged)
 - Solidity implementation: [`LSP8Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol)
-- Event signature: `OwnershipTransferred(address,address)`
-- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+- Event signature: `OperatorAuthorizationChanged(address,address,bytes32,bytes)`
+- Event topic hash: `0x1b1b58aa2ec0cec2228b2d37124556d41f5a1f7b12f089171f896cc236671215`
 
 :::
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+event OperatorAuthorizationChanged(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bytes operatorNotificationData);
 ```
 
+Emitted when `tokenOwner` enables `operator` to transfer or burn the `tokenId`.
+
 #### Parameters
 
-| Name                          |   Type    | Description |
-| ----------------------------- | :-------: | ----------- |
-| `previousOwner` **`indexed`** | `address` | -           |
-| `newOwner` **`indexed`**      | `address` | -           |
+| Name                       |   Type    | Description                                                          |
+| -------------------------- | :-------: | -------------------------------------------------------------------- |
+| `operator` **`indexed`**   | `address` | The address authorized as an operator.                               |
+| `tokenOwner` **`indexed`** | `address` | The owner of the `tokenId`.                                          |
+| `tokenId` **`indexed`**    | `bytes32` | The tokenId `operator` address has access on behalf of `tokenOwner`. |
+| `operatorNotificationData` |  `bytes`  | The data to notify the operator about via LSP1.                      |
 
 <br/>
 
-### RevokedOperator
+### OperatorRevoked
 
 :::note References
 
-- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#revokedoperator)
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#operatorrevoked)
 - Solidity implementation: [`LSP8Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol)
-- Event signature: `RevokedOperator(address,address,bytes32,bool,bytes)`
-- Event topic hash: `0x3ee932cea40ebbbfd8577d47156cc17cce8683802c57bbd1fb8c131c6f07af0a`
+- Event signature: `OperatorRevoked(address,address,bytes32,bool,bytes)`
+- Event topic hash: `0xc78cd419d6136f9f1c1c6aec1d3fae098cffaf8bc86314a8f2685e32fe574e3c`
 
 :::
 
 ```solidity
-event RevokedOperator(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
+event OperatorRevoked(address indexed operator, address indexed tokenOwner, bytes32 indexed tokenId, bool notified, bytes operatorNotificationData);
 ```
 
 Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on its behalf.
@@ -1296,6 +1272,30 @@ Emitted when `tokenOwner` disables `operator` to transfer or burn `tokenId` on i
 
 <br/>
 
+### OwnershipTransferred
+
+:::note References
+
+- Specification details: [**LSP-8-IdentifiableDigitalAsset**](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-8-IdentifiableDigitalAsset.md#ownershiptransferred)
+- Solidity implementation: [`LSP8Mintable.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol)
+- Event signature: `OwnershipTransferred(address,address)`
+- Event topic hash: `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0`
+
+:::
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+```
+
+#### Parameters
+
+| Name                          |   Type    | Description |
+| ----------------------------- | :-------: | ----------- |
+| `previousOwner` **`indexed`** | `address` | -           |
+| `newOwner` **`indexed`**      | `address` | -           |
+
+<br/>
+
 ### Transfer
 
 :::note References