5 files changed, 18 insertions, 18 deletions
diff --git a/src/image/efi_image.c b/src/image/efi_image.c
index 60d150a..6eb943b 100644
--- a/src/image/efi_image.c
+++ b/src/image/efi_image.c
@@ -19,9 +19,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/image.h>
-#include <gpxe/features.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/image.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "EFI", DHCP_EB_FEATURE_EFI, 1 );
 
diff --git a/src/image/elf.c b/src/image/elf.c
index a0ec065..740fd3a 100644
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -30,10 +30,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
 #include <elf.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/segment.h>
-#include <gpxe/image.h>
-#include <gpxe/elf.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/segment.h>
+#include <ipxe/image.h>
+#include <ipxe/elf.h>
 
 typedef Elf32_Ehdr	Elf_Ehdr;
 typedef Elf32_Phdr	Elf_Phdr;
diff --git a/src/image/embedded.c b/src/image/embedded.c
index 58a14ea..b3ed8cc 100644
--- a/src/image/embedded.c
+++ b/src/image/embedded.c
@@ -2,16 +2,16 @@
  *
  * Embedded image support
  *
- * Embedded images are images built into the gPXE binary and do not require
+ * Embedded images are images built into the iPXE binary and do not require
  * fetching over the network.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/image.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/init.h>
+#include <ipxe/image.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/init.h>
 
 /**
  * Free embedded image
diff --git a/src/image/script.c b/src/image/script.c
index 0835ecb..61f5a99 100644
--- a/src/image/script.c
+++ b/src/image/script.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /**
  * @file
  *
- * gPXE scripts
+ * iPXE scripts
  *
  */
 
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <gpxe/image.h>
+#include <ipxe/image.h>
 
 struct image_type script_image_type __image_type ( PROBE_NORMAL );
 
@@ -91,7 +91,7 @@ static int script_exec ( struct image *image ) {
  * @ret rc		Return status code
  */
 static int script_load ( struct image *image ) {
-	static const char magic[] = "#!gpxe";
+	static const char magic[] = "#!ipxe";
 	char test[ sizeof ( magic ) - 1 /* NUL */ + 1 /* terminating space */];
 
 	/* Sanity check */
diff --git a/src/image/segment.c b/src/image/segment.c
index e247453..9099c8f 100644
--- a/src/image/segment.c
+++ b/src/image/segment.c
@@ -26,10 +26,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <errno.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/memmap.h>
-#include <gpxe/errortab.h>
-#include <gpxe/segment.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/memmap.h>
+#include <ipxe/errortab.h>
+#include <ipxe/segment.h>
 
 /**
  * Prepare segment for loading