diff --git a/src/arch/x86/rom_media.c b/src/arch/x86/rom_media.c
index 446ba96..d615d18 100644
--- a/src/arch/x86/rom_media.c
+++ b/src/arch/x86/rom_media.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 
 // Implementation of memory-mapped ROM media source on X86.
 static int x86_rom_open(struct cbfs_media *media) {
diff --git a/src/base/Makefile.inc b/src/base/Makefile.inc
index 70a3bc0..748176f 100644
--- a/src/base/Makefile.inc
+++ b/src/base/Makefile.inc
@@ -15,7 +15,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-subdirs-y += cbfs graphics libc lz4 lzma
+subdirs-y += coreboot graphics libc lz4 lzma
 
 depthcharge-y += banner.c
 depthcharge-y += cleanup.c
@@ -34,6 +34,5 @@
 depthcharge-y += queue.c
 depthcharge-y += ranges.c
 depthcharge-y += state_machine.c
-depthcharge-y += sysinfo.c
 depthcharge-y += time.c
 depthcharge-y += timestamp.c
diff --git a/src/base/cbfs/Makefile.inc b/src/base/coreboot/Makefile.inc
similarity index 97%
rename from src/base/cbfs/Makefile.inc
rename to src/base/coreboot/Makefile.inc
index fe02a12..76cc7a1 100644
--- a/src/base/cbfs/Makefile.inc
+++ b/src/base/coreboot/Makefile.inc
@@ -27,3 +27,4 @@
 
 depthcharge-y += cbfs.c
 depthcharge-y += ram_media.c
+depthcharge-y += sysinfo.c
diff --git a/src/base/cbfs/cbfs.c b/src/base/coreboot/cbfs.c
similarity index 99%
rename from src/base/cbfs/cbfs.c
rename to src/base/coreboot/cbfs.c
index 5f7024d..d166a8c 100644
--- a/src/base/cbfs/cbfs.c
+++ b/src/base/coreboot/cbfs.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sysinfo.h>
 
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 #include "base/lzma/lzma.h"
 
 #define DEBUG(x...)
diff --git a/src/base/cbfs/cbfs.h b/src/base/coreboot/cbfs.h
similarity index 100%
rename from src/base/cbfs/cbfs.h
rename to src/base/coreboot/cbfs.h
diff --git a/src/base/cbfs/ram_media.c b/src/base/coreboot/ram_media.c
similarity index 97%
rename from src/base/cbfs/ram_media.c
rename to src/base/coreboot/ram_media.c
index 636b884..daa0abb 100644
--- a/src/base/cbfs/ram_media.c
+++ b/src/base/coreboot/ram_media.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "base/cbfs/cbfs.h"
-#include "base/cbfs/ram_media.h"
+#include "base/coreboot/cbfs.h"
+#include "base/coreboot/ram_media.h"
 
 // Implementation of a media source based on given memory buffer.
 struct ram_media
diff --git a/src/base/cbfs/ram_media.h b/src/base/coreboot/ram_media.h
similarity index 100%
rename from src/base/cbfs/ram_media.h
rename to src/base/coreboot/ram_media.h
diff --git a/src/base/sysinfo.c b/src/base/coreboot/sysinfo.c
similarity index 100%
rename from src/base/sysinfo.c
rename to src/base/coreboot/sysinfo.c
diff --git a/src/drivers/layout/coreboot.c b/src/drivers/layout/coreboot.c
index dfb9862..edf82c5 100644
--- a/src/drivers/layout/coreboot.c
+++ b/src/drivers/layout/coreboot.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "base/algorithm.h"
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 #include "base/die.h"
 #include "base/xalloc.h"
 #include "drivers/board/board_helpers.h"
diff --git a/src/drivers/storage/cbfs.c b/src/drivers/storage/cbfs.c
index 5f5a985..7811a3c 100644
--- a/src/drivers/storage/cbfs.c
+++ b/src/drivers/storage/cbfs.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 #include "base/container_of.h"
 #include "base/xalloc.h"
 #include "drivers/storage/cbfs.h"
diff --git a/src/libpayload/drivers/video/graphics.c b/src/libpayload/drivers/video/graphics.c
index 4836a8c..7968383 100644
--- a/src/libpayload/drivers/video/graphics.c
+++ b/src/libpayload/drivers/video/graphics.c
@@ -30,7 +30,7 @@
 #include <sysinfo.h>
 #include "bitmap.h"
 
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 
 /*
  * 'canvas' is the drawing area located in the center of the screen. It's a
diff --git a/src/vboot/callbacks/legacy.c b/src/vboot/callbacks/legacy.c
index 312c99b..7af3f53 100644
--- a/src/vboot/callbacks/legacy.c
+++ b/src/vboot/callbacks/legacy.c
@@ -26,8 +26,8 @@
 #include <vboot_api.h>
 
 #include "arch/cache.h"
-#include "base/cbfs/cbfs.h"
-#include "base/cbfs/ram_media.h"
+#include "base/coreboot/cbfs.h"
+#include "base/coreboot/ram_media.h"
 #include "base/cleanup.h"
 #include "base/lzma/lzma.h"
 #include "base/xalloc.h"
diff --git a/src/vboot/screens.c b/src/vboot/screens.c
index 18dc6c7..42868aa 100644
--- a/src/vboot/screens.c
+++ b/src/vboot/screens.c
@@ -26,7 +26,7 @@
 #include <vboot/screens.h>
 
 #include "base/algorithm.h"
-#include "base/cbfs/cbfs.h"
+#include "base/coreboot/cbfs.h"
 #include "base/graphics.h"
 #include "drivers/video/display.h"
 #include "vboot/util/gbb.h"