diff --git a/managing-os/templates.md b/managing-os/templates.md
index 9a678fd6..b45355ff 100644
--- a/managing-os/templates.md
+++ b/managing-os/templates.md
@@ -63,7 +63,7 @@ When you install a new template or upgrade a clone of a template, it is recommen
 
         Qubes Manager --> (Select a VM) --> VM settings --> Template
 
-3. Base the [DispVM](/doc/dispvm/) template on the new template.
+3. Base the [DVM Template](/doc/glossary/#dvm-template) on the new template.
    If you have set the new template as your default template:
 
         [user@dom0 ~]$ qvm-create-default-dvm --default-template
@@ -85,7 +85,7 @@ When you install a new template or upgrade a clone of a template, it is recommen
 
         Applications Menu --> (select a VM) --> VM settings --> Template
 
-3. Base the [DispVM](/doc/dispvm/) template on the new template.
+3. Base the [DVM Template](/doc/glossary/#dvm-template) on the new template.
 
         [user@dom0 ~]$ qvm-create -l red -t new-template new-template-dvm
         [user@dom0 ~]$ qvm-prefs new-template-dvm template_for_dispvms True
diff --git a/managing-os/templates/fedora.md b/managing-os/templates/fedora.md
index f20a8681..785e40c1 100644
--- a/managing-os/templates/fedora.md
+++ b/managing-os/templates/fedora.md
@@ -17,16 +17,16 @@ Installing
 The Fedora TemplateVM comes preinstalled with Qubes OS.
 However, there may be times when you wish to install a fresh copy from the Qubes repositories, e.g.:
 
-1. When a version of Fedora reaches EOL ([end-of-life]).
-2. When a new version of Fedora you wish to use becomes [supported] as a TemplateVM.
-3. When you suspect your Fedora TemplateVM has been compromised.
-4. When you have made modifications to the Fedora TemplateVM that you no longer want.
+ * When a version of Fedora reaches EOL ([end-of-life]).
+ * When a new version of Fedora you wish to use becomes [supported] as a TemplateVM.
+ * When you suspect your Fedora TemplateVM has been compromised.
+ * When you have made modifications to the Fedora TemplateVM that you no longer want.
 
 To install a specific Fedora TemplateVM that is not currently installed in your system, use the following command in dom0:
 
-    $ sudo qubes-dom0-update qubes-template-fedora-27
+    $ sudo qubes-dom0-update qubes-template-fedora-XX
 
-(If necessary, replace `27` with your desired Fedora version.)
+   (Replace `XX` with the Fedora version number of the template you wish to remove.)
 
 To reinstall a Fedora TemplateVM that is already installed in your system, see [How to Reinstall a TemplateVM].
 
@@ -37,12 +37,17 @@ After Installing
 After installing a fresh Fedora TemplateVM, we recommend performing the following steps:
 
 1. [Update the TemplateVM].
-2. Switch any [TemplateBasedVMs] that are based on the old TemplateVM to the new one.
+
+2. Switch any [TemplateBasedVMs] that are based on the old TemplateVM to the new one:
+
+   * [How to switch templates (3.2)](/doc/templates/#how-to-switch-templates-32)
+   * [How to switch templates (4.0)](/doc/templates/#how-to-switch-templates-40)
+
 3. If desired, remove the old TemplateVM by running the following command in dom0:
 
-        $ sudo dnf remove qubes-template-fedora-27
+        $ sudo dnf remove qubes-template-fedora-XX
 
-   (If necessary, replace `27` with your desired Fedora version.)
+   (Replace `XX` with the Fedora version number of the template you wish to remove.)
 
 
 Upgrading