diff --git a/modules/cnv-add-disk-to-vm.adoc b/modules/cnv-add-disk-to-vm.adoc
index ba50323840..a0abb2c4ff 100644
--- a/modules/cnv-add-disk-to-vm.adoc
+++ b/modules/cnv-add-disk-to-vm.adoc
@@ -7,13 +7,11 @@
 // and VM templates.
 
 ifeval::["{context}" == "cnv-edit-vms"]
-:cnv-vm-add-disk:
 :object: virtual machine
 :object-gui: Virtual Machines
 endif::[]
 
 ifeval::["{context}" == "cnv-editing-vm-template"]
-:cnv-vm-add-disk-template:
 :object: virtual machine template
 :object-gui: Virtual Machine Templates
 endif::[]
@@ -31,15 +29,14 @@ endif::[]
 . Use the drop-down lists and check boxes to edit the disk configuration.
 . Click *OK*.
 
-// Scrubbing all conditionals used in module
-
-:object!:
-:object-gui!:
+// Unsetting all conditionals used in module
 
 ifeval::["{context}" == "cnv-edit-vms"]
-:cnv-vm-add-disk!:
+:object!:
+:object-gui!:
 endif::[]
 
 ifeval::["{context}" == "cnv-editing-vm-template"]
-:cnv-vm-template!:
+:object!:
+:object-gui!:
 endif::[]
diff --git a/modules/cnv-editing-vm-web.adoc b/modules/cnv-editing-vm-web.adoc
index 6549c60512..99219d5429 100644
--- a/modules/cnv-editing-vm-web.adoc
+++ b/modules/cnv-editing-vm-web.adoc
@@ -52,13 +52,14 @@ endif::cnv-vm[]
 // subsequent modules in the assembly and topic_map.
 // Attributes set with an ifeval statement need to be unset with an ifeval statement.
 
-:object!:
-:object-gui!:
-
 ifeval::["{context}" == "cnv-edit-vms"]
 :cnv-vm!:
+:object!:
+:object-gui!:
 endif::[]
 
 ifeval::["{context}" == "cnv-editing-vm-template"]
 :cnv-vm-template!:
+:object!:
+:object-gui!:
 endif::[]