diff --git a/src/arch/i386/scripts/efi.lds b/src/arch/i386/scripts/efi.lds
index 7d3281cc..357769e0 100644
--- a/src/arch/i386/scripts/efi.lds
+++ b/src/arch/i386/scripts/efi.lds
@@ -28,7 +28,7 @@ SECTIONS {
 	*(.prefix)
 	*(.prefix.*)
 	_mprefix = .;
-    } .prefix_bss (NOLOAD) : {
+    } .bss.prefix (NOLOAD) : {
 	_eprefix = .;
     }
     _prefix_filesz	= ABSOLUTE ( _mprefix - _prefix );
@@ -45,7 +45,7 @@ SECTIONS {
 	*(.text)
 	*(.text.*)
 	_mtext = .;
-    } .text_bss (NOLOAD) : {
+    } .bss.text (NOLOAD) : {
 	_etext = .;
     }
     _text_filesz	= ABSOLUTE ( _mtext - _text );
@@ -62,7 +62,7 @@ SECTIONS {
 	*(.rodata)
 	*(.rodata.*)
 	_mrodata = .;
-    } .rodata_bss (NOLOAD) : {
+    } .bss.rodata (NOLOAD) : {
 	_erodata = .;
     }
     _rodata_filesz	= ABSOLUTE ( _mrodata - _rodata );
@@ -86,7 +86,7 @@ SECTIONS {
 	*(.stack)
 	*(.stack.*)
 	_mdata = .;
-    } .data_bss (NOLOAD) : {
+    } .bss.data (NOLOAD) : {
 	_edata = .;
     }
     _data_filesz	= ABSOLUTE ( _mdata - _data );
@@ -102,7 +102,7 @@ SECTIONS {
 	_bss = .;
 	/* EFI seems to not support proper bss sections */
 	_mbss = .;
-    } .bss_bss (NOLOAD) : {
+    } .bss.bss (NOLOAD) : {
 	_ebss = .;
     }
     _bss_filesz		= ABSOLUTE ( _mbss - _bss );
@@ -121,7 +121,7 @@ SECTIONS {
 	 */
 	. += 1;
 	_mreloc = .;
-    } .reloc_bss (NOLOAD) : {
+    } .bss.reloc (NOLOAD) : {
 	_ereloc = .;
     }
     _reloc_filesz	= ABSOLUTE ( _mreloc - _reloc );
diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds
index 575cb881..985a9b00 100644
--- a/src/arch/i386/scripts/i386.lds
+++ b/src/arch/i386/scripts/i386.lds
@@ -34,7 +34,7 @@ SECTIONS {
 	*(.prefix)
 	*(.prefix.*)
 	_mprefix = .;
-    } .prefix_bss (NOLOAD) : AT ( _end_lma ) {
+    } .bss.prefix (NOLOAD) : AT ( _end_lma ) {
 	_eprefix = .;
     }
     _prefix_filesz	= ABSOLUTE ( _mprefix - _prefix );
@@ -52,7 +52,7 @@ SECTIONS {
 	*(.text16)
 	*(.text16.*)
 	_mtext16 = .;
-    } .text16_bss (NOLOAD) : AT ( _end_lma ) {
+    } .bss.text16 (NOLOAD) : AT ( _end_lma ) {
 	_etext16 = .;
     }
     _text16_filesz	= ABSOLUTE ( _mtext16 - _text16 );
@@ -71,7 +71,7 @@ SECTIONS {
 	*(.data16)
 	*(.data16.*)
 	_mdata16 = .;
-    } .data16_bss (NOLOAD) : AT ( _end_lma ) {
+    } .bss.data16 (NOLOAD) : AT ( _end_lma ) {
 	*(.bss16)
 	*(.bss16.*)
 	*(.stack16)
@@ -98,7 +98,7 @@ SECTIONS {
 	*(.data.*)
 	*(SORT(.tbl.*))		/* Various tables.  See include/tables.h */
 	_mtextdata = .;
-    } .textdata_bss (NOLOAD) : AT ( _end_lma ) {
+    } .bss.textdata (NOLOAD) : AT ( _end_lma ) {
 	*(.bss)
 	*(.bss.*)
 	*(COMMON)
@@ -119,7 +119,7 @@ SECTIONS {
 	*(.zinfo)
 	*(.zinfo.*)
 	_mzinfo = .;
-    } .zinfo_bss (NOLOAD) : AT ( _end_lma ) {
+    } .bss.zinfo (NOLOAD) : AT ( _end_lma ) {
 	_ezinfo = .;
     }
     _zinfo_filesz	= ABSOLUTE ( _mzinfo - _zinfo );