diff --git a/src/keel/media.cpp b/src/keel/media.cpp
index 9cc81be8..ca56ec61 100644
--- a/src/keel/media.cpp
+++ b/src/keel/media.cpp
@@ -95,8 +95,8 @@ ox::Error buildUuidMap(Context*) noexcept {
 ox::Result<char*> loadRom(ox::CRStringView) noexcept {
 	// put the header in the wrong order to prevent mistaking this code for the
 	// media section
-	constexpr auto headerP2 = "HEADER__________";
-	constexpr auto headerP1 = "NOSTALGIA_MEDIA_";
+	constexpr auto headerP2 = "R_______________";
+	constexpr auto headerP1 = "KEEL_MEDIA_HEADE";
 	constexpr auto headerP1Len = ox_strlen(headerP2);
 	constexpr auto headerP2Len = ox_strlen(headerP1);
 	constexpr auto headerLen = headerP1Len + headerP2Len;
diff --git a/src/keel/pack.cpp b/src/keel/pack.cpp
index 8b370070..252a0dad 100644
--- a/src/keel/pack.cpp
+++ b/src/keel/pack.cpp
@@ -213,8 +213,8 @@ static ox::Error padbin(ox::BufferWriter *w, unsigned factor) noexcept {
 }
 
 ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept {
-	constexpr ox::StringView mediaHdr   = "NOSTALGIA_MEDIA_HEADER__________";
-	constexpr ox::StringView preloadHdr = "NOSTALGIA_PRELOAD_HEADER________";
+	constexpr ox::StringView mediaHdr   = "KEEL_MEDIA_HEADER_______________";
+	constexpr ox::StringView preloadHdr = "KEEL_PRELOAD_HEADER_____________";
 	constexpr auto hdrSize = 32u;
 	static_assert(mediaHdr.bytes() == hdrSize);
 	static_assert(preloadHdr.bytes() == hdrSize);
diff --git a/src/keel/pack.hpp b/src/keel/pack.hpp
index d6bc4427..e3d21dc0 100644
--- a/src/keel/pack.hpp
+++ b/src/keel/pack.hpp
@@ -80,6 +80,6 @@ ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl
 
 ox::Error pack(keel::Context *ctx, ox::TypeStore *ts, ox::FileSystem *dest) noexcept;
 
-ox::Error preload(ox::TypeStore *ts, ox::FileSystem *src, GbaPreloader *ph) noexcept;
+ox::Error preload(ox::TypeStore *ts, ox::FileSystem *src, GbaPreloader *pl) noexcept;
 
 }
diff --git a/src/nostalgia/core/gba/core.cpp b/src/nostalgia/core/gba/core.cpp
index 91dacf9a..cb429a23 100644
--- a/src/nostalgia/core/gba/core.cpp
+++ b/src/nostalgia/core/gba/core.cpp
@@ -40,8 +40,8 @@ static void initTimer() noexcept {
 static ox::Result<std::size_t> findPreloadSection() noexcept {
 	// put the header in the wrong order to prevent mistaking this code for the
 	// media section
-	constexpr auto headerP2 = "D_HEADER________";
-	constexpr auto headerP1 = "NOSTALGIA_PRELOA";
+	constexpr auto headerP2 = "DER_____________";
+	constexpr auto headerP1 = "KEEL_PRELOAD_HEA";
 	constexpr auto headerP1Len = ox_strlen(headerP2);
 	constexpr auto headerP2Len = ox_strlen(headerP1);
 	constexpr auto headerLen = headerP1Len + headerP2Len;