diff --git a/src/game/tetromino/shapes.c b/src/game/tetromino/shapes.c
index 5a9f771..826fe41 100644
--- a/src/game/tetromino/shapes.c
+++ b/src/game/tetromino/shapes.c
@@ -3,39 +3,39 @@
 #include "../../window/colour.h"
 
 /*                                          0    1    2    3         */
-#define TET_SHAPE_O     ((Shape)0x0660) // 0000 0110 0110 0000      the O tetromino with no rotation
-#define TET_SHAPE_I     ((Shape)0x4444) // 0100 0100 0100 0100      the I tetromino with no rotation
-#define TET_SHAPE_I_90  ((Shape)0x0F00) // 0000 1111 0000 0000      the I tetromino with a 90° rotation
-#define TET_SHAPE_S     ((Shape)0x6C00) // 0110 1100 0000 0000      the S tetromino with no rotation
-#define TET_SHAPE_S_90  ((Shape)0x8C40) // 1000 1100 0100 0000      the S tetromino with a 90 rotation
-#define TET_SHAPE_Z     ((Shape)0xC600) // 1100 0110 0000 0000      the Z tetromino with no rotation
-#define TET_SHAPE_Z_90  ((Shape)0x4C80) // 0100 1100 1000 0000      the Z tetromino with a 90° rotation
-#define TET_SHAPE_T     ((Shape)0x0E40) // 0000 1110 0100 0000      the T tetromino with no rotation
-#define TET_SHAPE_T_90  ((Shape)0x4C40) // 0100 1100 0100 0000      the T tetromino with a 90° rotation
-#define TET_SHAPE_T_180 ((Shape)0x4E00) // 0100 1110 0000 0000      the T tetromino with a 180° rotation
-#define TET_SHAPE_T_270 ((Shape)0x4640) // 0100 0110 0100 0000      the T tetromino with a 270° rotation
+#define SHAPE_O     ((Shape)0x0660) // 0000 0110 0110 0000      the O tetromino with no rotation
+#define SHAPE_I     ((Shape)0x4444) // 0100 0100 0100 0100      the I tetromino with no rotation
+#define SHAPE_I_90  ((Shape)0x0F00) // 0000 1111 0000 0000      the I tetromino with a 90° rotation
+#define SHAPE_S     ((Shape)0x6C00) // 0110 1100 0000 0000      the S tetromino with no rotation
+#define SHAPE_S_90  ((Shape)0x8C40) // 1000 1100 0100 0000      the S tetromino with a 90 rotation
+#define SHAPE_Z     ((Shape)0xC600) // 1100 0110 0000 0000      the Z tetromino with no rotation
+#define SHAPE_Z_90  ((Shape)0x4C80) // 0100 1100 1000 0000      the Z tetromino with a 90° rotation
+#define SHAPE_T     ((Shape)0x0E40) // 0000 1110 0100 0000      the T tetromino with no rotation
+#define SHAPE_T_90  ((Shape)0x4C40) // 0100 1100 0100 0000      the T tetromino with a 90° rotation
+#define SHAPE_T_180 ((Shape)0x4E00) // 0100 1110 0000 0000      the T tetromino with a 180° rotation
+#define SHAPE_T_270 ((Shape)0x4640) // 0100 0110 0100 0000      the T tetromino with a 270° rotation
 
-#define TET_SHAPE_L     ((Shape)0x4460) // 0100 0100 0110 0000      the L tetromino with no rotation
-#define TET_SHAPE_L_90  ((Shape)0x0E80) // 0000 1110 1000 0000      the L tetromino with a 90° rotation
-#define TET_SHAPE_L_180 ((Shape)0xC440) // 1100 0100 0100 0000      the L tetromino with a 180° rotation
-#define TET_SHAPE_L_270 ((Shape)0x2E00) // 0010 1110 0000 0000      the L tetromino with a 270° rotation
+#define SHAPE_L     ((Shape)0x4460) // 0100 0100 0110 0000      the L tetromino with no rotation
+#define SHAPE_L_90  ((Shape)0x0E80) // 0000 1110 1000 0000      the L tetromino with a 90° rotation
+#define SHAPE_L_180 ((Shape)0xC440) // 1100 0100 0100 0000      the L tetromino with a 180° rotation
+#define SHAPE_L_270 ((Shape)0x2E00) // 0010 1110 0000 0000      the L tetromino with a 270° rotation
 
-#define TET_SHAPE_J     ((Shape)0x44C0) // 0100 0100 1100 0000      the J tetromino with no rotation
-#define TET_SHAPE_J_90  ((Shape)0x0E20) // 0000 1110 0010 0000      the J tetromino with a 90° rotation
-#define TET_SHAPE_J_180 ((Shape)0x6440) // 0110 0100 0100 0000      the J tetromino with a 180° rotation
-#define TET_SHAPE_J_270 ((Shape)0x8E00) // 1000 1110 0000 0000      the J tetromino with a 270° rotation
+#define SHAPE_J     ((Shape)0x44C0) // 0100 0100 1100 0000      the J tetromino with no rotation
+#define SHAPE_J_90  ((Shape)0x0E20) // 0000 1110 0010 0000      the J tetromino with a 90° rotation
+#define SHAPE_J_180 ((Shape)0x6440) // 0110 0100 0100 0000      the J tetromino with a 180° rotation
+#define SHAPE_J_270 ((Shape)0x8E00) // 1000 1110 0000 0000      the J tetromino with a 270° rotation
 
 Shape shape_from_id(ShapeId id) {
     // clang-format off
     static const Shape shapes[TETROMINO_COUNT][4] = {
         // 0°         90°             180°             170°
-        {TET_SHAPE_O, TET_SHAPE_O,    TET_SHAPE_O,     TET_SHAPE_O},
-        {TET_SHAPE_I, TET_SHAPE_I_90, TET_SHAPE_I,     TET_SHAPE_I_90},
-        {TET_SHAPE_S, TET_SHAPE_S_90, TET_SHAPE_S,     TET_SHAPE_S_90},
-        {TET_SHAPE_Z, TET_SHAPE_Z_90, TET_SHAPE_Z,     TET_SHAPE_Z_90},
-        {TET_SHAPE_T, TET_SHAPE_T_90, TET_SHAPE_T_180, TET_SHAPE_T_270},
-        {TET_SHAPE_L, TET_SHAPE_L_90, TET_SHAPE_L_180, TET_SHAPE_L_270},
-        {TET_SHAPE_J, TET_SHAPE_J_90, TET_SHAPE_J_180, TET_SHAPE_J_270},
+        {SHAPE_O, SHAPE_O,    SHAPE_O,     SHAPE_O},
+        {SHAPE_I, SHAPE_I_90, SHAPE_I,     SHAPE_I_90},
+        {SHAPE_S, SHAPE_S_90, SHAPE_S,     SHAPE_S_90},
+        {SHAPE_Z, SHAPE_Z_90, SHAPE_Z,     SHAPE_Z_90},
+        {SHAPE_T, SHAPE_T_90, SHAPE_T_180, SHAPE_T_270},
+        {SHAPE_L, SHAPE_L_90, SHAPE_L_180, SHAPE_L_270},
+        {SHAPE_J, SHAPE_J_90, SHAPE_J_180, SHAPE_J_270},
     };
     // clang-format on