diff --git a/specification/modules/end_to_end_encryption.rst b/specification/modules/end_to_end_encryption.rst
index 3ec9368a..8b38ab93 100644
--- a/specification/modules/end_to_end_encryption.rst
+++ b/specification/modules/end_to_end_encryption.rst
@@ -69,24 +69,24 @@ Messaging Algorithm Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Messaging algorithm names use the extensible naming scheme used throughout this
-specification. Algorithm names that start with `m.` are reserved for algorithms
-defined by this specification. Implementations wanting to experiment with new
-algorithms are encouraged to pick algorithm names that start with their
-domain to reduce the risk of collisions.
+specification. Algorithm names that start with ``m.`` are reserved for
+algorithms defined by this specification. Implementations wanting to experiment
+with new algorithms are encouraged to pick algorithm names that start with
+their domain to reduce the risk of collisions.
 
 Algorithm names should be short and meaningful, and should list the primitives
 used by the algorithm so that it is easier to see if the algorithm is using a
 broken primitive.
 
-The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the Olm
+The name ``m.olm.v1.curve25519-aes-sha2`` corresponds to version 1 of the Olm
 ratchet using Curve25519 for the initial key agreement, HKDF-SHA-256 for
 ratchet key derivation, Curve25519 for the DH ratchet, HMAC-SHA-256 for the
 hash ratchet, and HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated
 HMAC-SHA-256 for authenticated encryption.
 
-A name of `m.olm.v1` is too short: it gives no information about the primitives
+A name of ``m.olm.v1`` is too short: it gives no information about the primitives
 in use, and is difficult to extend for different primitives. However a name of
-`m.olm.v1.ecdh-curve25519-hdkfsha256.hmacsha256.hkdfsha256-aes256-cbc-hmac64sha256`
+``m.olm.v1.ecdh-curve25519-hdkfsha256.hmacsha256.hkdfsha256-aes256-cbc-hmac64sha256``
 is too long despite giving a more precise description of the algorithm: it adds
 to the data transfer overhead and sacrifices clarity for human readers without
 adding any useful extra information.
@@ -94,10 +94,10 @@ adding any useful extra information.
 Key Algorithms
 ~~~~~~~~~~~~~~
 
-The name `ed25519` corresponds to the Ed25519 signature algorithm. The key is
+The name ``ed25519`` corresponds to the Ed25519 signature algorithm. The key is
 a Base64 encoded 32-byte Ed25519 public key.
 
-The name `curve25519` corresponds to the Curve25519 ECDH algorithm. The key is
+The name ``curve25519`` corresponds to the Curve25519 ECDH algorithm. The key is
 a Base64 encoded 32-byte Curve25519 public key.
 
 Client Behaviour