diff --git a/better-diagram/draft-ietf-sframe-enc.html b/better-diagram/draft-ietf-sframe-enc.html
index 6619136..6d592d2 100644
--- a/better-diagram/draft-ietf-sframe-enc.html
+++ b/better-diagram/draft-ietf-sframe-enc.html
@@ -2037,24 +2037,24 @@ <h4 id="name-encryption">
 before packetizing it, the necessary media metadata will be moved out of the
 encoded frame buffer, to be sent in some channel visible to the SFU (e.g., an
 RTP header extension).<a href="#section-4.4.3-4" class="pilcrow">¶</a></p>
-<span id="name-encryption-flow"></span><figure id="figure-4">
+<span id="name-encrypting-an-sframe-cipher"></span><figure id="figure-4">
             <div id="section-4.4.3-5.1">
               <div class="alignLeft art-svg artwork" id="section-4.4.3-5.1.1">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="592" width="416" viewBox="0 0 416 592" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
-                  <path d="M 40,224 L 40,464" fill="none" stroke="black"></path>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="608" width="416" viewBox="0 0 416 608" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
+                  <path d="M 40,224 L 40,480" fill="none" stroke="black"></path>
                   <path d="M 64,176 L 64,272" fill="none" stroke="black"></path>
                   <path d="M 96,160 L 96,288" fill="none" stroke="black"></path>
                   <path d="M 128,320 L 128,352" fill="none" stroke="black"></path>
                   <path d="M 144,160 L 144,288" fill="none" stroke="black"></path>
                   <path d="M 168,176 L 168,208" fill="none" stroke="black"></path>
-                  <path d="M 168,448 L 168,576" fill="none" stroke="black"></path>
+                  <path d="M 168,464 L 168,592" fill="none" stroke="black"></path>
                   <path d="M 192,352 L 192,384" fill="none" stroke="black"></path>
                   <path d="M 264,320 L 264,352" fill="none" stroke="black"></path>
                   <path d="M 280,32 L 280,128" fill="none" stroke="black"></path>
-                  <path d="M 296,448 L 296,576" fill="none" stroke="black"></path>
+                  <path d="M 296,464 L 296,592" fill="none" stroke="black"></path>
                   <path d="M 320,208 L 320,240" fill="none" stroke="black"></path>
                   <path d="M 344,128 L 344,400" fill="none" stroke="black"></path>
-                  <path d="M 344,432 L 344,512" fill="none" stroke="black"></path>
+                  <path d="M 344,432 L 344,528" fill="none" stroke="black"></path>
                   <path d="M 408,32 L 408,128" fill="none" stroke="black"></path>
                   <path d="M 280,32 L 408,32" fill="none" stroke="black"></path>
                   <path d="M 280,128 L 408,128" fill="none" stroke="black"></path>
@@ -2070,20 +2070,20 @@ <h4 id="name-encryption">
                   <path d="M 128,320 L 264,320" fill="none" stroke="black"></path>
                   <path d="M 128,352 L 264,352" fill="none" stroke="black"></path>
                   <path d="M 40,384 L 336,384" fill="none" stroke="black"></path>
-                  <path d="M 168,448 L 296,448" fill="none" stroke="black"></path>
-                  <path d="M 40,464 L 160,464" fill="none" stroke="black"></path>
-                  <path d="M 168,480 L 296,480" fill="none" stroke="black"></path>
-                  <path d="M 304,512 L 344,512" fill="none" stroke="black"></path>
-                  <path d="M 168,576 L 296,576" fill="none" stroke="black"></path>
+                  <path d="M 168,464 L 296,464" fill="none" stroke="black"></path>
+                  <path d="M 40,480 L 160,480" fill="none" stroke="black"></path>
+                  <path d="M 168,496 L 296,496" fill="none" stroke="black"></path>
+                  <path d="M 304,528 L 344,528" fill="none" stroke="black"></path>
+                  <path d="M 168,592 L 296,592" fill="none" stroke="black"></path>
                   <path d="M 80,160 C 71.16936,160 64,167.16936 64,176" fill="none" stroke="black"></path>
                   <path d="M 80,288 C 71.16936,288 64,280.83064 64,272" fill="none" stroke="black"></path>
                   <polygon class="arrowhead" points="344,384 332,378.4 332,389.6" fill="black" transform="rotate(0,336,384)"></polygon>
                   <polygon class="arrowhead" points="344,240 332,234.4 332,245.6" fill="black" transform="rotate(0,336,240)"></polygon>
                   <polygon class="arrowhead" points="344,176 332,170.4 332,181.6" fill="black" transform="rotate(0,336,176)"></polygon>
