diff --git a/content/docs/migration/protocols/_index.md b/content/docs/migration/protocols/_index.md
index 518a1edbbccabd06d6f68ad7606bcb307038d2fd..bd60daab1000ba3fe4b9ca9f5fc0ff85bb9d2754 100644
--- a/content/docs/migration/protocols/_index.md
+++ b/content/docs/migration/protocols/_index.md
@@ -5,47 +5,56 @@ draft: false
weight: 2
layout: no_index
---
-An overview of the existing communication and security protocols that make use of cryptographic systems and cipher suites, and their current state of PQC integration. The classification is based on the OSI model.
+An overview of the existing security standards that make use of cryptographic systems and cipher suites, and their current state of PQC integration.
-##### Data Link (Layer 2)
-- [MACsec]({{< ref "/macsec" >}} "MACsec")
-- PPP CHAP/PAP
-- [WPA/EAP]({{< ref "/wlan" >}} "WPA/EAP")
+|Security Protocol|Description|Type|Usage|OSI-Layer|
+|-----------------|-----------|----|-----|---------|
+|**Data Link Layer**|
+|[MACsec]({{< ref "/macsec" >}} "MACsec")|Media Access Control Security|Key Agreement|Ethernet|2|
+|[CHAP]({{< ref "/pap" >}} "CHAP")|Challenge-Handshake Authentication Protocol|Authentication|PPP (Point-to-Ponit)|2|
+|[PAP]({{< ref "/pap" >}} "PAP")|Password Authentication Protocol|Authentication|PPP (Point-to-Ponit)|2|
+|**Network Layer**|
+|[AH]({{< ref "/ipsec" >}} "AH")|Authentication Header|Authentication|IPsec|3-4|
+|[ESP]({{< ref "/ipsec" >}} "ESP")|Encapsulating Security Payload|Authentication and Encryption|IPsec|3-4|
+|[IKEv2]({{< ref "/ipsec" >}} "IKEv2")|Internet Key Exchange|Authentication and Key Exchange|IPsec|3-4|
+|**Transport Layer**|
+|[TLS/SSL]({{< ref "/tls" >}} "TLS/SSL")|Transport Layer Security/Secure Sockets Layer|Authentication, Key Exchange, and Encryption|TCP|4-7|
+|[DTLS]({{< ref "/dtls" >}} "DTLS")|Datagram Transport Layer Security|Authentication, Key Exchange, and Encryption|UDP|4|
+|[SRTP/ZRTP]({{< ref "/rtp" >}} "SRTP/ZRTP")|(Secure) Real-Time Transport Protocol|Authentication, Key Agreement, and Encryption|RTP|4-7|
+|**Application Layer**|
+|[SSH]({{< ref "/ssh" >}} "SSH")|Secure Shell Protocol|Authentication and Encryption|-|7|
+|[OpenVPN]({{< ref "/vpn" >}} "OpenVPN")|Open Virtual Private Network|Authentication and Encryption|VPN|2-7|
+|[WireGuard]({{< ref "/vpn" >}} "WireGuard")|WireGuard Virtual Private Network|Authentication and Encryption|VPN|2-7|
+|[DNSSEC]({{< ref "/dnssec" >}} "DNSSEC")|Domain Name System Security Extensions|Authentication, Key Management, and Signing|IP|7|
+|[S-MIME/PGP-MIME]({{< ref "/smime" >}} "S-MIME/PGP-MIME")|Secure Multipurpose Internet Mail Extension|Encryption and Signing|E-Mail|7|
+|[PGP/GPG]({{< ref "/pgp" >}} "PGP/GPG")|Pretty Good Privacy/GNU Privacy Guard|Encryption and Signing|Several|7|
+|[Kerberos/PKINIT]({{< ref "/pkinit" >}} "Kerberos/PKINIT")|Authentication Service|Authentication|Network Communication|7|
+|[SSO (OAuth/LDAP/SAML/RADIUS)]({{< ref "/sso" >}} "SSO (OAuth/LDAP/SAML/RADIUS)")|Single Sign-on|Authentication|Network Communication|7|
+|[SFTP]({{< ref "/sftp" >}} "SFTP")|SSH File Transfer Protocol|Authentication and Encryption|File Transfer|7|
+-----------------------------------------------------------------------------------
+
+##### [Certificates and Cryptographic Standards]({{< ref "/certs" >}} "Certificates and Cryptographic Standards")
+- PKCS (Public Key Cryptography Standards)
+- X.509
+- CMS (Cryptographic Message Syntax)
+
+##### [Blockchain]({{< ref "/dlt" >}} "Blockchain")
+- DLTs (Distributed Ledgers)
+
+##### [Wireless Networks]({{< ref "/wlan" >}} "Wireless Networks")
+- WPA/IEEE 802.x1/EAP
- UMTTS/LTE/5G
- Bluetooth/IR/ZigBee
- WSN
-##### Network (Layer 3)
-- [IPsec/IKE]({{< ref "/ike" >}} "IPsec/IKE")
-- [VPN]({{< ref "/vpn" >}} "VPN")
-- [WireGuard]({{< ref "/wireguard" >}} "WireGuard")
-- [DLT]({{< ref "/dlt" >}} "DLT")
-- GRE
-
-##### Transport (Layer 4)
-- [TLS/SSL]({{< ref "/tls" >}} "TLS/SSL")
-- [DTLS]({{< ref "/dtls" >}} "DTLS")
-- SRTP/ZRTP
-- QUIC
+##### [Others]({{< ref "/others" >}} "Others")
+- OPC UA (Open Platform Communication Unified Architecture)
+- L2TP (Layer 2 Tunneling Protocol)
+- SSTP (Secure Socket Tunneling Protocol)
+- GRE (Generic Routing Encapsulation)
+- QUIC (Quick)
+- S-RPC (Secure Remote Procedure Call)
+- FinTS/HBCI
- PCT
-
-##### Session (Layer 5)
-- [PGP/GPG]({{< ref "/pgp" >}} "PGP/GPG")
-
-##### Application (Layer 7)
-- [SSH]({{< ref "/ssh" >}} "SSH")
-- [DNSSEC]({{< ref "/dnssec" >}} "DNSSEC")
-- [X.509]({{< ref "/certs" >}} "X.509")
-- [CMS]({{< ref "/cms" >}} "CMS")
-- [S/MIME]({{< ref "/smime" >}} "S/MIME")
-- [Kerberos/PKINIT]({{< ref "/pkinit" >}} "Kerberos/PKINIT")
-- OAuth
-- [OPC UA]({{< ref "/opcua" >}} "OPC UA")
-- SFTP
-
-##### Others
- SET
-- S-RPC
-- FinTS/HBCI
-- PKCS
- Telnet
diff --git a/content/docs/migration/protocols/all/certs.md b/content/docs/migration/protocols/all/certs.md
index 09b96e004b08a226ce193987b9cedb0ca85cadf5..31b0550a4235acfdb35c781c71d02d635cdc54c2 100644
--- a/content/docs/migration/protocols/all/certs.md
+++ b/content/docs/migration/protocols/all/certs.md
@@ -1,7 +1,7 @@
---
-title: "X.509"
+title: "Certificates and Cryptographic Standards"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 6
+weight: 15
---
diff --git a/content/docs/migration/protocols/all/dlt.md b/content/docs/migration/protocols/all/dlt.md
index c9115d40909d1aa25ff4d91f052879033684c3a4..675e972de5c2b96e824e4875ae59ea947e864a4c 100644
--- a/content/docs/migration/protocols/all/dlt.md
+++ b/content/docs/migration/protocols/all/dlt.md
@@ -1,7 +1,7 @@
---
-title: "DLT"
+title: "Distributed Ledger"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 14
+weight: 16
---
diff --git a/content/docs/migration/protocols/all/dnssec.md b/content/docs/migration/protocols/all/dnssec.md
index 329010fcb5d7112e40162b637ef39ad6066c14fa..847b37b945515a0c350b60bc2aa29ef732ddf36c 100644
--- a/content/docs/migration/protocols/all/dnssec.md
+++ b/content/docs/migration/protocols/all/dnssec.md
@@ -3,5 +3,5 @@ title: "DNSSEC"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 5
+weight: 9
---
diff --git a/content/docs/migration/protocols/all/dtls.md b/content/docs/migration/protocols/all/dtls.md
index bf8ca38495cffba2b8f3f843d5d18336f501613b..c41aed1a81708b7708cd4f5237ff1795d9a2e06b 100644
--- a/content/docs/migration/protocols/all/dtls.md
+++ b/content/docs/migration/protocols/all/dtls.md
@@ -3,5 +3,5 @@ title: "DTLS"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 7
+weight: 5
---
diff --git a/content/docs/migration/protocols/all/ike.md b/content/docs/migration/protocols/all/ipsec.md
similarity index 100%
rename from content/docs/migration/protocols/all/ike.md
rename to content/docs/migration/protocols/all/ipsec.md
diff --git a/content/docs/migration/protocols/all/macsec.md b/content/docs/migration/protocols/all/macsec.md
index dc76bbc447749d27b30227209ff070b1d5773f43..e2e6a1d949fd931484aa869a283d26ead577ee0d 100644
--- a/content/docs/migration/protocols/all/macsec.md
+++ b/content/docs/migration/protocols/all/macsec.md
@@ -3,6 +3,6 @@ title: "MACsec"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 10
+weight: 1
---
- [Post-quantum MACsec in Ethernet Networks ](https://journals.riverpublishers.com/index.php/JCSANDM/article/view/5973) Authenticated post-quantum key establishment protocol which is suitable for long-term secure MACsec. Hybrid mode, ephemeral key exchange, and an end-to-end encryption [[ChSe21]](../../../../refs#chse21).
diff --git a/content/docs/migration/protocols/all/cms.md b/content/docs/migration/protocols/all/others.md
similarity index 70%
rename from content/docs/migration/protocols/all/cms.md
rename to content/docs/migration/protocols/all/others.md
index 05461bdeadf3efc34844d5481838c5792c0affe9..4d9f8db033f4e266708b5cc3020d34eed5a05bc0 100644
--- a/content/docs/migration/protocols/all/cms.md
+++ b/content/docs/migration/protocols/all/others.md
@@ -1,7 +1,7 @@
---
-title: "CMS"
+title: "Others"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 8
+weight: 18
---
diff --git a/content/docs/migration/protocols/all/wireguard.md b/content/docs/migration/protocols/all/pap.md
similarity index 68%
rename from content/docs/migration/protocols/all/wireguard.md
rename to content/docs/migration/protocols/all/pap.md
index ef562a4e827083957461731629825d6a67c146f1..a3ebade581baabab8692a79c89e2ee9e22c9cd69 100644
--- a/content/docs/migration/protocols/all/wireguard.md
+++ b/content/docs/migration/protocols/all/pap.md
@@ -1,7 +1,7 @@
---
-title: "WireGuard"
+title: "CHAP/PAP"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 12
+weight: 2
---
diff --git a/content/docs/migration/protocols/all/pkinit.md b/content/docs/migration/protocols/all/pkinit.md
index 5d246e615a2c0b97eade526c8e49a8429d25eac9..ddcd46f832ec5354e4832006ff0f396d8f87e301 100644
--- a/content/docs/migration/protocols/all/pkinit.md
+++ b/content/docs/migration/protocols/all/pkinit.md
@@ -1,7 +1,7 @@
---
-title: "PKINIT"
+title: "Kerberos"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 13
+weight: 12
---
diff --git a/content/docs/migration/protocols/all/rtp.md b/content/docs/migration/protocols/all/rtp.md
new file mode 100644
index 0000000000000000000000000000000000000000..2ed460bdbec83bf35d9dfff5be2aeb44ae0020f2
--- /dev/null
+++ b/content/docs/migration/protocols/all/rtp.md
@@ -0,0 +1,7 @@
+---
+title: "SRTP/ZRTP"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 6
+---
diff --git a/content/docs/migration/protocols/all/opcua.md b/content/docs/migration/protocols/all/sftp.md
similarity index 82%
rename from content/docs/migration/protocols/all/opcua.md
rename to content/docs/migration/protocols/all/sftp.md
index e494105520f5519d7122ed609b1e654c52bfe42a..0db72368c1ab7d761ae3a31f5f7c15eec7364d05 100644
--- a/content/docs/migration/protocols/all/opcua.md
+++ b/content/docs/migration/protocols/all/sftp.md
@@ -1,5 +1,5 @@
---
-title: "OPC UA"
+title: "SFTP"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
diff --git a/content/docs/migration/protocols/all/smime.md b/content/docs/migration/protocols/all/smime.md
index 265d35b96024c937f7158ff4c96b1db61c87488e..71022aa9217181c9b72aa00ecc1ef4c724e9859e 100644
--- a/content/docs/migration/protocols/all/smime.md
+++ b/content/docs/migration/protocols/all/smime.md
@@ -3,5 +3,5 @@ title: "S/MIME"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 8
+weight: 10
---
diff --git a/content/docs/migration/protocols/all/ssh.md b/content/docs/migration/protocols/all/ssh.md
index 850c787b9f8c700f9502cb0bb16a394833b7c286..bb1ee3bcec20b61c8459266b695211cc08b62acd 100644
--- a/content/docs/migration/protocols/all/ssh.md
+++ b/content/docs/migration/protocols/all/ssh.md
@@ -3,5 +3,5 @@ title: "SSH"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 2
+weight: 7
---
diff --git a/content/docs/migration/protocols/all/sso.md b/content/docs/migration/protocols/all/sso.md
new file mode 100644
index 0000000000000000000000000000000000000000..094a68a117a540e532e3f98372aedb936206c7b8
--- /dev/null
+++ b/content/docs/migration/protocols/all/sso.md
@@ -0,0 +1,7 @@
+---
+title: "Single Sign-On"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 13
+---
diff --git a/content/docs/migration/protocols/all/tls.md b/content/docs/migration/protocols/all/tls.md
index c1a326618fe3b35c0e982e2e5f7d7ecbb1f577d9..ba4e2605d7132f7a2e49b15c8a36a574031ef1af 100644
--- a/content/docs/migration/protocols/all/tls.md
+++ b/content/docs/migration/protocols/all/tls.md
@@ -3,5 +3,5 @@ title: "TLS/SSL"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 1
+weight: 4
---
diff --git a/content/docs/migration/protocols/all/vpn.md b/content/docs/migration/protocols/all/vpn.md
index 9b069595b9deefab4f10051bc341bf2a1c3fc5cc..30b7ccdf93623c061157c7982c2e947395378405 100644
--- a/content/docs/migration/protocols/all/vpn.md
+++ b/content/docs/migration/protocols/all/vpn.md
@@ -3,5 +3,5 @@ title: "VPN"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 4
+weight: 8
---
diff --git a/content/docs/migration/protocols/all/wlan.md b/content/docs/migration/protocols/all/wlan.md
index 36414987082cb49610145d40541ac52cadf942a7..a7c184e7500a5529f040144290221d772476bd89 100644
--- a/content/docs/migration/protocols/all/wlan.md
+++ b/content/docs/migration/protocols/all/wlan.md
@@ -1,7 +1,7 @@
---
-title: "WPA/EAP"
+title: "Wireless Networks"
date: 2021-05-05T22:41:49+02:00
draft: false
type: docs
-weight: 9
+weight: 17
---