diff --git a/README.md b/README.md
index 315652e81af..c6338cf7781 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ For Broadcom ASIC, we build ONIE and EOS image. EOS image is used for Arista dev
     # build ONIE image
     make target/sonic-broadcom.bin
     # build EOS image
-    make target/sonic-aboot-broadcom.swi
+    make target/sonic-broadcom.swi
 
 You may find the rules/config file useful. It contains configuration options for the build process, like adding more verbosity or showing dependencies, username and password for base image etc.
 
diff --git a/onie-image.conf b/onie-image.conf
index db99c867de0..30cee54ee00 100644
--- a/onie-image.conf
+++ b/onie-image.conf
@@ -43,7 +43,7 @@ OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE.img
 KVM_IMAGE_DISK_SIZE=16
 
 ## Output file name for aboot installer
-OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE.swi
+OUTPUT_ABOOT_IMAGE=target/sonic-$TARGET_MACHINE.swi
 
 ## Aboot boot image name
 ABOOT_BOOT_IMAGE=.sonic-boot.swi
diff --git a/platform/barefoot/one-aboot.mk b/platform/barefoot/one-aboot.mk
index 4e5e808d2ab..f06c63474b0 100644
--- a/platform/barefoot/one-aboot.mk
+++ b/platform/barefoot/one-aboot.mk
@@ -1,6 +1,6 @@
 # sonic one aboot installer
 
-SONIC_ONE_ABOOT_IMAGE = sonic-aboot-barefoot.swi
+SONIC_ONE_ABOOT_IMAGE = sonic-barefoot.swi
 $(SONIC_ONE_ABOOT_IMAGE)_MACHINE = barefoot
 $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BFN_MODULE)
diff --git a/platform/broadcom/one-aboot.mk b/platform/broadcom/one-aboot.mk
index 66f3ca8797f..1fe88ff2630 100644
--- a/platform/broadcom/one-aboot.mk
+++ b/platform/broadcom/one-aboot.mk
@@ -1,6 +1,6 @@
 # sonic broadcom one image installer
 
-SONIC_ONE_ABOOT_IMAGE = sonic-aboot-broadcom.swi
+SONIC_ONE_ABOOT_IMAGE = sonic-broadcom.swi
 $(SONIC_ONE_ABOOT_IMAGE)_MACHINE = broadcom
 $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BRCM_OPENNSL_KERNEL) $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
diff --git a/platform/generic/aboot-image.mk b/platform/generic/aboot-image.mk
index c3f21b61625..33ea29b9f0a 100644
--- a/platform/generic/aboot-image.mk
+++ b/platform/generic/aboot-image.mk
@@ -1,6 +1,6 @@
 # sonic aboot installer
 
-SONIC_GENERIC_ABOOT_IMAGE = sonic-aboot-generic.swi
+SONIC_GENERIC_ABOOT_IMAGE = sonic-generic.swi
 $(SONIC_GENERIC_ABOOT_IMAGE)_MACHINE = generic
 $(SONIC_GENERIC_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_GENERIC_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)