diff --git a/docs/images/tickit-device-component.svg b/docs/images/tickit-device-component.svg
new file mode 100644
index 000000000..9ce581874
--- /dev/null
+++ b/docs/images/tickit-device-component.svg
@@ -0,0 +1,17 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 452.8571428571427 247.14285714285757" width="452.8571428571427" height="247.14285714285757">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: "Virgil";
+        src: url("https://excalidraw.com/Virgil.woff2");
+      }
+      @font-face {
+        font-family: "Cascadia";
+        src: url("https://excalidraw.com/Cascadia.woff2");
+      }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10 72.85714285714357) rotate(0 216.42857142857136 82.142857142857)"><path d="M32 0 M32 0 C113.97 1.46, 194.59 2.63, 400.86 0 M32 0 C159.8 -1.38, 286.64 -1.32, 400.86 0 M400.86 0 C420.21 0.88, 433.61 10.81, 432.86 32 M400.86 0 C424.43 -1.25, 433.32 9.93, 432.86 32 M432.86 32 C434.55 63.72, 432.04 93.64, 432.86 132.29 M432.86 32 C433.47 54.82, 433.44 77.41, 432.86 132.29 M432.86 132.29 C433.9 153.28, 422.84 164.27, 400.86 164.29 M432.86 132.29 C434.48 152.65, 423.48 165.94, 400.86 164.29 M400.86 164.29 C323.67 163.51, 244.8 164.3, 32 164.29 M400.86 164.29 C279.29 163.18, 158.28 163.04, 32 164.29 M32 164.29 C11.6 165.2, -0.33 153.13, 0 132.29 M32 164.29 C10.28 166.49, 0.22 152.48, 0 132.29 M0 132.29 C-1.98 110.33, 1.16 87.22, 0 32 M0 132.29 C-1.7 98.03, -0.28 62.3, 0 32 M0 32 C-0.99 9.87, 9.53 -0.09, 32 0 M0 32 C-1.94 9.71, 8.98 1.21, 32 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(38.571428571428385 102.28571428571445) rotate(0 110 56)"><path d="M28 0 M28 0 C64.64 -1.16, 101.54 0.1, 192 0 M28 0 C87.44 -0.74, 147.66 -0.81, 192 0 M192 0 C212.24 -0.58, 219.74 8.12, 220 28 M192 0 C210.06 -1.34, 218.43 8.92, 220 28 M220 28 C221.45 50.55, 220.24 73.09, 220 84 M220 28 C220.82 41.42, 219.46 55.4, 220 84 M220 84 C220.21 101.47, 211.05 111.48, 192 112 M220 84 C218.38 102.75, 209.39 110.3, 192 112 M192 112 C129.29 114.47, 69.2 112.79, 28 112 M192 112 C140 111.39, 86.03 111.18, 28 112 M28 112 C9.13 113.93, 1.08 102.17, 0 84 M28 112 C8.57 114.03, 1.48 101.64, 0 84 M0 84 C1.37 62.64, -0.57 43.66, 0 28 M0 84 C0.37 71.69, -0.46 57.02, 0 28 M0 28 C-0.66 9.38, 7.58 -1.96, 28 0 M0 28 C-1.88 10.75, 8.77 1.16, 28 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(93.55189732142838 137.5857142857144) rotate(0 55.01953125 20.69999999999999)"><text x="55.01953125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device</text></g><g stroke-linecap="round" transform="translate(259.99999999999983 118.00000000000045) rotate(0 82.5 37.5)"><path d="M19.54 -0.72 L146.37 -0.28 L157.13 1.76 L162.14 5.41 L166.68 15.83 L166.91 56.68 L161.81 67.96 L159.26 70.85 L145.69 75.56 L18.11 73.03 L7.3 72.72 L1.89 68.55 L-0.15 61.38 L-0.97 13.2 L3.85 4.48 L9.33 0.98 L18.97 -1.33" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M18.75 0 M18.75 0 C68 2.55, 116.55 -0.34, 146.25 0 M18.75 0 C53.92 -0.66, 90.03 -1.13, 146.25 0 M146.25 0 C158.91 1.07, 164.47 5.34, 165 18.75 M146.25 0 C156.99 -2.19, 166.26 7.37, 165 18.75 M165 18.75 C167.06 30.89, 166.57 42, 165 56.25 M165 18.75 C165.25 32.53, 164.3 48.32, 165 56.25 M165 56.25 C164.53 67.97, 157.07 76.73, 146.25 75 M165 56.25 C163.45 67.92, 156.85 72.98, 146.25 75 M146.25 75 C106.52 76.66, 66.75 77.81, 18.75 75 M146.25 75 C112.54 74.73, 78.42 74.07, 18.75 75 M18.75 75 C5.11 76.26, 1.59 67.72, 0 56.25 M18.75 75 C7.71 75.78, 0.17 67.3, 0 56.25 M0 56.25 C0.28 47.14, -0.43 37.16, 0 18.75 M0 56.25 C-0.05 43.72, 0.05 31.08, 0 18.75 M0 18.75 C-0.96 6.24, 4.36 -0.17, 18.75 0 M0 18.75 C1.43 6.69, 5.94 0.43, 18.75 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(279.45605468749983 134.8000000000004) rotate(0 63.0439453125 20.69999999999999)"><text x="63.0439453125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Adapter</text></g><g stroke-linecap="round" transform="translate(11.428571428571388 10) rotate(0 192.8571428571429 31.42857142857156)"><path d="M15.71 0 M15.71 0 C140.02 -1.72, 264.41 -1.34, 370 0 M15.71 0 C101.03 1.7, 187.04 2.1, 370 0 M370 0 C379.8 -1.19, 387.45 4.9, 385.71 15.71 M370 0 C381.33 -0.98, 383.47 3.43, 385.71 15.71 M385.71 15.71 C385.31 22.69, 387.02 33.84, 385.71 47.14 M385.71 15.71 C384.77 22.98, 385.53 30.2, 385.71 47.14 M385.71 47.14 C385.79 56.9, 379.1 62.42, 370 62.86 M385.71 47.14 C383.82 59.8, 379.94 61.65, 370 62.86 M370 62.86 C266.95 62.84, 164.8 63.66, 15.71 62.86 M370 62.86 C245.93 65.4, 122.75 64.75, 15.71 62.86 M15.71 62.86 C6.54 64.65, 0.97 58.27, 0 47.14 M15.71 62.86 C6.37 63.32, 0.76 57.4, 0 47.14 M0 47.14 C1.65 39.63, -1.72 29.35, 0 15.71 M0 47.14 C0.4 39.74, -0.17 31.3, 0 15.71 M0 15.71 C1.49 5.2, 3.25 1.11, 15.71 0 M0 15.71 C-0.57 4.78, 3.77 0.96, 15.71 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(51.20661272321428 20.728571428571513) rotate(0 153.0791015625 20.69999999999999)"><text x="153.0791015625" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device Component</text></g></svg>
\ No newline at end of file
diff --git a/docs/images/tickit-device-simulation-cpt.svg b/docs/images/tickit-device-simulation-cpt.svg
deleted file mode 100644
index 84a1c7f21..000000000
--- a/docs/images/tickit-device-simulation-cpt.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 347.06818181818176 170" width="347.06818181818176" height="170">
-  <!-- svg-source:excalidraw -->
-  
-  <defs>
-    <style>
-      @font-face {
-        font-family: "Virgil";
-        src: url("https://excalidraw.com/Virgil.woff2");
-      }
-      @font-face {
-        font-family: "Cascadia";
-        src: url("https://excalidraw.com/Cascadia.woff2");
-      }
-    </style>
-  </defs>
-  <rect x="0" y="0" width="347.06818181818176" height="170" fill="#ffffff"></rect><g stroke-linecap="round" transform="translate(21.96590909090901 57.625) rotate(0 88.5 43.21022727272728)"><path d="M0 0 C56.45 0, 112.89 0, 177 0 M0 0 C57.41 0, 114.81 0, 177 0 M177 0 C177 29.67, 177 59.35, 177 86.42 M177 0 C177 29.65, 177 59.3, 177 86.42 M177 86.42 C113.52 86.42, 50.04 86.42, 0 86.42 M177 86.42 C140.13 86.42, 103.26 86.42, 0 86.42 M0 86.42 C0 55.9, 0 25.39, 0 0 M0 86.42 C0 65.34, 0 44.27, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(78.96590909090901 89.33522727272725) rotate(0 31.5 11.5)"><text x="31.5" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Device</text></g><g stroke-linecap="round" transform="translate(198.7954545454545 73.57954545454544) rotate(0 63.81818181818181 25.926136363636374)"><path d="M0 0 L127.64 0 L127.64 51.85 L0 51.85" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M0 0 C38.11 0, 76.22 0, 127.64 0 M0 0 C30.71 0, 61.43 0, 127.64 0 M127.64 0 C127.64 10.4, 127.64 20.8, 127.64 51.85 M127.64 0 C127.64 19.68, 127.64 39.37, 127.64 51.85 M127.64 51.85 C96.33 51.85, 65.02 51.85, 0 51.85 M127.64 51.85 C98.4 51.85, 69.16 51.85, 0 51.85 M0 51.85 C0 36.62, 0 21.39, 0 0 M0 51.85 C0 40.58, 0 29.32, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(226.61363636363637 88.00568181818181) rotate(0 36 11.5)"><text x="36" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Adapter</text></g><g stroke-linecap="round" transform="translate(10 43) rotate(0 163.53409090909088 58.5)"><path d="M0 0 C69.68 0, 139.35 0, 327.07 0 M0 0 C82.22 0, 164.43 0, 327.07 0 M327.07 0 C327.07 42.49, 327.07 84.99, 327.07 117 M327.07 0 C327.07 41.22, 327.07 82.45, 327.07 117 M327.07 117 C236 117, 144.93 117, 0 117 M327.07 117 C235.68 117, 144.29 117, 0 117 M0 117 C0 91.04, 0 65.08, 0 0 M0 117 C0 87.44, 0 57.88, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(10 10) rotate(0 147 16.5)"><path d="M0 0 C67.26 0, 134.53 0, 294 0 M0 0 C79.45 0, 158.89 0, 294 0 M294 0 C294 10.39, 294 20.78, 294 33 M294 0 C294 12.87, 294 25.74, 294 33 M294 33 C206.1 33, 118.2 33, 0 33 M294 33 C193.37 33, 92.75 33, 0 33 M0 33 C0 23.77, 0 14.54, 0 0 M0 33 C0 21.17, 0 9.34, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(14.5 15) rotate(0 142 11.5)"><text x="142" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Component (Device Simulation)</text></g></svg>
\ No newline at end of file
diff --git a/docs/images/tickit-system-component.svg b/docs/images/tickit-system-component.svg
new file mode 100644
index 000000000..edf6cc82d
--- /dev/null
+++ b/docs/images/tickit-system-component.svg
@@ -0,0 +1,17 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1181.4285714285709 613.5714285714286" width="1181.4285714285709" height="613.5714285714286">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: "Virgil";
+        src: url("https://excalidraw.com/Virgil.woff2");
+      }
+      @font-face {
+        font-family: "Cascadia";
+        src: url("https://excalidraw.com/Cascadia.woff2");
+      }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(50.000000000000455 387.85714285714323) rotate(0 216.4285714285714 82.142857142857)"><path d="M32 0 M32 0 C113.97 1.46, 194.59 2.63, 400.86 0 M32 0 C159.8 -1.38, 286.64 -1.32, 400.86 0 M400.86 0 C420.21 0.88, 433.61 10.81, 432.86 32 M400.86 0 C424.43 -1.25, 433.32 9.93, 432.86 32 M432.86 32 C434.55 63.72, 432.04 93.64, 432.86 132.29 M432.86 32 C433.47 54.82, 433.44 77.41, 432.86 132.29 M432.86 132.29 C433.9 153.28, 422.84 164.27, 400.86 164.29 M432.86 132.29 C434.48 152.65, 423.48 165.94, 400.86 164.29 M400.86 164.29 C323.67 163.51, 244.8 164.3, 32 164.29 M400.86 164.29 C279.29 163.18, 158.28 163.04, 32 164.29 M32 164.29 C11.6 165.2, -0.33 153.13, 0 132.29 M32 164.29 C10.28 166.49, 0.22 152.48, 0 132.29 M0 132.29 C-1.98 110.33, 1.16 87.22, 0 32 M0 132.29 C-1.7 98.03, -0.28 62.3, 0 32 M0 32 C-0.99 9.87, 9.53 -0.09, 32 0 M0 32 C-1.94 9.71, 8.98 1.21, 32 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(78.57142857142884 417.2857142857141) rotate(0 110 56)"><path d="M28 0 M28 0 C64.64 -1.16, 101.54 0.1, 192 0 M28 0 C87.44 -0.74, 147.66 -0.81, 192 0 M192 0 C212.24 -0.58, 219.74 8.12, 220 28 M192 0 C210.06 -1.34, 218.43 8.92, 220 28 M220 28 C221.45 50.55, 220.24 73.09, 220 84 M220 28 C220.82 41.42, 219.46 55.4, 220 84 M220 84 C220.21 101.47, 211.05 111.48, 192 112 M220 84 C218.38 102.75, 209.39 110.3, 192 112 M192 112 C129.29 114.47, 69.2 112.79, 28 112 M192 112 C140 111.39, 86.03 111.18, 28 112 M28 112 C9.13 113.93, 1.08 102.17, 0 84 M28 112 C8.57 114.03, 1.48 101.64, 0 84 M0 84 C1.37 62.64, -0.57 43.66, 0 28 M0 84 C0.37 71.69, -0.46 57.02, 0 28 M0 28 C-0.66 9.38, 7.58 -1.96, 28 0 M0 28 C-1.88 10.75, 8.77 1.16, 28 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(133.55189732142884 452.58571428571406) rotate(0 55.01953125 20.69999999999999)"><text x="55.01953125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device</text></g><g stroke-linecap="round" transform="translate(300.0000000000002 433.0000000000001) rotate(0 82.5 37.5)"><path d="M19.54 -0.72 L146.37 -0.28 L157.13 1.76 L162.14 5.41 L166.68 15.83 L166.91 56.68 L161.81 67.96 L159.26 70.85 L145.69 75.56 L18.11 73.03 L7.3 72.72 L1.89 68.55 L-0.15 61.38 L-0.97 13.2 L3.85 4.48 L9.33 0.98 L18.97 -1.33" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M18.75 0 M18.75 0 C68 2.55, 116.55 -0.34, 146.25 0 M18.75 0 C53.92 -0.66, 90.03 -1.13, 146.25 0 M146.25 0 C158.91 1.07, 164.47 5.34, 165 18.75 M146.25 0 C156.99 -2.19, 166.26 7.37, 165 18.75 M165 18.75 C167.06 30.89, 166.57 42, 165 56.25 M165 18.75 C165.25 32.53, 164.3 48.32, 165 56.25 M165 56.25 C164.53 67.97, 157.07 76.73, 146.25 75 M165 56.25 C163.45 67.92, 156.85 72.98, 146.25 75 M146.25 75 C106.52 76.66, 66.75 77.81, 18.75 75 M146.25 75 C112.54 74.73, 78.42 74.07, 18.75 75 M18.75 75 C5.11 76.26, 1.59 67.72, 0 56.25 M18.75 75 C7.71 75.78, 0.17 67.3, 0 56.25 M0 56.25 C0.28 47.14, -0.43 37.16, 0 18.75 M0 56.25 C-0.05 43.72, 0.05 31.08, 0 18.75 M0 18.75 C-0.96 6.24, 4.36 -0.17, 18.75 0 M0 18.75 C1.43 6.69, 5.94 0.43, 18.75 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(319.4560546875002 449.80000000000007) rotate(0 63.0439453125 20.69999999999999)"><text x="63.0439453125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Adapter</text></g><g stroke-linecap="round" transform="translate(51.42857142857184 324.99999999999966) rotate(0 192.85714285714286 31.42857142857156)"><path d="M15.71 0 M15.71 0 C140.02 -1.72, 264.41 -1.34, 370 0 M15.71 0 C101.03 1.7, 187.04 2.1, 370 0 M370 0 C379.8 -1.19, 387.45 4.9, 385.71 15.71 M370 0 C381.33 -0.98, 383.47 3.43, 385.71 15.71 M385.71 15.71 C385.31 22.69, 387.02 33.84, 385.71 47.14 M385.71 15.71 C384.77 22.98, 385.53 30.2, 385.71 47.14 M385.71 47.14 C385.79 56.9, 379.1 62.42, 370 62.86 M385.71 47.14 C383.82 59.8, 379.94 61.65, 370 62.86 M370 62.86 C266.95 62.84, 164.8 63.66, 15.71 62.86 M370 62.86 C245.93 65.4, 122.75 64.75, 15.71 62.86 M15.71 62.86 C6.54 64.65, 0.97 58.27, 0 47.14 M15.71 62.86 C6.37 63.32, 0.76 57.4, 0 47.14 M0 47.14 C1.65 39.63, -1.72 29.35, 0 15.71 M0 47.14 C0.4 39.74, -0.17 31.3, 0 15.71 M0 15.71 C1.49 5.2, 3.25 1.11, 15.71 0 M0 15.71 C-0.57 4.78, 3.77 0.96, 15.71 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(91.20661272321473 335.7285714285712) rotate(0 153.07910156249997 20.69999999999999)"><text x="153.0791015625" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device Component</text></g><g stroke-linecap="round" transform="translate(547.8571428571429 392.85714285714323) rotate(0 216.42857142857144 82.142857142857)"><path d="M32 0 M32 0 C167.05 -0.91, 301.86 -0.25, 400.86 0 M32 0 C118.97 1.89, 206.72 2.09, 400.86 0 M400.86 0 C423.86 -1.77, 433.3 12.25, 432.86 32 M400.86 0 C421.13 0.02, 432.76 9.46, 432.86 32 M432.86 32 C434.95 70.01, 433.47 108.72, 432.86 132.29 M432.86 32 C433.7 68.53, 432.99 104.34, 432.86 132.29 M432.86 132.29 C431.77 152.41, 423.26 163.69, 400.86 164.29 M432.86 132.29 C433.1 153.16, 422.19 166.08, 400.86 164.29 M400.86 164.29 C260.59 166.97, 120.11 166.53, 32 164.29 M400.86 164.29 C308.09 165.79, 216.54 166.21, 32 164.29 M32 164.29 C10.44 163.74, -0.53 154.78, 0 132.29 M32 164.29 C8.5 164.45, 1.33 155.79, 0 132.29 M0 132.29 C0.11 109.45, -1.48 84.44, 0 32 M0 132.29 C0.06 102.8, 1.84 72.15, 0 32 M0 32 C-0.57 12.4, 9.02 0.19, 32 0 M0 32 C2.16 11.77, 10.25 1.64, 32 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(576.4285714285713 422.28571428571433) rotate(0 110 56)"><path d="M28 0 M28 0 C73.57 0.73, 121.56 0.01, 192 0 M28 0 C64.85 0.06, 103.77 -1.58, 192 0 M192 0 C211.11 1.58, 219.08 9.35, 220 28 M192 0 C210.57 -1.2, 221.76 11.43, 220 28 M220 28 C220.03 42.34, 221.63 54.76, 220 84 M220 28 C220.17 44.41, 219.77 61.97, 220 84 M220 84 C221.07 102.07, 210.88 111.6, 192 112 M220 84 C219.99 104.46, 212.56 113.36, 192 112 M192 112 C129.3 112.88, 61.74 111.32, 28 112 M192 112 C128.97 110.71, 65.28 110.5, 28 112 M28 112 C8.8 113.16, -1.88 102.81, 0 84 M28 112 C10.66 114.17, -1.28 101.87, 0 84 M0 84 C-1.76 72.74, 0.07 57.26, 0 28 M0 84 C1.38 71.73, 0.23 60.09, 0 28 M0 28 C-1.65 9.53, 11.21 0.96, 28 0 M0 28 C-0.41 10.97, 8.73 -2.23, 28 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(631.4090401785711 457.5857142857143) rotate(0 55.01953125 20.69999999999999)"><text x="55.01953125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device</text></g><g stroke-linecap="round" transform="translate(797.8571428571427 438.0000000000001) rotate(0 82.5 37.5)"><path d="M17.94 -1.25 L144.72 -1.43 L155.78 3.48 L161.14 8.82 L166.38 12.58 L165.44 57.83 L161.44 67.7 L157.59 71.32 L147.78 76.82 L17.43 76.18 L7.59 72.06 L3.87 68.98 L0.85 60.82 L1.42 14.2 L4.4 2.94 L9.46 -0.04 L19.82 -0.6" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M18.75 0 M18.75 0 C59.91 1.65, 99.14 1.88, 146.25 0 M18.75 0 C64.31 -1.73, 109.01 -0.37, 146.25 0 M146.25 0 C157.04 -1.5, 165.54 6.11, 165 18.75 M146.25 0 C158.49 -0.62, 164.39 7.59, 165 18.75 M165 18.75 C166.91 25.35, 164.33 32.62, 165 56.25 M165 18.75 C165.88 29.57, 164.34 39.59, 165 56.25 M165 56.25 C163.17 70.03, 160.48 75.22, 146.25 75 M165 56.25 C164.35 70.74, 156.86 75.22, 146.25 75 M146.25 75 C97.47 74.24, 43.89 76.1, 18.75 75 M146.25 75 C111.85 76.2, 76.85 75.75, 18.75 75 M18.75 75 C7.29 73.69, 0.41 70.09, 0 56.25 M18.75 75 C7.06 74.2, 1.16 68.81, 0 56.25 M0 56.25 C-1.9 45.89, -0.2 33.45, 0 18.75 M0 56.25 C0.49 43.18, 0.39 28.6, 0 18.75 M0 18.75 C-0.79 6.26, 6.93 0.04, 18.75 0 M0 18.75 C-1.99 4.82, 8.02 1.42, 18.75 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(817.3131975446427 454.80000000000007) rotate(0 63.0439453125 20.69999999999999)"><text x="63.0439453125" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Adapter</text></g><g stroke-linecap="round" transform="translate(549.2857142857144 329.99999999999966) rotate(0 192.8571428571429 31.42857142857156)"><path d="M15.71 0 M15.71 0 C89.37 2.47, 159.97 1.68, 370 0 M15.71 0 C150.05 -0.36, 284.93 0.56, 370 0 M370 0 C379.15 1.18, 385.98 4.94, 385.71 15.71 M370 0 C381.9 1.5, 386.36 5.44, 385.71 15.71 M385.71 15.71 C383.94 25.83, 384.48 39.18, 385.71 47.14 M385.71 15.71 C385.75 24.98, 386.57 33.28, 385.71 47.14 M385.71 47.14 C387.6 58.75, 381.35 64.79, 370 62.86 M385.71 47.14 C385.9 56.47, 378.86 64.83, 370 62.86 M370 62.86 C293.85 63.33, 217.52 63.13, 15.71 62.86 M370 62.86 C243.47 63.62, 115.84 62.79, 15.71 62.86 M15.71 62.86 C3.67 62.62, 1.66 55.79, 0 47.14 M15.71 62.86 C6.55 62.87, -2.23 55.81, 0 47.14 M0 47.14 C0.02 40.02, 1.53 32.39, 0 15.71 M0 47.14 C-0.48 38.13, -0.56 26.71, 0 15.71 M0 15.71 C1.33 4.73, 6.47 1.56, 15.71 0 M0 15.71 C1.37 5.71, 6.6 -0.58, 15.71 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(589.0637555803573 340.7285714285712) rotate(0 153.0791015625 20.69999999999999)"><text x="153.0791015625" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Device Component</text></g><g stroke-linecap="round" transform="translate(10 76.42857142857133) rotate(0 580.7142857142854 263.5714285714286)"><path d="M32 0 M32 0 C340.02 -1.79, 647.15 -1.66, 1129.43 0 M32 0 C312.67 3.02, 593.37 2.51, 1129.43 0 M1129.43 0 C1150.06 1.31, 1160.46 9.5, 1161.43 32 M1129.43 0 C1148.79 0.67, 1163.09 9.36, 1161.43 32 M1161.43 32 C1160.23 141.2, 1160.11 250.82, 1161.43 495.14 M1161.43 32 C1163.31 152.09, 1162.91 272.17, 1161.43 495.14 M1161.43 495.14 C1162.8 516.94, 1151.25 525.28, 1129.43 527.14 M1161.43 495.14 C1160.27 515.82, 1152.85 528.55, 1129.43 527.14 M1129.43 527.14 C854.96 530.79, 579.19 530.35, 32 527.14 M1129.43 527.14 C813.68 528.87, 498.43 529.03, 32 527.14 M32 527.14 C12.09 526.33, 1.9 516.72, 0 495.14 M32 527.14 C10.18 528.78, -1.91 517.32, 0 495.14 M0 495.14 C1.54 343.54, 0.4 194.53, 0 32 M0 495.14 C0.17 369.18, 0.18 244.37, 0 32 M0 32 C1.35 9.37, 9.06 -0.51, 32 0 M0 32 C1.38 8.59, 11.84 0.59, 32 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(921.4285714285716 115) rotate(0 115 86.5)"><path d="M32 0 M32 0 C69.77 0.6, 107.55 2.11, 198 0 M32 0 C86.73 1.7, 142.48 0.45, 198 0 M198 0 C220.96 1.16, 229.51 12.54, 230 32 M198 0 C217.31 -1.32, 231.1 8.59, 230 32 M230 32 C230.39 67.07, 232.79 103.64, 230 141 M230 32 C229.12 63.66, 229.63 94.16, 230 141 M230 141 C231.52 163.08, 219.57 173.04, 198 173 M230 141 C228.95 162.05, 219.76 175.24, 198 173 M198 173 C152.61 171.91, 107.85 173.08, 32 173 M198 173 C148.02 173.55, 100.28 172.92, 32 173 M32 173 C11.1 174.75, -0.07 163.27, 0 141 M32 173 C12.58 171.77, 1.75 160.4, 0 141 M0 141 C2.19 100.04, 2.16 56.58, 0 32 M0 141 C-0.24 111.56, 0.79 82.45, 0 32 M0 32 C-1.92 8.9, 11.83 0.12, 32 0 M0 32 C0.24 12.55, 11.95 0.49, 32 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(955.3758370535716 160.10000000000002) rotate(0 81.052734375 41.39999999999998)"><text x="81.052734375" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Nested </text><text x="81.052734375" y="41.4" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Scheduler</text></g><g stroke-linecap="round"><g transform="translate(227.14285714285757 323.57142857142856) rotate(0 344.59729290780604 -71.25317227813818)"><path d="M0.43 -0.43 C115.48 -24.14, 575.14 -118.44, 690 -142.08 M-0.81 -1.7 C114.12 -25.29, 574.15 -117.61, 689.06 -140.88" stroke="#000000" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(742.8571428571432 326.42857142857133) rotate(0 88.43515902982756 -57.52742029199641)"><path d="M-0.25 -0.14 C28.96 -19.25, 145.53 -95.99, 174.85 -114.92 M1.83 -1.26 C31.45 -20.2, 148.27 -94.64, 177.12 -113.71" stroke="#000000" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(15.71428571428612 10) rotate(0 234 32.5)"><path d="M16.25 0 M16.25 0 C118.38 0.99, 220.4 0.57, 451.75 0 M16.25 0 C119.79 0.8, 222.23 1.13, 451.75 0 M451.75 0 C463.52 1.19, 466.57 3.79, 468 16.25 M451.75 0 C462.86 -0.71, 466.99 5.61, 468 16.25 M468 16.25 C469.13 24.89, 468.96 28.67, 468 48.75 M468 16.25 C469.02 29.32, 468.82 41.53, 468 48.75 M468 48.75 C468.88 59.09, 462.34 64.56, 451.75 65 M468 48.75 C466.58 58.05, 463.85 62.91, 451.75 65 M451.75 65 C333.32 65.06, 215.65 65.43, 16.25 65 M451.75 65 C342.36 64.66, 232.45 64.44, 16.25 65 M16.25 65 C5.78 63.76, 0.53 60.2, 0 48.75 M16.25 65 C5.24 65.37, -2.21 58.48, 0 48.75 M0 48.75 C1.64 41.52, -1.21 35.27, 0 16.25 M0 48.75 C-0.97 39.15, 0.34 31.32, 0 16.25 M0 16.25 C-0.7 6.08, 5.27 -1.63, 16.25 0 M0 16.25 C-0.35 6.63, 5.08 -2.09, 16.25 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(91.64299665178612 21.80000000000001) rotate(0 158.0712890625 20.69999999999999)"><text x="158.0712890625" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">System Component</text></g></svg>
\ No newline at end of file
diff --git a/docs/images/tickit-system-simulation-cpt.svg b/docs/images/tickit-system-simulation-cpt.svg
deleted file mode 100644
index 38e2d5e0c..000000000
--- a/docs/images/tickit-system-simulation-cpt.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 668 283.5" width="668" height="283.5">
-  <!-- svg-source:excalidraw -->
-  
-  <defs>
-    <style>
-      @font-face {
-        font-family: "Virgil";
-        src: url("https://excalidraw.com/Virgil.woff2");
-      }
-      @font-face {
-        font-family: "Cascadia";
-        src: url("https://excalidraw.com/Cascadia.woff2");
-      }
-    </style>
-  </defs>
-  <rect x="0" y="0" width="668" height="283.5" fill="#ffffff"></rect><g stroke-linecap="round" transform="translate(31 184) rotate(0 66.5 32.5)"><path d="M0 0 C43.49 0, 86.98 0, 133 0 M0 0 C37.07 0, 74.15 0, 133 0 M133 0 C133 15.32, 133 30.65, 133 65 M133 0 C133 25.42, 133 50.83, 133 65 M133 65 C93.36 65, 53.71 65, 0 65 M133 65 C83.61 65, 34.23 65, 0 65 M0 65 C0 45.23, 0 25.47, 0 0 M0 65 C0 40.55, 0 16.1, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(66 205) rotate(0 31.5 11.5)"><text x="31.5" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Device</text></g><g stroke-linecap="round" transform="translate(164 196) rotate(0 48 19.5)"><path d="M0 0 L96 0 L96 39 L0 39" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M0 0 C28.34 0, 56.69 0, 96 0 M0 0 C28.08 0, 56.16 0, 96 0 M96 0 C96 10.77, 96 21.54, 96 39 M96 0 C96 8.6, 96 17.2, 96 39 M96 39 C63.24 39, 30.48 39, 0 39 M96 39 C75.54 39, 55.08 39, 0 39 M0 39 C0 28.9, 0 18.81, 0 0 M0 39 C0 25.03, 0 11.07, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(176 204) rotate(0 36 11.5)"><text x="36" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Adapter</text></g><g stroke-linecap="round" transform="translate(22 173) rotate(0 123 44)"><path d="M0 0 C85.88 0, 171.76 0, 246 0 M0 0 C50.05 0, 100.09 0, 246 0 M246 0 C246 32.95, 246 65.89, 246 88 M246 0 C246 19.29, 246 38.58, 246 88 M246 88 C190.83 88, 135.66 88, 0 88 M246 88 C193.22 88, 140.45 88, 0 88 M0 88 C0 58.14, 0 28.29, 0 0 M0 88 C0 69.14, 0 50.28, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(22 144) rotate(0 118 14)"><path d="M0 0 C83.57 0, 167.14 0, 236 0 M0 0 C54.09 0, 108.18 0, 236 0 M236 0 C236 5.63, 236 11.25, 236 28 M236 0 C236 7.58, 236 15.16, 236 28 M236 28 C177.67 28, 119.34 28, 0 28 M236 28 C156.01 28, 76.02 28, 0 28 M0 28 C0 19.78, 0 11.56, 0 0 M0 28 C0 20.28, 0 12.56, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(26 149) rotate(0 114 9)"><text x="114" y="14" font-family="Helvetica, Segoe UI Emoji" font-size="16px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Component (Device Simulation)</text></g><g stroke-linecap="round" transform="translate(296 184) rotate(0 66.5 32.5)"><path d="M0 0 C39.18 0, 78.36 0, 133 0 M0 0 C34.53 0, 69.06 0, 133 0 M133 0 C133 17.11, 133 34.23, 133 65 M133 0 C133 13.93, 133 27.86, 133 65 M133 65 C104.23 65, 75.46 65, 0 65 M133 65 C95.19 65, 57.39 65, 0 65 M0 65 C0 48.55, 0 32.1, 0 0 M0 65 C0 45.7, 0 26.4, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(331 205) rotate(0 31.5 11.5)"><text x="31.5" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Device</text></g><g stroke-linecap="round" transform="translate(429 196) rotate(0 48 19.5)"><path d="M0 0 L96 0 L96 39 L0 39" stroke="none" stroke-width="0" fill="#ced4da"></path><path d="M0 0 C20.78 0, 41.55 0, 96 0 M0 0 C26.33 0, 52.67 0, 96 0 M96 0 C96 7.91, 96 15.82, 96 39 M96 0 C96 9.49, 96 18.99, 96 39 M96 39 C67.29 39, 38.58 39, 0 39 M96 39 C67.65 39, 39.3 39, 0 39 M0 39 C0 24.93, 0 10.86, 0 0 M0 39 C0 29.57, 0 20.13, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(441 204) rotate(0 36 11.5)"><text x="36" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Adapter</text></g><g stroke-linecap="round" transform="translate(287 173) rotate(0 123 44)"><path d="M0 0 C49.38 0, 98.75 0, 246 0 M0 0 C67.02 0, 134.03 0, 246 0 M246 0 C246 31.99, 246 63.99, 246 88 M246 0 C246 27.62, 246 55.24, 246 88 M246 88 C158.64 88, 71.28 88, 0 88 M246 88 C188.39 88, 130.78 88, 0 88 M0 88 C0 53.4, 0 18.8, 0 0 M0 88 C0 59.51, 0 31.02, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(543 54.5) rotate(0 52 41)"><path d="M0 0 C31.85 0, 63.7 0, 104 0 M0 0 C22.77 0, 45.55 0, 104 0 M104 0 C104 22.56, 104 45.11, 104 82 M104 0 C104 25.25, 104 50.5, 104 82 M104 82 C78.86 82, 53.71 82, 0 82 M104 82 C67.57 82, 31.14 82, 0 82 M0 82 C0 52.71, 0 23.43, 0 0 M0 82 C0 62.5, 0 43.01, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(549 72.5) rotate(0 46 23)"><text x="46" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Slave </text><text x="46" y="41" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Scheduler</text></g><g stroke-linecap="round" transform="translate(10 43.499999999999886) rotate(0 324 115.00000000000006)"><path d="M0 0 C249.59 0, 499.18 0, 648 0 M0 0 C200.11 0, 400.21 0, 648 0 M648 0 C648 81.19, 648 162.39, 648 230 M648 0 C648 68.06, 648 136.11, 648 230 M648 230 C466.19 230, 284.38 230, 0 230 M648 230 C414.57 230, 181.14 230, 0 230 M0 230 C0 175.21, 0 120.42, 0 0 M0 230 C0 165.34, 0 100.69, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(10.5 10) rotate(0 150.5 16.5)"><path d="M0 0 C90.23 0, 180.46 0, 301 0 M0 0 C92.01 0, 184.03 0, 301 0 M301 0 C301 7.85, 301 15.69, 301 33 M301 0 C301 10.26, 301 20.53, 301 33 M301 33 C225.44 33, 149.88 33, 0 33 M301 33 C181.18 33, 61.37 33, 0 33 M0 33 C0 20.28, 0 7.56, 0 0 M0 33 C0 23.44, 0 13.89, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(16 15) rotate(0 145 11.5)"><text x="145" y="18" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Component (System Simulation)</text></g><g stroke-linecap="round" transform="translate(287 144.5) rotate(0 118 14)"><path d="M0 0 C85.79 0, 171.58 0, 236 0 M0 0 C91.53 0, 183.06 0, 236 0 M236 0 C236 10.6, 236 21.2, 236 28 M236 0 C236 8.76, 236 17.52, 236 28 M236 28 C170.73 28, 105.46 28, 0 28 M236 28 C177.41 28, 118.82 28, 0 28 M0 28 C0 21.6, 0 15.19, 0 0 M0 28 C0 20.12, 0 12.24, 0 0" stroke="#000000" stroke-width="1" fill="none"></path></g><g transform="translate(291 149.5) rotate(0 114 9)"><text x="114" y="14" font-family="Helvetica, Segoe UI Emoji" font-size="16px" fill="#000000" text-anchor="middle" style="white-space: pre;" direction="ltr">Component (Device Simulation)</text></g><g stroke-linecap="round"><g transform="translate(414 143.5) rotate(0 63.5 -22.5)"><path d="M0 0 C21.17 -7.5, 105.83 -37.5, 127 -45 M0 0 C21.17 -7.5, 105.83 -37.5, 127 -45" stroke="#000000" stroke-width="1" fill="none"></path></g></g><g stroke-linecap="round"><g transform="translate(178 143.5) rotate(0 182 -35)"><path d="M0 0 C60.67 -11.67, 303.33 -58.33, 364 -70 M0 0 C60.67 -11.67, 303.33 -58.33, 364 -70" stroke="#000000" stroke-width="1" fill="none"></path></g></g></svg>
\ No newline at end of file
diff --git a/docs/user/explanations/components.rst b/docs/user/explanations/components.rst
index 547f0edb4..85331d9fb 100644
--- a/docs/user/explanations/components.rst
+++ b/docs/user/explanations/components.rst
@@ -2,37 +2,37 @@ Simulation Components
 =====================
 
 There are two types of components that can be used in a tickit simulation,