-                  <polygon class="arrowhead" points="312,512 300,506.4 300,517.6" fill="black" transform="rotate(180,304,512)"></polygon>
+                  <polygon class="arrowhead" points="312,528 300,522.4 300,533.6" fill="black" transform="rotate(180,304,528)"></polygon>
                   <polygon class="arrowhead" points="200,208 188,202.4 188,213.6" fill="black" transform="rotate(0,192,208)"></polygon>
                   <polygon class="arrowhead" points="200,176 188,170.4 188,181.6" fill="black" transform="rotate(0,192,176)"></polygon>
-                  <polygon class="arrowhead" points="168,464 156,458.4 156,469.6" fill="black" transform="rotate(0,160,464)"></polygon>
+                  <polygon class="arrowhead" points="168,480 156,474.4 156,485.6" fill="black" transform="rotate(0,160,480)"></polygon>
                   <g class="text">
                     <text x="344" y="84">plaintext</text>
                     <text x="244" y="180">sframe_key</text>
@@ -2096,15 +2096,17 @@ <h4 id="name-encryption">
                     <text x="196" y="340">metadata</text>
                     <text x="368" y="388">AAD</text>
                     <text x="348" y="420">AEAD.Encrypt</text>
-                    <text x="204" y="468">SFrame</text>
-                    <text x="260" y="468">Header</text>
-                    <text x="236" y="532">ciphertext</text>
+                    <text x="188" y="452">SFrame</text>
+                    <text x="260" y="452">Ciphertext</text>
+                    <text x="204" y="484">SFrame</text>
+                    <text x="260" y="484">Header</text>
+                    <text x="236" y="548">ciphertext</text>
                   </g>
                 </svg><a href="#section-4.4.3-5.1.1" class="pilcrow">¶</a>
 </div>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
-<a href="#name-encryption-flow" class="selfRef">Encryption flow</a>
+<a href="#name-encrypting-an-sframe-cipher" class="selfRef">Encrypting an SFrame Ciphertext</a>
             </figcaption></figure>
 </section>
 </div>
@@ -2143,74 +2145,76 @@ <h4 id="name-decryption">
 other reason, the client MUST discard the ciphertext. Invalid ciphertexts SHOULD be
 discarded in a way that is indistinguishable (to an external observer) from having
 processed a valid ciphertext.<a href="#section-4.4.4-4" class="pilcrow">¶</a></p>
-<span id="name-decryption-flow"></span><figure id="figure-5">
+<span id="name-decrypting-an-sframe-cipher"></span><figure id="figure-5">
             <div id="section-4.4.4-5.1">
               <div class="alignLeft art-svg artwork" id="section-4.4.4-5.1.1">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="624" width="384" viewBox="0 0 384 624" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
