diff --git a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
index 542539133..ba8058a55 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
@@ -66,17 +66,19 @@ const shapes = {
 
   // Rectangles
   rectWithTitle,
-  rect: rectWithTitle,
-  process: rectWithTitle,
-  proc: rectWithTitle,
   roundedRect,
   rounded: roundedRect,
   event: roundedRect,
   squareRect,
+  rectangle: squareRect,
+  rect: squareRect,
+  process: squareRect,
+  proc: squareRect,
   stadium,
   pill: stadium,
   term: stadium,
   windowPane,
+  'window-pane': windowPane,
   'win-pane': windowPane,
   'internal-storage': windowPane,
   dividedRectangle,
@@ -114,10 +116,11 @@ const shapes = {
   // Circles
   circle,
   doublecircle,
+  'double-circle': doublecircle,
   dc: doublecircle,
   crossedCircle,
-  'crossed-circ': crossedCircle,
-  'cross-circ': crossedCircle,
+  'crossed-circle': crossedCircle,
+  'cross-circle': crossedCircle,
   summary: crossedCircle,
   filledCircle,
   'filled-circle': filledCircle,
@@ -156,7 +159,7 @@ const shapes = {
   'manual-file': flippedTriangle,
   trapezoidalPentagon,
   'notched-pentagon': trapezoidalPentagon,
-  'not-pen': trapezoidalPentagon,
+  'not-pent': trapezoidalPentagon,
   'loop-limit': trapezoidalPentagon,
 
   //wave Edged Rectangles
@@ -166,6 +169,7 @@ const shapes = {
   flag: waveRectangle,
   'paper-tape': waveRectangle,
   waveEdgedRectangle,
+  'wave-edge-rect': waveEdgedRectangle,
   'wave-rect': waveEdgedRectangle,
   'we-rect': waveEdgedRectangle,
   doc: waveEdgedRectangle,
@@ -178,8 +182,9 @@ const shapes = {
   'lin-we-rect': linedWaveEdgedRect,
   'lin-doc': linedWaveEdgedRect,
   taggedWaveEdgedRectangle,
-  'tagged-wave-edged-rect': taggedWaveEdgedRectangle,
+  'tagged-wave-edged-rectangle': taggedWaveEdgedRectangle,
   'tag-we-rect': taggedWaveEdgedRectangle,
+  'tag-doc': taggedWaveEdgedRectangle,
 
   // Custom Rectangles
   bowTieRect,
@@ -196,15 +201,16 @@ const shapes = {
   card,
   'notched-rect': card,
   'notch-rect': card,
-  lean_right,
+  'lean-right': lean_right,
   'l-r': lean_right,
   'in-out': lean_right,
-  lean_left,
+  'lean-left': lean_left,
   'l-l': lean_left,
   'out-in': lean_left,
 
   // Miscellaneous
   forkJoin,
+  'long-rect': forkJoin,
   fork: forkJoin,
   join: forkJoin,
   choice,
@@ -213,6 +219,7 @@ const shapes = {
   anchor,
   diamond: question,
   lightningBolt,
+  'lightning-bolt': lightningBolt,
   bolt: lightningBolt,
   'com-link': lightningBolt,
   curlyBraceLeft,