diff --git a/privacy/customizing-whonix.md b/privacy/customizing-whonix.md
index 520ece69..25a66410 100644
--- a/privacy/customizing-whonix.md
+++ b/privacy/customizing-whonix.md
@@ -15,11 +15,11 @@ This is an optional security enhancement (for testers-only). If you're technical
 
 Note, if you want to use [Tor bridges](https://www.whonix.org/wiki/Bridges), AppArmor has been known in the past to cause problems with `obfsproxy` [see this issue](https://github.com/Whonix/Whonix/issues/67)
 
-You will want to complete the following instructions in both the **Whonix Gateway** referred to in Qubes VM Manager as `whonix-gw` and the **Whonix Workstation** or  `whonix-ws`. You only need to apply these settings to the TemplateVMs before creating any template based VMs from these Whonix templates.
+You will want to complete the following instructions in both the **Whonix-Gateway** referred to in Qubes VM Manager as `whonix-gw` and the **Whonix-Workstation** or  `whonix-ws`. You only need to apply these settings to the TemplateVMs before creating any template based VMs from these Whonix templates.
 
 [Since Qubes Q3, TemplateBasedVMs inherit the kernelopts setting of their TemplateVM](https://github.com/QubesOS/qubes-issues/issues/1091)
 
-### Configuring Whonix Gateway
+### Configuring Whonix-Gateway
 
 Launch the `dom0` terminal app `Konsole` from your Qubes App Launcher. Then get a list of current kernel parameters.
 
@@ -55,7 +55,7 @@ sudo aa-status --enabled ; echo $?
 
 It should show: `0`
 
-### Configuring Whonix Workstation
+### Configuring Whonix-Workstation
 
 In `dom0` terminal Konsole, get a list of current kernel parameters.
 
diff --git a/privacy/install-whonix.md b/privacy/install-whonix.md
index f22ea04b..bd05792b 100644
--- a/privacy/install-whonix.md
+++ b/privacy/install-whonix.md
@@ -24,7 +24,7 @@ If you answered no, have a look at the [about](https://www.whonix.org/wiki/About
 
 ### Install Templates
 
-Launch the `dom0` terminal `Konsole` from your Qubes App Launcher. Then enter the following command to install the Whonix Gateway and Workstation TemplateVMs.
+Launch the `dom0` terminal `Konsole` from your Qubes App Launcher. Then enter the following command to install the Whonix-Gateway and Workstation TemplateVMs.
 
 ~~~
 sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-whonix-gw qubes-template-whonix-ws
@@ -34,15 +34,15 @@ After doing this, you should see two new TemplateVMs in the VM Manager called `w
 
 ### Configuring Whonix VMs
 
-Create a **Whonix Gateway** ProxyVM by clicking on `Create a New VM` and select `whonix-gw` as the template and select ProxyVM as the type.
+Create a **Whonix-Gateway** ProxyVM by clicking on `Create a New VM` and select `whonix-gw` as the template and select ProxyVM as the type.
 
-![Create Whonix Gateway ProxyVMs](/attachment/wiki/Whonix/Create_Qubes-Whonix-Gateway_ProxyVM.png)
+![Create Whonix-Gateway ProxyVMs](/attachment/wiki/Whonix/Create_Qubes-Whonix-Gateway_ProxyVM.png)
 
-Create a **Whonix Workstation** AppVM by clicking on `Create a New VM` and select `whonix-ws` as the template and select AppVM (should be default) as the type.
+Create a **Whonix-Workstation** AppVM by clicking on `Create a New VM` and select `whonix-ws` as the template and select AppVM (should be default) as the type.
 
 ![Create Workstation AppVMs](/attachment/wiki/Whonix/Create_Qubes-Whonix-Workstation_AppVM.png)
 
-Configure the **Whonix Gateway TemplateVM** to use the `sys-whonix` ProxyVM that you just created.
+Configure the **Whonix-Gateway TemplateVM** to use the `sys-whonix` ProxyVM that you just created.
 
 ![TemplateVM Proxy Settings](/attachment/wiki/Whonix/Qubes-Whonix-Gateway_TemplateVM_Qubes_VM_Manager_Settings.png)
 
@@ -50,7 +50,7 @@ Great. You should be all done installing Whonix into Qubes. Use these two Templa
 
 ### Running Applications
 
-To start an application in the **Whonix Workstation AppVM** that you created, launch it like any other- open the `Qubes App Launcher` and then select an app such as `Privacy Browser` which will then launch the Tor Browser
+To start an application in the **Whonix-Workstation AppVM** that you created, launch it like any other- open the `Qubes App Launcher` and then select an app such as `Privacy Browser` which will then launch the Tor Browser
 
 
 ### Advanced Information
diff --git a/privacy/uninstall-whonix.md b/privacy/uninstall-whonix.md
index 8d9dd0aa..dbbe69c5 100644
--- a/privacy/uninstall-whonix.md
+++ b/privacy/uninstall-whonix.md
@@ -7,7 +7,7 @@ permalink: /doc/privacy/uninstall-whonix/
 Uninstall Whonix from Qubes
 ===========================
 
-If you just want to remove your **Whonix Gateway ProxyVMs** or **Whonix Workstation AppVMs** this would not be the guide for doing that. Just use the Qubes VM Manager or command line tools for doing that.
+If you just want to remove your **Whonix-Gateway ProxyVMs** or **Whonix-Workstation AppVMs** this would not be the guide for doing that. Just use the Qubes VM Manager or command line tools for doing that.
 
 *Warning: This guide will completely uninstall your underlying Whonix TemplateVMs. Only do this if you want to stop using Whonix or start over with a clean install of Whonix.*