-                  <path d="M 8,48 L 8,416" fill="none" stroke="black"></path>
-                  <path d="M 32,208 L 32,304" fill="none" stroke="black"></path>
-                  <path d="M 64,192 L 64,320" fill="none" stroke="black"></path>
-                  <path d="M 96,352 L 96,384" fill="none" stroke="black"></path>
-                  <path d="M 112,192 L 112,320" fill="none" stroke="black"></path>
-                  <path d="M 136,32 L 136,160" fill="none" stroke="black"></path>
-                  <path d="M 136,208 L 136,240" fill="none" stroke="black"></path>
-                  <path d="M 160,384 L 160,416" fill="none" stroke="black"></path>
-                  <path d="M 232,352 L 232,384" fill="none" stroke="black"></path>
-                  <path d="M 248,496 L 248,592" fill="none" stroke="black"></path>
-                  <path d="M 264,32 L 264,160" fill="none" stroke="black"></path>
-                  <path d="M 288,240 L 288,272" fill="none" stroke="black"></path>
-                  <path d="M 312,96 L 312,432" fill="none" stroke="black"></path>
-                  <path d="M 312,480 L 312,488" fill="none" stroke="black"></path>
-                  <path d="M 376,496 L 376,592" fill="none" stroke="black"></path>
-                  <path d="M 136,32 L 264,32" fill="none" stroke="black"></path>
-                  <path d="M 8,48 L 128,48" fill="none" stroke="black"></path>
-                  <path d="M 136,64 L 264,64" fill="none" stroke="black"></path>
-                  <path d="M 272,96 L 312,96" fill="none" stroke="black"></path>
-                  <path d="M 136,160 L 264,160" fill="none" stroke="black"></path>
-                  <path d="M 64,192 L 112,192" fill="none" stroke="black"></path>
-                  <path d="M 112,208 L 160,208" fill="none" stroke="black"></path>
-                  <path d="M 264,208 L 304,208" fill="none" stroke="black"></path>
-                  <path d="M 136,240 L 160,240" fill="none" stroke="black"></path>
-                  <path d="M 272,240 L 288,240" fill="none" stroke="black"></path>
-                  <path d="M 8,256 L 24,256" fill="none" stroke="black"></path>
-                  <path d="M 64,256 L 112,256" fill="none" stroke="black"></path>
-                  <path d="M 112,272 L 304,272" fill="none" stroke="black"></path>
-                  <path d="M 64,320 L 112,320" fill="none" stroke="black"></path>
-                  <path d="M 96,352 L 232,352" fill="none" stroke="black"></path>
-                  <path d="M 96,384 L 232,384" fill="none" stroke="black"></path>
-                  <path d="M 8,416 L 304,416" fill="none" stroke="black"></path>
-                  <path d="M 248,496 L 376,496" fill="none" stroke="black"></path>
-                  <path d="M 248,592 L 376,592" fill="none" stroke="black"></path>
-                  <path d="M 48,192 C 39.16936,192 32,199.16936 32,208" fill="none" stroke="black"></path>
-                  <path d="M 48,320 C 39.16936,320 32,312.83064 32,304" fill="none" stroke="black"></path>
-                  <polygon class="arrowhead" points="320,488 308,482.4 308,493.6" fill="black" transform="rotate(90,312,488)"></polygon>
-                  <polygon class="arrowhead" points="312,416 300,410.4 300,421.6" fill="black" transform="rotate(0,304,416)"></polygon>
-                  <polygon class="arrowhead" points="312,272 300,266.4 300,277.6" fill="black" transform="rotate(0,304,272)"></polygon>
-                  <polygon class="arrowhead" points="312,208 300,202.4 300,213.6" fill="black" transform="rotate(0,304,208)"></polygon>
-                  <polygon class="arrowhead" points="168,240 156,234.4 156,245.6" fill="black" transform="rotate(0,160,240)"></polygon>
-                  <polygon class="arrowhead" points="168,208 156,202.4 156,213.6" fill="black" transform="rotate(0,160,208)"></polygon>
-                  <polygon class="arrowhead" points="32,256 20,250.4 20,261.6" fill="black" transform="rotate(0,24,256)"></polygon>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="640" width="384" viewBox="0 0 384 640" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
+                  <path d="M 8,64 L 8,432" fill="none" stroke="black"></path>
+                  <path d="M 32,224 L 32,320" fill="none" stroke="black"></path>
+                  <path d="M 64,208 L 64,336" fill="none" stroke="black"></path>
+                  <path d="M 96,368 L 96,400" fill="none" stroke="black"></path>
+                  <path d="M 112,208 L 112,336" fill="none" stroke="black"></path>
+                  <path d="M 136,48 L 136,176" fill="none" stroke="black"></path>
+                  <path d="M 136,224 L 136,256" fill="none" stroke="black"></path>
+                  <path d="M 160,400 L 160,432" fill="none" stroke="black"></path>
+                  <path d="M 232,368 L 232,400" fill="none" stroke="black"></path>
+                  <path d="M 248,512 L 248,608" fill="none" stroke="black"></path>
+                  <path d="M 264,48 L 264,176" fill="none" stroke="black"></path>
+                  <path d="M 288,256 L 288,288" fill="none" stroke="black"></path>
+                  <path d="M 312,112 L 312,448" fill="none" stroke="black"></path>
+                  <path d="M 312,496 L 312,504" fill="none" stroke="black"></path>
+                  <path d="M 376,512 L 376,608" fill="none" stroke="black"></path>
+                  <path d="M 136,48 L 264,48" fill="none" stroke="black"></path>
+                  <path d="M 8,64 L 128,64" fill="none" stroke="black"></path>
+                  <path d="M 136,80 L 264,80" fill="none" stroke="black"></path>
+                  <path d="M 272,112 L 312,112" fill="none" stroke="black"></path>
+                  <path d="M 136,176 L 264,176" fill="none" stroke="black"></path>
+                  <path d="M 64,208 L 112,208" fill="none" stroke="black"></path>
+                  <path d="M 112,224 L 160,224" fill="none" stroke="black"></path>
+                  <path d="M 264,224 L 304,224" fill="none" stroke="black"></path>
+                  <path d="M 136,256 L 160,256" fill="none" stroke="black"></path>
+                  <path d="M 272,256 L 288,256" fill="none" stroke="black"></path>
+                  <path d="M 8,272 L 24,272" fill="none" stroke="black"></path>
+                  <path d="M 64,272 L 112,272" fill="none" stroke="black"></path>
+                  <path d="M 112,288 L 304,288" fill="none" stroke="black"></path>
+                  <path d="M 64,336 L 112,336" fill="none" stroke="black"></path>
+                  <path d="M 96,368 L 232,368" fill="none" stroke="black"></path>
+                  <path d="M 96,400 L 232,400" fill="none" stroke="black"></path>
+                  <path d="M 8,432 L 304,432" fill="none" stroke="black"></path>
+                  <path d="M 248,512 L 376,512" fill="none" stroke="black"></path>
+                  <path d="M 248,608 L 376,608" fill="none" stroke="black"></path>
+                  <path d="M 48,208 C 39.16936,208 32,215.16936 32,224" fill="none" stroke="black"></path>
+                  <path d="M 48,336 C 39.16936,336 32,328.83064 32,320" fill="none" stroke="black"></path>
+                  <polygon class="arrowhead" points="320,504 308,498.4 308,509.6" fill="black" transform="rotate(90,312,504)"></polygon>
+                  <polygon class="arrowhead" points="312,432 300,426.4 300,437.6" fill="black" transform="rotate(0,304,432)"></polygon>
+                  <polygon class="arrowhead" points="312,288 300,282.4 300,293.6" fill="black" transform="rotate(0,304,288)"></polygon>
+                  <polygon class="arrowhead" points="312,224 300,218.4 300,229.6" fill="black" transform="rotate(0,304,224)"></polygon>
+                  <polygon class="arrowhead" points="168,256 156,250.4 156,261.6" fill="black" transform="rotate(0,160,256)"></polygon>
+                  <polygon class="arrowhead" points="168,224 156,218.4 156,229.6" fill="black" transform="rotate(0,160,224)"></polygon>
+                  <polygon class="arrowhead" points="32,272 20,266.4 20,277.6" fill="black" transform="rotate(0,24,272)"></polygon>
                   <g class="text">
