diff --git a/src/config.h b/src/config.h
index a219d645..3748a4c0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -116,7 +116,7 @@
  * Command-line commands to include
  *
  */
-#define	BOOT_CMD		/* Automatic booting */
+#define	AUTOBOOT_CMD		/* Automatic booting */
 #define	NVO_CMD			/* Non-volatile option storage commands */
 #define	CONFIG_CMD		/* Option configuration console */
 #define	IFMGMT_CMD		/* Interface management commands */
diff --git a/src/core/config.c b/src/core/config.c
index b27ad6c1..31ae8d5a 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -145,8 +145,8 @@ REQUIRE_OBJECT ( script );
  * Drag in all requested commands
  *
  */
-#ifdef BOOT_CMD
-REQUIRE_OBJECT ( boot_cmd );
+#ifdef AUTOBOOT_CMD
+REQUIRE_OBJECT ( autoboot_cmd );
 #endif
 #ifdef NVO_CMD
 REQUIRE_OBJECT ( nvo_cmd );
diff --git a/src/hci/commands/boot_cmd.c b/src/hci/commands/autoboot_cmd.c
similarity index 66%
rename from src/hci/commands/boot_cmd.c
rename to src/hci/commands/autoboot_cmd.c
index fd8cba74..d7fb2e1f 100644
--- a/src/hci/commands/boot_cmd.c
+++ b/src/hci/commands/autoboot_cmd.c
@@ -2,7 +2,7 @@
 #include <gpxe/command.h>
 #include <usr/autoboot.h>
 
-static int boot_exec ( int argc, char **argv ) {
+static int autoboot_exec ( int argc, char **argv ) {
 
 	if ( argc != 1 ) {
 		printf ( "Usage:\n"
@@ -19,7 +19,7 @@ static int boot_exec ( int argc, char **argv ) {
 	return 1;
 }
 
-struct command boot_command __command = {
-	.name = "boot",
-	.exec = boot_exec,
+struct command autoboot_command __command = {
+	.name = "autoboot",
+	.exec = autoboot_exec,
 };