diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index ecdb6e8d63..db19abc2b5 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -3252,8 +3252,8 @@ Topics:
       File: virt-configuring-certificate-rotation
     - Name: Automating management tasks
       File: virt-automating-management-tasks
-    - Name: EFI mode for virtual machines
-      File: virt-efi-mode-for-vms
+    - Name: UEFI mode for virtual machines
+      File: virt-uefi-mode-for-vms
     - Name: Configuring PXE booting for virtual machines
       File: virt-configuring-pxe-booting
     - Name: Using huge pages with virtual machines
diff --git a/modules/virt-about-efi-mode-for-vms.adoc b/modules/virt-about-efi-mode-for-vms.adoc
deleted file mode 100644
index 8dfc89f3cb..0000000000
--- a/modules/virt-about-efi-mode-for-vms.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-// Module included in the following assemblies:
-//
-// * virt/virtual_machines/advanced_vm_management/virt-efi-mode-for-vms.adoc
-
-:_content-type: CONCEPT
-[id="virt-about-efi-mode-for-vms_{context}"]
-= About EFI mode for virtual machines
-
-Extensible Firmware Interface (EFI), like legacy BIOS, initializes hardware components and operating system image files when a computer starts. EFI supports more modern features and customization options than BIOS, enabling faster boot times.
-
-It stores all the information about initialization and startup in a file with a `.efi` extension, which is stored on a special partition called EFI System Partition (ESP). The ESP also contains the boot loader programs for the operating system that is installed on the computer.
diff --git a/modules/virt-about-uefi-mode-for-vms.adoc b/modules/virt-about-uefi-mode-for-vms.adoc
new file mode 100644
index 0000000000..c0103d9347
--- /dev/null
+++ b/modules/virt-about-uefi-mode-for-vms.adoc
@@ -0,0 +1,11 @@
+// Module included in the following assemblies:
+//
+// * virt/virtual_machines/advanced_vm_management/virt-uefi-mode-for-vms.adoc
+
+:_content-type: CONCEPT
+[id="virt-about-uefi-mode-for-vms_{context}"]
+= About UEFI mode for virtual machines
+
+Unified Extensible Firmware Interface (UEFI), like legacy BIOS, initializes hardware components and operating system image files when a computer starts. UEFI supports more modern features and customization options than BIOS, enabling faster boot times.
+
+It stores all the information about initialization and startup in a file with a `.efi` extension, which is stored on a special partition called EFI System Partition (ESP). The ESP also contains the boot loader programs for the operating system that is installed on the computer.
diff --git a/modules/virt-booting-vms-efi-mode.adoc b/modules/virt-booting-vms-uefi-mode.adoc
similarity index 60%
rename from modules/virt-booting-vms-efi-mode.adoc
rename to modules/virt-booting-vms-uefi-mode.adoc
index 73bb9b65ff..adfd010a4a 100644
--- a/modules/virt-booting-vms-efi-mode.adoc
+++ b/modules/virt-booting-vms-uefi-mode.adoc
@@ -1,12 +1,12 @@
 // Module included in the following assemblies:
 //
-// * virt/virtual_machines/advanced_vm_management/virt-efi-mode-for-vms.adoc
+// * virt/virtual_machines/advanced_vm_management/virt-uefi-mode-for-vms.adoc
 
 :_content-type: PROCEDURE
-[id="virt-booting-vms-efi-mode_{context}"]
-= Booting virtual machines in EFI mode
+[id="virt-booting-vms-uefi-mode_{context}"]
+= Booting virtual machines in UEFI mode
 
-You can configure a virtual machine to boot in EFI mode by editing the VM manifest.
+You can configure a virtual machine to boot in UEFI mode by editing the `VirtualMachine` manifest.
 
 .Prerequisites
 
@@ -14,9 +14,9 @@ You can configure a virtual machine to boot in EFI mode by editing the VM manife
 
 .Procedure
 
-. Create a YAML file that defines a VM object. Use the firmware stanza of the example YAML file:
+. Edit or create a `VirtualMachine` manifest file. Use the `spec.firmware.bootloader` stanza to configure UEFI mode:
 +
-.Booting in EFI mode with secure boot active
+.Booting in UEFI mode with secure boot active
 [source,yaml]
 ----
 apiversion: kubevirt.io/v1
@@ -45,10 +45,10 @@ spec:
           bootloader:
             efi:
               secureBoot: true <2>
-#...
+...
 ----
-<1> {VirtProductName} requires System Management Mode (`SMM`) to be enabled for Secure Boot in EFI mode to occur.
-<2> {VirtProductName} supports a VM with or without Secure Boot when using EFI mode. If Secure Boot is enabled, then EFI mode is required. However, EFI mode can be enabled without using Secure Boot.
+<1> {VirtProductName} requires System Management Mode (`SMM`) to be enabled for Secure Boot in UEFI mode to occur.
+<2> {VirtProductName} supports a VM with or without Secure Boot when using UEFI mode. If Secure Boot is enabled, then UEFI mode is required. However, UEFI mode can be enabled without using Secure Boot.
 
 . Apply the manifest to your cluster by running the following command:
 +
diff --git a/virt/virtual_machines/advanced_vm_management/virt-efi-mode-for-vms.adoc b/virt/virtual_machines/advanced_vm_management/virt-efi-mode-for-vms.adoc
deleted file mode 100644
index 248400eafe..0000000000
--- a/virt/virtual_machines/advanced_vm_management/virt-efi-mode-for-vms.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-:_content-type: ASSEMBLY
-[id="virt-efi-mode-for-vms"]
-= Using EFI mode for virtual machines
-include::_attributes/common-attributes.adoc[]
-:context: virt-efi-mode-for-vms
-
-toc::[]
-
-You can boot a virtual machine (VM) in Extensible Firmware Interface (EFI) mode.
-
-include::modules/virt-about-efi-mode-for-vms.adoc[leveloffset=+1]
-include::modules/virt-booting-vms-efi-mode.adoc[leveloffset=+1]
diff --git a/virt/virtual_machines/advanced_vm_management/virt-uefi-mode-for-vms.adoc b/virt/virtual_machines/advanced_vm_management/virt-uefi-mode-for-vms.adoc
new file mode 100644
index 0000000000..1569301a30
--- /dev/null
+++ b/virt/virtual_machines/advanced_vm_management/virt-uefi-mode-for-vms.adoc
@@ -0,0 +1,12 @@
+:_content-type: ASSEMBLY
+[id="virt-uefi-mode-for-vms"]
+= Using UEFI mode for virtual machines
+include::_attributes/common-attributes.adoc[]
+:context: virt-uefi-mode-for-vms
+
+toc::[]
+
+You can boot a virtual machine (VM) in Unified Extensible Firmware Interface (UEFI) mode.
+
+include::modules/virt-about-uefi-mode-for-vms.adoc[leveloffset=+1]
+include::modules/virt-booting-vms-uefi-mode.adoc[leveloffset=+1]