diff --git a/cypress/integration/rendering/gitGraph.spec.js b/cypress/integration/rendering/gitGraph.spec.js
index 249febd08..42dc57439 100644
--- a/cypress/integration/rendering/gitGraph.spec.js
+++ b/cypress/integration/rendering/gitGraph.spec.js
@@ -11,7 +11,7 @@ describe('Git Graph diagram', () => {
       {}
     );
   });
-  it('2: should render a simple gitgraph with commit on main branch with Id', () => {
+  it('2: should render a simple gitgraph with commit on main branch with id', () => {
     imgSnapshotTest(
       `gitGraph
        commit id: "One"
@@ -253,7 +253,7 @@ describe('Git Graph diagram', () => {
       `
       gitGraph
       checkout main
-      %% Make sure to manually set the ID of all commits, for consistent visual tests
+      %% Make sure to manually set the id of all commits, for consistent visual tests
       commit id: "1-abcdefg"
       checkout main
       branch branch1
@@ -343,7 +343,7 @@ gitGraph
       {}
     );
   });
-  it('16: should render a simple gitgraph with commit on main branch with Id | Vertical Branch', () => {
+  it('16: should render a simple gitgraph with commit on main branch with id | Vertical Branch', () => {
     imgSnapshotTest(
       `gitGraph TB:
        commit id: "One"
@@ -585,7 +585,7 @@ gitGraph
       `
       gitGraph TB:
       checkout main
-      %% Make sure to manually set the ID of all commits, for consistent visual tests
+      %% Make sure to manually set the id of all commits, for consistent visual tests
       commit id: "1-abcdefg"
       checkout main
       branch branch1
@@ -1024,7 +1024,7 @@ gitGraph TB:
         {}
       );
     });
-    it('51: should render a simple gitgraph with commit on main branch with Id | Vertical Branch - Bottom-to-top', () => {
+    it('51: should render a simple gitgraph with commit on main branch with id | Vertical Branch - Bottom-to-top', () => {
       imgSnapshotTest(
         `gitGraph BT:
          commit id: "One"
@@ -1266,7 +1266,7 @@ gitGraph TB:
         `
         gitGraph BT:
         checkout main
-        %% Make sure to manually set the ID of all commits, for consistent visual tests
+        %% Make sure to manually set the id of all commits, for consistent visual tests
         commit id: "1-abcdefg"
         checkout main
         branch branch1
@@ -1491,7 +1491,7 @@ gitGraph TB:
         `
         gitGraph
         switch main
-        %% Make sure to manually set the ID of all commits, for consistent visual tests
+        %% Make sure to manually set the id of all commits, for consistent visual tests
         commit id: "1-abcdefg"
         switch main
         branch branch1
diff --git a/demos/classchart.html b/demos/classchart.html
index 980ea5098..10d8e6b70 100644
--- a/demos/classchart.html
+++ b/demos/classchart.html
@@ -148,7 +148,7 @@
     <pre class="mermaid">
     classDiagram
       class Person {
-        +Id : Guid
+        +ID : Guid
         +FirstName : string
         +LastName : string
         -privateProperty : string
@@ -218,10 +218,10 @@
           +double side
         }
       }
-      
+
       Shape <|-- Circle
       Shape <|-- Square
-      
+
       namespace Vehicles {
         class Vehicle {
           +String brand
@@ -233,12 +233,12 @@
           +boolean hasGears
         }
       }
-      
+
       Vehicle <|-- Car
       Vehicle <|-- Bike
       Car --> Circle : "Logo Shape"
       Bike --> Square : "Logo Shape"
-                  
+
     </pre>
     <script type="module">
       import mermaid from './mermaid.esm.mjs';
diff --git a/docs/syntax/requirementDiagram.md b/docs/syntax/requirementDiagram.md
index 4dd7d16d9..36420d9b9 100644
--- a/docs/syntax/requirementDiagram.md
+++ b/docs/syntax/requirementDiagram.md
@@ -50,7 +50,7 @@ There are three types of components to a requirement diagram: requirement, eleme
 
 The grammar for defining each is defined below. Words denoted in angle brackets, such as `<word>`, are enumerated keywords that have options elaborated in a table. `user_defined_...` is use in any place where user input is expected.
 
-An important note on user text: all input can be surrounded in quotes or not. For example, both `Id: "here is an example"` and `Id: here is an example` are both valid. However, users must be careful with unquoted input. The parser will fail if another keyword is detected.
+An important note on user text: all input can be surrounded in quotes or not. For example, both `id: "here is an example"` and `id: here is an example` are both valid. However, users must be careful with unquoted input. The parser will fail if another keyword is detected.
 
 ### Requirement
 
diff --git a/packages/mermaid-layout-elk/src/render.ts b/packages/mermaid-layout-elk/src/render.ts
index dc9ccee8e..c290acf96 100644
--- a/packages/mermaid-layout-elk/src/render.ts
+++ b/packages/mermaid-layout-elk/src/render.ts
@@ -143,7 +143,7 @@ export const render = async (
             height: node.height,
           };
           if (node.isGroup) {
-            log.debug('Id abc88 subgraph = ', node.id, node.x, node.y, node.labelData);
+            log.debug('id abc88 subgraph = ', node.id, node.x, node.y, node.labelData);
             const subgraphEl = subgraphsEl.insert('g').attr('class', 'subgraph');
             // TODO use faster way of cloning
             const clusterNode = JSON.parse(JSON.stringify(node));
@@ -152,10 +152,10 @@ export const render = async (
             clusterNode.width = Math.max(clusterNode.width, node.labelData.width);
             await insertCluster(subgraphEl, clusterNode);
 
-            log.debug('Id (UIO)= ', node.id, node.width, node.shape, node.labels);
+            log.debug('id (UIO)= ', node.id, node.width, node.shape, node.labels);
           } else {
             log.info(
-              'Id NODE = ',
+              'id NODE = ',
               node.id,
               node.x,
               node.y,
diff --git a/packages/mermaid/src/dagre-wrapper/GraphObjects.md b/packages/mermaid/src/dagre-wrapper/GraphObjects.md
index 32e8af6fa..3a49c0ca1 100644
--- a/packages/mermaid/src/dagre-wrapper/GraphObjects.md
+++ b/packages/mermaid/src/dagre-wrapper/GraphObjects.md
@@ -106,7 +106,7 @@ Required edgeData for proper rendering:
 
 | property   | description                                                          |
 | ---------- | -------------------------------------------------------------------- |
-| id         | Id of the edge                                                       |
+| id         | ID of the edge                                                       |
 | arrowHead  | overlap between arrowHead and arrowType?                             |
 | arrowType  | overlap between arrowHead and arrowType?                             |
 | style      |                                                                      |
diff --git a/packages/mermaid/src/diagrams/class/classDb.ts b/packages/mermaid/src/diagrams/class/classDb.ts
index b2c3c944c..82ddcf09b 100644
--- a/packages/mermaid/src/diagrams/class/classDb.ts
+++ b/packages/mermaid/src/diagrams/class/classDb.ts
@@ -99,7 +99,7 @@ export class ClassDB implements DiagramDB {
   /**
    * Function called by parser when a node definition has been found.
    *
-   * @param id - Id of the class to add
+   * @param id - ID of the class to add
    * @public
    */
   public addClass(_id: string) {
@@ -524,7 +524,7 @@ export class ClassDB implements DiagramDB {
   /**
    * Function called by parser when a namespace definition has been found.
    *
-   * @param id - Id of the namespace to add
+   * @param id - ID of the namespace to add
    * @public
    */
   public addNamespace(id: string) {
@@ -553,8 +553,8 @@ export class ClassDB implements DiagramDB {
   /**
    * Function called by parser when a namespace definition has been found.
    *
-   * @param id - Id of the namespace to add
-   * @param classNames - Ids of the class to add
+   * @param id - ID of the namespace to add
+   * @param classNames - IDs of the class to add
    * @public
    */
   public addClassesToNamespace(id: string, classNames: string[]) {
diff --git a/packages/mermaid/src/diagrams/git/gitGraph.spec.ts b/packages/mermaid/src/diagrams/git/gitGraph.spec.ts
index 900460dca..fed21dd19 100644
--- a/packages/mermaid/src/diagrams/git/gitGraph.spec.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraph.spec.ts
@@ -471,7 +471,7 @@ describe('when parsing a gitGraph', function () {
     it('should handle a gitGraph commit with custom  type,tag, msg, commit id,', async () => {
       const str = `gitGraph:
         commit type:REVERSE tag: "test tag" msg: "test msg" id: "1111"
-    
+
         `;
 
       await parser.parse(str);
@@ -1232,7 +1232,7 @@ describe('when parsing a gitGraph', function () {
         expect(true).toBe(false);
       } catch (e: any) {
         expect(e.message).toBe(
-          'Incorrect usage of "merge". Commit with id:1-111 already exists, use different custom Id'
+          'Incorrect usage of "merge". Commit with id:1-111 already exists, use different custom id'
         );
       }
     });
@@ -1255,7 +1255,7 @@ describe('when parsing a gitGraph', function () {
     it('should throw error when trying to merge branch which has no commits', async () => {
       const str = `gitGraph
         branch test1
-    
+
         checkout main
         commit
         merge test1
diff --git a/packages/mermaid/src/diagrams/git/gitGraphAst.ts b/packages/mermaid/src/diagrams/git/gitGraphAst.ts
index 44597e9d7..36595eb51 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphAst.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraphAst.ts
@@ -222,7 +222,7 @@ export const merge = (mergeDB: MergeDB): void => {
     const error: any = new Error(
       'Incorrect usage of "merge". Commit with id:' +
         customId +
-        ' already exists, use different custom Id'
+        ' already exists, use different custom id'
     );
     error.hash = {
       text: `merge ${otherBranch} ${customId} ${overrideType} ${customTags?.join(' ')}`,
diff --git a/packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts b/packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts
index 5bfa20392..708b3cc28 100644
--- a/packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts
+++ b/packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts
@@ -149,7 +149,7 @@ function positionNodes(db: MindmapDB, cy: cytoscape.Core) {
     data.y = node.position().y;
     positionNode(db, data);
     const el = db.getElementById(data.nodeId);
-    log.info('Id:', id, 'Position: (', node.position().x, ', ', node.position().y, ')', data);
+    log.info('id:', id, 'Position: (', node.position().x, ', ', node.position().y, ')', data);
     el.attr(
       'transform',
       `translate(${node.position().x - data.width / 2}, ${node.position().y - data.height / 2})`
diff --git a/packages/mermaid/src/docs/syntax/requirementDiagram.md b/packages/mermaid/src/docs/syntax/requirementDiagram.md
index c1d171c17..06e7ac29e 100644
--- a/packages/mermaid/src/docs/syntax/requirementDiagram.md
+++ b/packages/mermaid/src/docs/syntax/requirementDiagram.md
@@ -27,7 +27,7 @@ There are three types of components to a requirement diagram: requirement, eleme
 
 The grammar for defining each is defined below. Words denoted in angle brackets, such as `<word>`, are enumerated keywords that have options elaborated in a table. `user_defined_...` is use in any place where user input is expected.
 
-An important note on user text: all input can be surrounded in quotes or not. For example, both `Id: "here is an example"` and `Id: here is an example` are both valid. However, users must be careful with unquoted input. The parser will fail if another keyword is detected.
+An important note on user text: all input can be surrounded in quotes or not. For example, both `id: "here is an example"` and `id: here is an example` are both valid. However, users must be careful with unquoted input. The parser will fail if another keyword is detected.
 
 ### Requirement
 
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/requirementBox.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/requirementBox.ts
index a41e1483a..eb50d09bd 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/requirementBox.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/requirementBox.ts
@@ -54,7 +54,7 @@ export async function requirementBox<T extends SVGGraphicsElement>(
   if (isRequirementNode) {
     const idHeight = await addText(
       shapeSvg,
-      `${requirementNode.requirementId ? `Id: ${requirementNode.requirementId}` : ''}`,
+      `${requirementNode.requirementId ? `id: ${requirementNode.requirementId}` : ''}`,
       accumulativeHeight,
       node.labelStyle
     );