-device simulations and system simulations.
+device components and system components.
 
-Device Simulation
+Device Component
 -----------------
 
-Device simulations are the typical use case of a component. They encapsulate a
+Device components are the typical use case of a component. They encapsulate a
 device and any adapters for that device.
 
-.. figure:: ../../images/tickit-device-simulation-cpt.svg
+.. figure:: ../../images/tickit-device-component.svg
     :align: center
 
 
 (See `DeviceComponent`.)
 
 
-System Simulation
+System Component
 -----------------
 
-System simulation components are themselves entire tickit simulations. They
-contain their own device simulation components and a scheduler for orchestrating
+System components are themselves entire tickit simulations. They
+contain their own device components and a scheduler for orchestrating
 them. However, the scheduler in a system component acts as a nested scheduler
-which is driven by the master scheduler in the top level of the simulation
+which is triggered by the master scheduler in the top level of the simulation
 it belongs to.
 
-.. figure:: ../../images/tickit-system-simulation-cpt.svg
+.. figure:: ../../images/tickit-system-component.svg
     :align: center
 
-System simulations can also contain their own system simulation components
+System components can also contain their own system components
 allowing for the construction of reasonably complex systems.
 
-System simulations can be nested inside other components in the config so that
+System components can be nested inside other components in the config so that
 the master scheduler's wiring is correct, for example:
 
 .. code-block:: yaml