-                    <text x="172" y="52">SFrame</text>
-                    <text x="228" y="52">Header</text>
-                    <text x="204" y="116">ciphertext</text>
-                    <text x="212" y="212">sframe_key</text>
-                    <text x="336" y="212">Key</text>
-                    <text x="88" y="228">KID</text>
-                    <text x="216" y="244">sframe_salt</text>
-                    <text x="344" y="276">Nonce</text>
-                    <text x="88" y="292">CTR</text>
-                    <text x="164" y="372">metadata</text>
-                    <text x="336" y="420">AAD</text>
-                    <text x="316" y="452">AEAD.Decrypt</text>
-                    <text x="312" y="468">|</text>
-                    <text x="312" y="548">plaintext</text>
+                    <text x="156" y="36">SFrame</text>
+                    <text x="228" y="36">Ciphertext</text>
+                    <text x="172" y="68">SFrame</text>
+                    <text x="228" y="68">Header</text>
+                    <text x="204" y="132">ciphertext</text>
+                    <text x="212" y="228">sframe_key</text>
+                    <text x="336" y="228">Key</text>
+                    <text x="88" y="244">KID</text>
+                    <text x="216" y="260">sframe_salt</text>
+                    <text x="344" y="292">Nonce</text>
+                    <text x="88" y="308">CTR</text>
+                    <text x="164" y="388">metadata</text>
+                    <text x="336" y="436">AAD</text>
+                    <text x="316" y="468">AEAD.Decrypt</text>
+                    <text x="312" y="484">|</text>
+                    <text x="312" y="564">plaintext</text>
                   </g>
                 </svg><a href="#section-4.4.4-5.1.1" class="pilcrow">¶</a>
 </div>
 </div>
 <figcaption><a href="#figure-5" class="selfRef">Figure 5</a>:
