diff --git a/hdmi_firewall.kicad_sch b/hdmi_firewall.kicad_sch
index bec018c..0693d53 100644
--- a/hdmi_firewall.kicad_sch
+++ b/hdmi_firewall.kicad_sch
@@ -1131,7 +1131,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1b777ae9-cd2f-4a5f-9153-2de68dff78a6)
   )
-  (wire (pts (xy 40.005 52.07) (xy 45.72 52.07))
+  (wire (pts (xy 35.56 52.07) (xy 45.72 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 272d59b7-d84d-4ee4-ba8c-3c97a645cee8)
   )
@@ -1199,7 +1199,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68df8a4c-b596-460c-9dbd-4fc66355bb09)
   )
-  (wire (pts (xy 196.215 59.69) (xy 205.105 59.69))
+  (wire (pts (xy 193.675 59.69) (xy 205.105 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ddb3e3b-0e38-40de-b51b-418dac52baa3)
   )
@@ -1247,11 +1247,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f433ccd-8c75-4592-ac6f-4e82118fa08b)
   )
-  (wire (pts (xy 40.005 49.53) (xy 45.72 49.53))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9ffe91f7-f15d-4203-b009-78cd52817503)
-  )
-  (wire (pts (xy 193.675 49.53) (xy 201.93 49.53))
+  (wire (pts (xy 193.675 49.53) (xy 202.565 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a0227a6b-01dc-4f93-add1-1a63c21afc2e)
   )
@@ -1283,7 +1279,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b7b3af69-870d-4e2f-894e-ef144b23697e)
   )
-  (wire (pts (xy 201.93 54.61) (xy 205.105 54.61))
+  (wire (pts (xy 202.565 54.61) (xy 205.105 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bac8397b-8fad-4421-9e0c-2d500e2bd915)
   )
@@ -1315,9 +1311,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e1bf913d-3002-4632-94d1-b471ecebb8e8)
   )
-  (wire (pts (xy 196.215 62.23) (xy 193.675 62.23))
+  (wire (pts (xy 35.56 49.53) (xy 45.72 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e2b23a79-ede5-4c40-b5f0-a058f24eeb0b)
+    (uuid e3bbc6ed-dbea-4efc-9da5-ce6befe4cffa)
   )
   (wire (pts (xy 220.345 59.69) (xy 226.695 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1331,11 +1327,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ea0d372b-52f5-4020-83d1-4d402a3db067)
   )
-  (wire (pts (xy 201.93 49.53) (xy 201.93 54.61))
+  (wire (pts (xy 202.565 49.53) (xy 202.565 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fa9a1a6d-e541-4861-893f-66ed6693c68e)
   )
-  (wire (pts (xy 196.215 59.69) (xy 196.215 62.23))
+  (wire (pts (xy 193.675 59.69) (xy 193.675 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc8802a0-1739-44e7-b89f-87bd3f60bf73)
   )
@@ -1344,7 +1340,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2ca4f59e-ffa2-49ff-875e-47399e5708f2)
   )
-  (text "monitor" (at 127.635 43.815 0)
+  (text "sink/monitor" (at 127.635 43.815 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 499ccbfd-6f99-4506-97bd-9b59343b3528)
   )
@@ -1352,8 +1348,8 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 83bfce6a-d47e-454c-8252-411782ae1cd0)
   )
-  (text "device" (at 105.41 43.815 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (text "source/device" (at 111.76 43.815 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 94d3ee52-38b4-40f7-804e-85f1f4fe9c3c)
   )
   (text "based on the research of Pierre-Michel Ricordel\nand José Lopes-Esteves from ANSSI/SDE/ST/LSF\nhttps://sstic.org/2021/presentation/un_pare_feu_pour_le_hdmi/"
@@ -1362,7 +1358,7 @@
     (uuid c11d0857-8a4b-4965-802f-ebf4e58c7a49)
   )
 
-  (label "SCL_M" (at 86.995 120.015 0)
+  (label "SCL_SNK" (at 86.995 120.015 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0281cf64-37ba-46bb-97aa-8ae7634d6b91)
   )
@@ -1370,7 +1366,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 06af8a60-4f92-485a-9a25-b9ca7e263e96)
   )
-  (label "SCL" (at 41.275 49.53 0)
+  (label "SCL_SRC" (at 36.83 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0fb5c053-5a61-4de6-91dc-5ac45dd7967a)
   )
@@ -1394,7 +1390,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 332f87fc-6f98-4c39-b208-413518303593)
   )
-  (label "SCL_M" (at 193.675 49.53 0)
+  (label "SCL_SNK" (at 193.675 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 37ec9e8f-4139-4f93-92ef-9a4132f71f89)
   )
@@ -1402,11 +1398,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 397fb023-b86e-43d9-a0b5-366d51483c5f)
   )
-  (label "SDA" (at 41.91 117.475 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "SDA_SRC" (at 46.355 117.475 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3e7248dc-e0a0-455b-9023-31b6d9239224)
   )
-  (label "SDA" (at 221.615 52.07 0)
+  (label "SDA_SRC" (at 221.615 52.07 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4205fe39-fc2b-436a-ac37-00601ccd12ee)
   )
@@ -1450,15 +1446,15 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 927c7f24-f71a-4ab1-aa1e-5ceb8b208e3d)
   )
-  (label "HEAC_M+" (at 198.12 59.69 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "HEAC_SNK+" (at 205.105 59.69 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 96151ab7-5426-44f5-a7b0-b369c6858841)
   )
   (label "D2-" (at 118.11 67.31 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 989560a9-c125-4c2b-8ea0-a0b5282eb77a)
   )
-  (label "SDA_M" (at 193.675 52.07 0)
+  (label "SDA_SNK" (at 193.675 52.07 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a00a9cad-2f6d-45b3-b8ca-8f78d9cc5fe8)
   )
@@ -1466,11 +1462,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a350f2b3-4cf1-40f7-b169-2c43e00c4618)
   )
-  (label "SDA" (at 41.275 52.07 0)
+  (label "SDA_SRC" (at 36.83 52.07 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b4e49c79-6de3-442f-9137-81832921f42d)
   )
-  (label "SDA_M" (at 86.995 117.475 0)
+  (label "SDA_SNK" (at 86.995 117.475 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c1f4d2f1-0106-43fc-8f3e-127972fcfc73)
   )
@@ -1498,8 +1494,8 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid ddaad43f-b7e8-46a2-8736-b084d0ff6792)
   )
-  (label "SCL" (at 41.91 114.935 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "SCL_SRC" (at 46.355 114.935 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e403ae91-f8fc-4762-96ca-9ad67d1909fb)
   )
   (label "D0+" (at 118.11 54.61 0)
@@ -1514,8 +1510,8 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid ee7c975b-11ae-4797-8089-0343ec36d2ef)
   )
-  (label "HEAC_M-" (at 198.12 62.23 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "HEAC_SNK-" (at 205.105 62.23 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ef9c75e0-6357-4bd7-aee4-0bf7b98931b1)
   )
   (label "HEAC_D-" (at 220.98 62.23 0)
@@ -1526,7 +1522,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fa7673c1-ac5e-414c-af9a-e9de26a3dda5)
   )
-  (label "SCL" (at 221.615 54.61 0)
+  (label "SCL_SRC" (at 221.615 54.61 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fe7f0855-06c9-490e-9dd1-d81c71d7c20f)
   )