diff --git a/views/faq.php b/views/faq.php
index 752356b..4362b13 100644
--- a/views/faq.php
+++ b/views/faq.php
@@ -3,7 +3,7 @@
 <h1>FAQ</h1>
 <div class="content">
     <h3 id="what-is-keyoxide"><a href="#what-is-keyoxide">#</a> What is Keyoxide?</h3>
-    <p><a href="/">Keyoxide</a> is a lightweight and FOSS solution to make basic cryptography operations accessible to regular humans. It is built to be privacy friendly and secure, it can even be selfhosted.</p>
+    <p><a href="/">Keyoxide</a> is a lightweight and FOSS solution to make basic cryptography operations accessible to regular humans. It is built to be privacy friendly and secure, it can even be self-hosted.</p>
 
     <h3 id="why-does-keyoxide-exist"><a href="#why-does-keyoxide-exist">#</a> Why does Keyoxide exist?</h3>
     <p><a href="/">Keyoxide</a> provides a solution to a modern problem: we humans have developed advanced methods of encrypting data and signing it. Unfortunately, it requires complicated tools that demand a minimal level of understanding cryptography and how keypairs work to leverage these technologies.</p>
diff --git a/views/guides.php b/views/guides.php
index 41b3739..aa674a1 100644
--- a/views/guides.php
+++ b/views/guides.php
@@ -13,7 +13,7 @@
     <h3>Beyond Keyoxide.org</h3>
     <a href="/guides/openpgp-proofs">How OpenPGP identity proofs work</a><br>
     <a href="/guides/web-key-directory">Uploading keys using web key directory</a><br>
-    <a href="/guides/selfhosting-keyoxide">Selfhosting Keyoxide</a><br>
+    <a href="/guides/self-hosting-keyoxide">Self-hosting Keyoxide</a><br>
     <a href="/guides/service-provider">Are you a service provider?</a><br>
 
     <h3>Adding proofs</h3>
diff --git a/views/guides/encrypt.content.php b/views/guides/encrypt.content.php
index f85286a..188db5f 100644
--- a/views/guides/encrypt.content.php
+++ b/views/guides/encrypt.content.php
@@ -11,7 +11,7 @@
 
 <p>Open the <a href="/encrypt" target="_blank">keyoxide.org/encrypt</a> page and paste the fingerprint in the <strong>Email / key id / fingerprint</strong> field.</p>
 <p>Write a message in the <strong>Message</strong> field. Scroll down and press the <strong>ENCRYPT MESSAGE</strong> button.</p>
-<p>You have successfully encrypted the message! The encrypted message in the <strong>Message</strong> field can safely be sent via unsecure communication channels knowing that only the person possessing the private key associated with that fingerprint can read it.</p>
+<p>You have successfully encrypted the message! The encrypted message in the <strong>Message</strong> field can safely be sent via unsecured communication channels knowing that only the person possessing the private key associated with that fingerprint can read it.</p>
 
 <h3>Going further</h3>
 
diff --git a/views/guides/selfhosting-keyoxide.content.php b/views/guides/self-hosting-keyoxide.content.php
similarity index 100%
rename from views/guides/selfhosting-keyoxide.content.php
rename to views/guides/self-hosting-keyoxide.content.php
diff --git a/views/guides/self-hosting-keyoxide.title.php b/views/guides/self-hosting-keyoxide.title.php
new file mode 100644
index 0000000..2be94ce
--- /dev/null
+++ b/views/guides/self-hosting-keyoxide.title.php
@@ -0,0 +1 @@
+Self-hosting Keyoxide
diff --git a/views/guides/selfhosting-keyoxide.title.php b/views/guides/selfhosting-keyoxide.title.php
deleted file mode 100644
index bccd40d..0000000
--- a/views/guides/selfhosting-keyoxide.title.php
+++ /dev/null
@@ -1 +0,0 @@
-Selfhosting Keyoxide