-<a href="#name-decryption-flow" class="selfRef">Decryption flow</a>
+<a href="#name-decrypting-an-sframe-cipher" class="selfRef">Decrypting an SFrame Ciphertext</a>
             </figcaption></figure>
 </section>
 </div>
diff --git a/better-diagram/draft-ietf-sframe-enc.txt b/better-diagram/draft-ietf-sframe-enc.txt
index 006c704..65b9aa1 100644
--- a/better-diagram/draft-ietf-sframe-enc.txt
+++ b/better-diagram/draft-ietf-sframe-enc.txt
@@ -566,6 +566,7 @@ Alice |            (per-frame)         (per-packet)   |        |        |
        |                                     |
        |                                AEAD.Encrypt
        |                                     |
+       |               SFrame Ciphertext     |
        |               +---------------+     |
        +-------------->| SFrame Header |     |
                        +---------------+     |
@@ -576,7 +577,7 @@ Alice |            (per-frame)         (per-packet)   |        |        |
                        |               |
                        +---------------+
 
-                         Figure 4: Encryption flow
+                 Figure 4: Encrypting an SFrame Ciphertext
 
 4.4.4.  Decryption
 
@@ -612,6 +613,7 @@ Alice |            (per-frame)         (per-packet)   |        |        |
    in a way that is indistinguishable (to an external observer) from
    having processed a valid ciphertext.
 
+                       SFrame Ciphertext
                        +---------------+
        +---------------| SFrame Header |
        |               +---------------+
@@ -649,7 +651,7 @@ Alice |            (per-frame)         (per-packet)   |        |        |
                                      |               |
                                      +---------------+
 
-                         Figure 5: Decryption flow
+                 Figure 5: Decrypting an SFrame Ciphertext
 
 4.5.  Cipher Suites