diff --git a/src/stub/Makefile b/src/stub/Makefile
index 173a4e59..41541177 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -9,8 +9,8 @@
 MAKEFLAGS += -rR
 .SUFFIXES:
 .SECONDEXPANSION:
-export SHELL = /bin/sh
 export LC_ALL = C
+export SHELL = /bin/sh
 
 # internal make variables
 comma := ,
@@ -160,7 +160,7 @@ define tc
 endef
 
 # default tools
-tc.default.bin2h      = python $(top_srcdir)/src/stub/scripts/bin2h.py
+tc.default.bin2h      = python $(top_srcdir)/src/stub/scripts/bin2h.py --ident=auto-stub
 tc.default.brandelf   = python $(top_srcdir)/src/stub/scripts/brandelf.py $(if $(tc_bfdname),--bfdname=$(tc_bfdname))
 tc.default.gpp_inc    = python $(top_srcdir)/src/stub/scripts/gpp_inc.py
 tc.default.gpp_mkdep  = python $(top_srcdir)/src/stub/scripts/gpp_inc.py -o /dev/null
@@ -216,13 +216,13 @@ tc.amd64-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Wer
 amd64-linux.elf-entry.h: $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_elf64amd_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 amd64-linux.elf-fold.h : tmp/$$T.o tmp/amd64-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_elf64amd_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/amd64-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
@@ -247,13 +247,13 @@ tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werro
 arm-linux.elf-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -march=armv4 -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_elf32arm_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 arm-linux.elf-fold.h : tmp/$$T.o tmp/arm-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_elf32arm_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/arm-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
@@ -276,13 +276,13 @@ tc.armeb-linux.elf.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian
 armeb-linux.elf-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -march=armv4 -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_elf32armeb_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 armeb-linux.elf-fold.h : tmp/$$T.o tmp/armeb-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_elf32armeb_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/armeb-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
@@ -308,12 +308,12 @@ arm.v4t-wince.pe.h : tc_objdump_disasm_options = -M force-thumb
 arm.v4a-wince.pe.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -march=armv4 -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader_arm tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 arm.v4t-wince.pe.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -march=armv4t -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader_thumb tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -326,7 +326,7 @@ i086-dos16.com.h : tc_bfdarch = i8086
 i086-dos16.com.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -339,7 +339,7 @@ i086-dos16.exe.h : tc_bfdarch = i8086
 i086-dos16.exe.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -352,7 +352,7 @@ i086-dos16.sys.h : tc_bfdarch = i8086
 i086-dos16.sys.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -367,14 +367,14 @@ i386-bsd.elf%.h : tc_bfdname = elf32-i386
 i386-bsd.elf-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=bsd_i386elf_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-bsd.elf-fold.h : tmp/$$T.o tmp/i386-bsd.elf-main.o tmp/i386-bsd.syscall.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=freebsd tmp/$T.bin
-	$(call tc,bin2h) --ident=bsd_i386elf_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-bsd.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -400,7 +400,7 @@ i386-openbsd.elf-fold.h : tmp/$$T.o tmp/i386-openbsd.elf-main.o tmp/i386-bsd.sys
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=openbsd tmp/$T.bin
-	$(call tc,bin2h) --ident=openbsd_i386elf_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-openbsd.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -420,7 +420,7 @@ tmp/i386-openbsd.elf-main.o : $(srcdir)/src/$$T.c
 i386-bsd.elf.execve-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=bsd_i386exec_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 # Note the re-use of i386-linux.elf.execve-fold.lds as input (no separate i386-bsd.elf.execve-fold.lds).
 i386-bsd.elf.execve-fold.h : tmp/$$T.o tmp/i386-bsd.elf.execve-main.o tmp/i386-bsd.syscall.o tmp/i386-linux.elf.execve-upx_itoa.o $(srcdir)/src/i386-linux.elf.execve-fold.lds
@@ -428,7 +428,7 @@ i386-bsd.elf.execve-fold.h : tmp/$$T.o tmp/i386-bsd.elf.execve-main.o tmp/i386-b
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=freebsd tmp/$T.bin
-	$(call tc,bin2h) --ident=bsd_i386exec_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-bsd.elf.execve-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -452,12 +452,12 @@ i386-dos32.djgpp2% : tc_list = arch-i386 default
 i386-dos32.djgpp2.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-dos32.djgpp2-stubify.h : $(srcdir)/src/$$T.asm
 	$(call tc,djasm) --outtype=exe --gmtime=1070220810 --inname=stub.asm --outname=stub.h $< tmp/$T.bin
 	$(call tc,objdump) -b binary -m i8086 -D --start-address=0x254 tmp/$T.bin | $(RTRIM) > tmp/$T.bin.disasm
-	$(call tc,bin2h) --ident=stubify_stub -q tmp/$T.bin $@
+	$(call tc,bin2h) -q tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -469,7 +469,7 @@ i386-dos32.tmt.h : tc_list = arch-i386 default
 i386-dos32.tmt.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -481,7 +481,7 @@ i386-dos32.watcom.le.h : tc_list = arch-i386 default
 i386-dos32.watcom.le.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -504,14 +504,14 @@ tc.i386-linux.elf.gcc     += -fweb
 i386-linux.elf-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_i386elf_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-linux.elf-fold.h : tmp/$$T.o tmp/i386-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=linux tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_i386elf_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -531,14 +531,14 @@ tmp/i386-linux.elf-main.o : $(srcdir)/src/$$T.c
 i386-linux.elf.execve-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_i386exec_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-linux.elf.execve-fold.h : tmp/$$T.o tmp/i386-linux.elf.execve-main.o tmp/i386-linux.elf.execve-upx_itoa.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=linux tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_i386exec_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-linux.elf.execve-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -562,14 +562,14 @@ tmp/i386-linux.elf.execve-upx_itoa.o: $(srcdir)/src/$$T.S
 i386-linux.elf.interp-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_i386pti_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-linux.elf.interp-fold.h : tmp/$$T.o tmp/i386-linux.elf.interp-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=linux tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_i386pti_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-linux.elf.interp-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -589,14 +589,14 @@ tmp/i386-linux.elf.interp-main.o : $(srcdir)/src/$$T.c
 i386-linux.elf.shell-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_i386sh_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-linux.elf.shell-fold.h : tmp/$$T.o tmp/i386-linux.elf.shell-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,brandelf) --elfosabi=linux tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_i386sh_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/i386-linux.elf.shell-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
@@ -618,12 +618,12 @@ i386-linux.kernel.vmlinu%.h : tc_list = arch-i386 default
 i386-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 i386-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
 	$(call tc,objcopy) --output-target binary --only-section .text tmp/$T.o tmp/$T.bin
-	$(call tc,bin2h) --ident=head_stack tmp/$T.bin $@
+	$(call tc,bin2h) --compress=none tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -636,7 +636,7 @@ i386-win32.pe.h : tc_bfdname = elf32-i386
 i386-win32.pe.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -653,7 +653,7 @@ tc.m68k-atari.tos.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werr
 m68k-atari.tos.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp -Wa,-m68000,-l,--pcrel,--register-prefix-optional $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -680,7 +680,7 @@ else
 	$(call tc,gcc) -c -DPS1 -Wa,-O,-mno-pdr $< -o tmp/$T.bin
 endif
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=nrv_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 
 # /***********************************************************************
@@ -694,12 +694,12 @@ powerpc-darwin.macho%.h : tc_bfdname = elf32-powerpc
 powerpc-darwin.macho-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=l_mac_ppc32_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 powerpc-darwin.macho-fold.h : tmp/$$T.o tmp/powerpc-darwin.macho-main.o
 	$(call tc,ld) --no-warn-mismatch --strip-all --oformat binary -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	chmod a-x tmp/$T.bin
-	$(call tc,bin2h) --ident=fold_machppc32 tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/powerpc-darwin.macho-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
@@ -724,13 +724,13 @@ tc.powerpc-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -W
 powerpc-linux.elf-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h) --ident=linux_elfppc32_loader tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 powerpc-linux.elf-fold.h : tmp/$$T.o tmp/powerpc-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
-	$(call tc,bin2h) --ident=linux_elfppc32_fold tmp/$T.bin $@
+	$(call tc,bin2h) tmp/$T.bin $@
 
 tmp/powerpc-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
@@ -748,6 +748,7 @@ tmp/powerpc-linux.elf-main.o : $(srcdir)/src/$$T.c
 ifneq ($(strip $(STUBS)),)
 # FIXME: we want a dependency-only prerequisite here
 $(STUBS): tmp/.tmp-stamp $(MAKEFILE_LIST)
+$(STUBS): $(top_srcdir)/src/stub/scripts/bin2h.py
 endif
 -include tmp/*.d
 
diff --git a/src/stub/amd64-linux.elf-entry.h b/src/stub/amd64-linux.elf-entry.h
index 6586fa51..a75b7d44 100644
--- a/src/stub/amd64-linux.elf-entry.h
+++ b/src/stub/amd64-linux.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF64AMD_LOADER_SIZE    12687
-#define LINUX_ELF64AMD_LOADER_ADLER32 0xfad48a76
-#define LINUX_ELF64AMD_LOADER_CRC32   0x4e575312
+#define STUB_AMD64_LINUX_ELF_ENTRY_SIZE    12687
+#define STUB_AMD64_LINUX_ELF_ENTRY_ADLER32 0xfad48a76
+#define STUB_AMD64_LINUX_ELF_ENTRY_CRC32   0x4e575312
 
-unsigned char linux_elf64amd_loader[12687] = {
+unsigned char stub_amd64_linux_elf_entry[12687] = {
 127, 69, 76, 70,  2,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0, 62,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0,112, 24,  0,  0,  0,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/amd64-linux.elf-fold.h b/src/stub/amd64-linux.elf-fold.h
index 31d6423d..7324b653 100644
--- a/src/stub/amd64-linux.elf-fold.h
+++ b/src/stub/amd64-linux.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF64AMD_FOLD_SIZE    1775
-#define LINUX_ELF64AMD_FOLD_ADLER32 0x8871a9cc
-#define LINUX_ELF64AMD_FOLD_CRC32   0x5856b332
+#define STUB_AMD64_LINUX_ELF_FOLD_SIZE    1775
+#define STUB_AMD64_LINUX_ELF_FOLD_ADLER32 0x8871a9cc
+#define STUB_AMD64_LINUX_ELF_FOLD_CRC32   0x5856b332
 
-unsigned char linux_elf64amd_fold[1775] = {
+unsigned char stub_amd64_linux_elf_fold[1775] = {
 127, 69, 76, 70,  2,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0, 62,  0,  1,  0,  0,  0,188,  0, 16,  0,  0,  0,  0,  0,   /* 0x  10 */
  64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/arm-linux.elf-entry.h b/src/stub/arm-linux.elf-entry.h
index 2ae68806..13c64d6a 100644
--- a/src/stub/arm-linux.elf-entry.h
+++ b/src/stub/arm-linux.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF32ARM_LOADER_SIZE    19530
-#define LINUX_ELF32ARM_LOADER_ADLER32 0x3faa45c9
-#define LINUX_ELF32ARM_LOADER_CRC32   0x784aaa8d
+#define STUB_ARM_LINUX_ELF_ENTRY_SIZE    19530
+#define STUB_ARM_LINUX_ELF_ENTRY_ADLER32 0x3faa45c9
+#define STUB_ARM_LINUX_ELF_ENTRY_CRC32   0x784aaa8d
 
-unsigned char linux_elf32arm_loader[19530] = {
+unsigned char stub_arm_linux_elf_entry[19530] = {
 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0, 40,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 244, 23,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/arm-linux.elf-fold.h b/src/stub/arm-linux.elf-fold.h
index edda58f8..a2c82360 100644
--- a/src/stub/arm-linux.elf-fold.h
+++ b/src/stub/arm-linux.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF32ARM_FOLD_SIZE    2108
-#define LINUX_ELF32ARM_FOLD_ADLER32 0x3e40608e
-#define LINUX_ELF32ARM_FOLD_CRC32   0xb5be5c29
+#define STUB_ARM_LINUX_ELF_FOLD_SIZE    2108
+#define STUB_ARM_LINUX_ELF_FOLD_ADLER32 0x3e40608e
+#define STUB_ARM_LINUX_ELF_FOLD_CRC32   0xb5be5c29
 
-unsigned char linux_elf32arm_fold[2108] = {
+unsigned char stub_arm_linux_elf_fold[2108] = {
 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0, 40,  0,  1,  0,  0,  0,128,128,  0,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  2,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/arm.v4a-wince.pe.h b/src/stub/arm.v4a-wince.pe.h
index 6ccbff07..4e168bcf 100644
--- a/src/stub/arm.v4a-wince.pe.h
+++ b/src/stub/arm.v4a-wince.pe.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_ARM_SIZE    19616
-#define NRV_LOADER_ARM_ADLER32 0x7695b978
-#define NRV_LOADER_ARM_CRC32   0xa5f1be3e
+#define STUB_ARM_V4A_WINCE_PE_SIZE    19616
+#define STUB_ARM_V4A_WINCE_PE_ADLER32 0x7695b978
+#define STUB_ARM_V4A_WINCE_PE_CRC32   0xa5f1be3e
 
-unsigned char nrv_loader_arm[19616] = {
+unsigned char stub_arm_v4a_wince_pe[19616] = {
 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0, 40,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 156, 15,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/arm.v4t-wince.pe.h b/src/stub/arm.v4t-wince.pe.h
index 853c89c6..1cd47d59 100644
--- a/src/stub/arm.v4t-wince.pe.h
+++ b/src/stub/arm.v4t-wince.pe.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_THUMB_SIZE    9992
-#define NRV_LOADER_THUMB_ADLER32 0xfeadf935
-#define NRV_LOADER_THUMB_CRC32   0x7cc8eae9
+#define STUB_ARM_V4T_WINCE_PE_SIZE    9992
+#define STUB_ARM_V4T_WINCE_PE_ADLER32 0xfeadf935
+#define STUB_ARM_V4T_WINCE_PE_CRC32   0x7cc8eae9
 
-unsigned char nrv_loader_thumb[9992] = {
+unsigned char stub_arm_v4t_wince_pe[9992] = {
 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0, 40,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 132, 11,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/armeb-linux.elf-entry.h b/src/stub/armeb-linux.elf-entry.h
index dd236dd1..7e3c6c14 100644
--- a/src/stub/armeb-linux.elf-entry.h
+++ b/src/stub/armeb-linux.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF32ARMEB_LOADER_SIZE    19529
-#define LINUX_ELF32ARMEB_LOADER_ADLER32 0xa7d64535
-#define LINUX_ELF32ARMEB_LOADER_CRC32   0x70f522be
+#define STUB_ARMEB_LINUX_ELF_ENTRY_SIZE    19529
+#define STUB_ARMEB_LINUX_ELF_ENTRY_ADLER32 0xa7d64535
+#define STUB_ARMEB_LINUX_ELF_ENTRY_CRC32   0x70f522be
 
-unsigned char linux_elf32armeb_loader[19529] = {
+unsigned char stub_armeb_linux_elf_entry[19529] = {
 127, 69, 76, 70,  1,  2,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  1,  0, 40,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0, 23,244,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,   /* 0x  20 */
diff --git a/src/stub/armeb-linux.elf-fold.h b/src/stub/armeb-linux.elf-fold.h
index e8ef2e33..3a724239 100644
--- a/src/stub/armeb-linux.elf-fold.h
+++ b/src/stub/armeb-linux.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELF32ARMEB_FOLD_SIZE    2108
-#define LINUX_ELF32ARMEB_FOLD_ADLER32 0x65a66090
-#define LINUX_ELF32ARMEB_FOLD_CRC32   0xdee2e92e
+#define STUB_ARMEB_LINUX_ELF_FOLD_SIZE    2108
+#define STUB_ARMEB_LINUX_ELF_FOLD_ADLER32 0x65a66090
+#define STUB_ARMEB_LINUX_ELF_FOLD_CRC32   0xdee2e92e
 
-unsigned char linux_elf32armeb_fold[2108] = {
+unsigned char stub_armeb_linux_elf_fold[2108] = {
 127, 69, 76, 70,  1,  2,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  2,  0, 40,  0,  0,  0,  1,  0,  0,128,128,  0,  0,  0, 52,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  2,  0, 52,  0, 32,  0,  2,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i086-dos16.com.h b/src/stub/i086-dos16.com.h
index d46cadc4..2026dfae 100644
--- a/src/stub/i086-dos16.com.h
+++ b/src/stub/i086-dos16.com.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV2B_LOADER_SIZE    9078
-#define NRV2B_LOADER_ADLER32 0x2d8ff59a
-#define NRV2B_LOADER_CRC32   0x56792cc8
+#define STUB_I086_DOS16_COM_SIZE    9078
+#define STUB_I086_DOS16_COM_ADLER32 0x2d8ff59a
+#define STUB_I086_DOS16_COM_CRC32   0x56792cc8
 
-unsigned char nrv2b_loader[9078] = {
+unsigned char stub_i086_dos16_com[9078] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  72,  2,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i086-dos16.exe.h b/src/stub/i086-dos16.exe.h
index a239d841..be67da12 100644
--- a/src/stub/i086-dos16.exe.h
+++ b/src/stub/i086-dos16.exe.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    19030
-#define NRV_LOADER_ADLER32 0x34b52b4b
-#define NRV_LOADER_CRC32   0x49113ddc
+#define STUB_I086_DOS16_EXE_SIZE    19030
+#define STUB_I086_DOS16_EXE_ADLER32 0x34b52b4b
+#define STUB_I086_DOS16_EXE_CRC32   0x49113ddc
 
-unsigned char nrv_loader[19030] = {
+unsigned char stub_i086_dos16_exe[19030] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 152,  5,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i086-dos16.sys.h b/src/stub/i086-dos16.sys.h
index ee5ce29e..7996a02c 100644
--- a/src/stub/i086-dos16.sys.h
+++ b/src/stub/i086-dos16.sys.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV2B_LOADER_SIZE    10474
-#define NRV2B_LOADER_ADLER32 0x2b62e547
-#define NRV2B_LOADER_CRC32   0xf800e9e1
+#define STUB_I086_DOS16_SYS_SIZE    10474
+#define STUB_I086_DOS16_SYS_ADLER32 0x2b62e547
+#define STUB_I086_DOS16_SYS_CRC32   0xf800e9e1
 
-unsigned char nrv2b_loader[10474] = {
+unsigned char stub_i086_dos16_sys[10474] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 148,  2,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-bsd.elf-entry.h b/src/stub/i386-bsd.elf-entry.h
index 69b593a6..dfd5083c 100644
--- a/src/stub/i386-bsd.elf-entry.h
+++ b/src/stub/i386-bsd.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define BSD_I386ELF_LOADER_SIZE    52750
-#define BSD_I386ELF_LOADER_ADLER32 0x275072d6
-#define BSD_I386ELF_LOADER_CRC32   0xc0d1d060
+#define STUB_I386_BSD_ELF_ENTRY_SIZE    52750
+#define STUB_I386_BSD_ELF_ENTRY_ADLER32 0x275072d6
+#define STUB_I386_BSD_ELF_ENTRY_CRC32   0xc0d1d060
 
-unsigned char bsd_i386elf_loader[52750] = {
+unsigned char stub_i386_bsd_elf_entry[52750] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 108, 34,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-bsd.elf-fold.h b/src/stub/i386-bsd.elf-fold.h
index a6c96a21..21e76d20 100644
--- a/src/stub/i386-bsd.elf-fold.h
+++ b/src/stub/i386-bsd.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define BSD_I386ELF_FOLD_SIZE    1789
-#define BSD_I386ELF_FOLD_ADLER32 0x627bfe0b
-#define BSD_I386ELF_FOLD_CRC32   0x9ea4486f
+#define STUB_I386_BSD_ELF_FOLD_SIZE    1789
+#define STUB_I386_BSD_ELF_FOLD_ADLER32 0x627bfe0b
+#define STUB_I386_BSD_ELF_FOLD_CRC32   0x9ea4486f
 
-unsigned char bsd_i386elf_fold[1789] = {
+unsigned char stub_i386_bsd_elf_fold[1789] = {
 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-bsd.elf.execve-entry.h b/src/stub/i386-bsd.elf.execve-entry.h
index 782780ef..e0de18ee 100644
--- a/src/stub/i386-bsd.elf.execve-entry.h
+++ b/src/stub/i386-bsd.elf.execve-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define BSD_I386EXEC_LOADER_SIZE    53357
-#define BSD_I386EXEC_LOADER_ADLER32 0x5aabc0d3
-#define BSD_I386EXEC_LOADER_CRC32   0x87a94662
+#define STUB_I386_BSD_ELF_EXECVE_ENTRY_SIZE    53357
+#define STUB_I386_BSD_ELF_EXECVE_ENTRY_ADLER32 0x5aabc0d3
+#define STUB_I386_BSD_ELF_EXECVE_ENTRY_CRC32   0x87a94662
 
-unsigned char bsd_i386exec_loader[53357] = {
+unsigned char stub_i386_bsd_elf_execve_entry[53357] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  24, 34,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-bsd.elf.execve-fold.h b/src/stub/i386-bsd.elf.execve-fold.h
index 124f1b4f..033a3834 100644
--- a/src/stub/i386-bsd.elf.execve-fold.h
+++ b/src/stub/i386-bsd.elf.execve-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define BSD_I386EXEC_FOLD_SIZE    1031
-#define BSD_I386EXEC_FOLD_ADLER32 0x73c799a0
-#define BSD_I386EXEC_FOLD_CRC32   0xef2fbdb2
+#define STUB_I386_BSD_ELF_EXECVE_FOLD_SIZE    1031
+#define STUB_I386_BSD_ELF_EXECVE_FOLD_ADLER32 0x73c799a0
+#define STUB_I386_BSD_ELF_EXECVE_FOLD_CRC32   0xef2fbdb2
 
-unsigned char bsd_i386exec_fold[1031] = {
+unsigned char stub_i386_bsd_elf_execve_fold[1031] = {
 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-dos32.djgpp2-stubify.h b/src/stub/i386-dos32.djgpp2-stubify.h
index 3b904853..55721c6b 100644
--- a/src/stub/i386-dos32.djgpp2-stubify.h
+++ b/src/stub/i386-dos32.djgpp2-stubify.h
@@ -1,8 +1,8 @@
-#define STUBIFY_STUB_SIZE    2048
-#define STUBIFY_STUB_ADLER32 0xbf689ba8
-#define STUBIFY_STUB_CRC32   0x2ae982b2
+#define STUB_I386_DOS32_DJGPP2_STUBIFY_SIZE    2048
+#define STUB_I386_DOS32_DJGPP2_STUBIFY_ADLER32 0xbf689ba8
+#define STUB_I386_DOS32_DJGPP2_STUBIFY_CRC32   0x2ae982b2
 
-unsigned char stubify_stub[2048] = {
+unsigned char stub_i386_dos32_djgpp2_stubify[2048] = {
  77, 90,  0,  0,  4,  0,  0,  0, 32,  0, 39,  0,255,255,  0,  0,   /* 0x   0 */
  96,  7,  0,  0, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-dos32.djgpp2.h b/src/stub/i386-dos32.djgpp2.h
index 8cf3cd88..6114a0f5 100644
--- a/src/stub/i386-dos32.djgpp2.h
+++ b/src/stub/i386-dos32.djgpp2.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    33548
-#define NRV_LOADER_ADLER32 0xa9e9bdee
-#define NRV_LOADER_CRC32   0x06765d67
+#define STUB_I386_DOS32_DJGPP2_SIZE    33548
+#define STUB_I386_DOS32_DJGPP2_ADLER32 0xa9e9bdee
+#define STUB_I386_DOS32_DJGPP2_CRC32   0x06765d67
 
-unsigned char nrv_loader[33548] = {
+unsigned char stub_i386_dos32_djgpp2[33548] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 136, 29,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-dos32.tmt.h b/src/stub/i386-dos32.tmt.h
index acdc8b59..358d0c03 100644
--- a/src/stub/i386-dos32.tmt.h
+++ b/src/stub/i386-dos32.tmt.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    34553
-#define NRV_LOADER_ADLER32 0x709962c8
-#define NRV_LOADER_CRC32   0xbb6e5cc6
+#define STUB_I386_DOS32_TMT_SIZE    34553
+#define STUB_I386_DOS32_TMT_ADLER32 0x709962c8
+#define STUB_I386_DOS32_TMT_CRC32   0xbb6e5cc6
 
-unsigned char nrv_loader[34553] = {
+unsigned char stub_i386_dos32_tmt[34553] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 228, 29,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-dos32.watcom.le.h b/src/stub/i386-dos32.watcom.le.h
index e2eb5108..2cce5031 100644
--- a/src/stub/i386-dos32.watcom.le.h
+++ b/src/stub/i386-dos32.watcom.le.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    35309
-#define NRV_LOADER_ADLER32 0x16df069a
-#define NRV_LOADER_CRC32   0xf4e0df8a
+#define STUB_I386_DOS32_WATCOM_LE_SIZE    35309
+#define STUB_I386_DOS32_WATCOM_LE_ADLER32 0x16df069a
+#define STUB_I386_DOS32_WATCOM_LE_CRC32   0xf4e0df8a
 
-unsigned char nrv_loader[35309] = {
+unsigned char stub_i386_dos32_watcom_le[35309] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  24, 30,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf-entry.h b/src/stub/i386-linux.elf-entry.h
index 8bb9474a..ff507864 100644
--- a/src/stub/i386-linux.elf-entry.h
+++ b/src/stub/i386-linux.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386ELF_LOADER_SIZE    52744
-#define LINUX_I386ELF_LOADER_ADLER32 0xd3836661
-#define LINUX_I386ELF_LOADER_CRC32   0x90dd48b4
+#define STUB_I386_LINUX_ELF_ENTRY_SIZE    52744
+#define STUB_I386_LINUX_ELF_ENTRY_ADLER32 0xd3836661
+#define STUB_I386_LINUX_ELF_ENTRY_CRC32   0x90dd48b4
 
-unsigned char linux_i386elf_loader[52744] = {
+unsigned char stub_i386_linux_elf_entry[52744] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 100, 34,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf-fold.h b/src/stub/i386-linux.elf-fold.h
index 63f6594e..8d1b9e85 100644
--- a/src/stub/i386-linux.elf-fold.h
+++ b/src/stub/i386-linux.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386ELF_FOLD_SIZE    1691
-#define LINUX_I386ELF_FOLD_ADLER32 0xe27fd53e
-#define LINUX_I386ELF_FOLD_CRC32   0x75829ac3
+#define STUB_I386_LINUX_ELF_FOLD_SIZE    1691
+#define STUB_I386_LINUX_ELF_FOLD_ADLER32 0xe27fd53e
+#define STUB_I386_LINUX_ELF_FOLD_CRC32   0x75829ac3
 
-unsigned char linux_i386elf_fold[1691] = {
+unsigned char stub_i386_linux_elf_fold[1691] = {
 127, 69, 76, 70,  1,  1,  1,  0, 76,105,110,117,120,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.execve-entry.h b/src/stub/i386-linux.elf.execve-entry.h
index bc2200cf..18800bff 100644
--- a/src/stub/i386-linux.elf.execve-entry.h
+++ b/src/stub/i386-linux.elf.execve-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386EXEC_LOADER_SIZE    53359
-#define LINUX_I386EXEC_LOADER_ADLER32 0x8a0fc1ca
-#define LINUX_I386EXEC_LOADER_CRC32   0x5811bdc7
+#define STUB_I386_LINUX_ELF_EXECVE_ENTRY_SIZE    53359
+#define STUB_I386_LINUX_ELF_EXECVE_ENTRY_ADLER32 0x8a0fc1ca
+#define STUB_I386_LINUX_ELF_EXECVE_ENTRY_CRC32   0x5811bdc7
 
-unsigned char linux_i386exec_loader[53359] = {
+unsigned char stub_i386_linux_elf_execve_entry[53359] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  24, 34,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.execve-fold.h b/src/stub/i386-linux.elf.execve-fold.h
index 925be4e0..f1a76a02 100644
--- a/src/stub/i386-linux.elf.execve-fold.h
+++ b/src/stub/i386-linux.elf.execve-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386EXEC_FOLD_SIZE    931
-#define LINUX_I386EXEC_FOLD_ADLER32 0x488877dc
-#define LINUX_I386EXEC_FOLD_CRC32   0x399780ea
+#define STUB_I386_LINUX_ELF_EXECVE_FOLD_SIZE    931
+#define STUB_I386_LINUX_ELF_EXECVE_FOLD_ADLER32 0x488877dc
+#define STUB_I386_LINUX_ELF_EXECVE_FOLD_CRC32   0x399780ea
 
-unsigned char linux_i386exec_fold[931] = {
+unsigned char stub_i386_linux_elf_execve_fold[931] = {
 127, 69, 76, 70,  1,  1,  1,  0, 76,105,110,117,120,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.interp-entry.h b/src/stub/i386-linux.elf.interp-entry.h
index 48e5e323..564495fd 100644
--- a/src/stub/i386-linux.elf.interp-entry.h
+++ b/src/stub/i386-linux.elf.interp-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386PTI_LOADER_SIZE    64126
-#define LINUX_I386PTI_LOADER_ADLER32 0xba05b47c
-#define LINUX_I386PTI_LOADER_CRC32   0x8e143c0a
+#define STUB_I386_LINUX_ELF_INTERP_ENTRY_SIZE    64126
+#define STUB_I386_LINUX_ELF_INTERP_ENTRY_ADLER32 0xba05b47c
+#define STUB_I386_LINUX_ELF_INTERP_ENTRY_CRC32   0x8e143c0a
 
-unsigned char linux_i386pti_loader[64126] = {
+unsigned char stub_i386_linux_elf_interp_entry[64126] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 216, 36,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.interp-fold.h b/src/stub/i386-linux.elf.interp-fold.h
index e5531d00..fd7fefc7 100644
--- a/src/stub/i386-linux.elf.interp-fold.h
+++ b/src/stub/i386-linux.elf.interp-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386PTI_FOLD_SIZE    1519
-#define LINUX_I386PTI_FOLD_ADLER32 0xe82498de
-#define LINUX_I386PTI_FOLD_CRC32   0xd7e223de
+#define STUB_I386_LINUX_ELF_INTERP_FOLD_SIZE    1519
+#define STUB_I386_LINUX_ELF_INTERP_FOLD_ADLER32 0xe82498de
+#define STUB_I386_LINUX_ELF_INTERP_FOLD_CRC32   0xd7e223de
 
-unsigned char linux_i386pti_fold[1519] = {
+unsigned char stub_i386_linux_elf_interp_fold[1519] = {
 127, 69, 76, 70,  1,  1,  1,  0, 76,105,110,117,120,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,116,  0,  1,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.shell-entry.h b/src/stub/i386-linux.elf.shell-entry.h
index c3e5ca27..d24fd00e 100644
--- a/src/stub/i386-linux.elf.shell-entry.h
+++ b/src/stub/i386-linux.elf.shell-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386SH_LOADER_SIZE    41479
-#define LINUX_I386SH_LOADER_ADLER32 0xf8daf11e
-#define LINUX_I386SH_LOADER_CRC32   0x85a73706
+#define STUB_I386_LINUX_ELF_SHELL_ENTRY_SIZE    41479
+#define STUB_I386_LINUX_ELF_SHELL_ENTRY_ADLER32 0xf8daf11e
+#define STUB_I386_LINUX_ELF_SHELL_ENTRY_CRC32   0x85a73706
 
-unsigned char linux_i386sh_loader[41479] = {
+unsigned char stub_i386_linux_elf_shell_entry[41479] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 228, 31,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.elf.shell-fold.h b/src/stub/i386-linux.elf.shell-fold.h
index 21cb8054..bc1885b7 100644
--- a/src/stub/i386-linux.elf.shell-fold.h
+++ b/src/stub/i386-linux.elf.shell-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_I386SH_FOLD_SIZE    1194
-#define LINUX_I386SH_FOLD_ADLER32 0x63b3f90a
-#define LINUX_I386SH_FOLD_CRC32   0xe2bc019d
+#define STUB_I386_LINUX_ELF_SHELL_FOLD_SIZE    1194
+#define STUB_I386_LINUX_ELF_SHELL_FOLD_ADLER32 0x63b3f90a
+#define STUB_I386_LINUX_ELF_SHELL_FOLD_CRC32   0xe2bc019d
 
-unsigned char linux_i386sh_fold[1194] = {
+unsigned char stub_i386_linux_elf_shell_fold[1194] = {
 127, 69, 76, 70,  1,  1,  1,  0, 76,105,110,117,120,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.kernel.vmlinux-head.h b/src/stub/i386-linux.kernel.vmlinux-head.h
index 5149ea84..05efbd59 100644
--- a/src/stub/i386-linux.kernel.vmlinux-head.h
+++ b/src/stub/i386-linux.kernel.vmlinux-head.h
@@ -27,11 +27,11 @@
  */
 
 
-#define HEAD_STACK_SIZE    39
-#define HEAD_STACK_ADLER32 0x7a591357
-#define HEAD_STACK_CRC32   0xf4f6740a
+#define STUB_I386_LINUX_KERNEL_VMLINUX_HEAD_SIZE    39
+#define STUB_I386_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x7a591357
+#define STUB_I386_LINUX_KERNEL_VMLINUX_HEAD_CRC32   0xf4f6740a
 
-unsigned char head_stack[39] = {
+unsigned char stub_i386_linux_kernel_vmlinux_head[39] = {
 140,200,131,192,  8,142,216,142,192,141,142,  0,144,  0,  0,137,   /* 0x   0 */
  73,248,137, 65,252, 15,178, 97,248,106,  0,157, 14,184,  0,  0,   /* 0x  10 */
   0,  0,232,252,255,255,255                                        /* 0x  20 */
diff --git a/src/stub/i386-linux.kernel.vmlinux.h b/src/stub/i386-linux.kernel.vmlinux.h
index 89f40774..2efc32b6 100644
--- a/src/stub/i386-linux.kernel.vmlinux.h
+++ b/src/stub/i386-linux.kernel.vmlinux.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    34465
-#define NRV_LOADER_ADLER32 0x57174f02
-#define NRV_LOADER_CRC32   0x7f1faab0
+#define STUB_I386_LINUX_KERNEL_VMLINUX_SIZE    34465
+#define STUB_I386_LINUX_KERNEL_VMLINUX_ADLER32 0x57174f02
+#define STUB_I386_LINUX_KERNEL_VMLINUX_CRC32   0x7f1faab0
 
-unsigned char nrv_loader[34465] = {
+unsigned char stub_i386_linux_kernel_vmlinux[34465] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  16, 30,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-linux.kernel.vmlinuz.h b/src/stub/i386-linux.kernel.vmlinuz.h
index ca768de7..49c1fe96 100644
--- a/src/stub/i386-linux.kernel.vmlinuz.h
+++ b/src/stub/i386-linux.kernel.vmlinuz.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    35988
-#define NRV_LOADER_ADLER32 0x149f8b43
-#define NRV_LOADER_CRC32   0x8eb24e37
+#define STUB_I386_LINUX_KERNEL_VMLINUZ_SIZE    35988
+#define STUB_I386_LINUX_KERNEL_VMLINUZ_ADLER32 0x149f8b43
+#define STUB_I386_LINUX_KERNEL_VMLINUZ_CRC32   0x8eb24e37
 
-unsigned char nrv_loader[35988] = {
+unsigned char stub_i386_linux_kernel_vmlinuz[35988] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  56, 30,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/i386-openbsd.elf-fold.h b/src/stub/i386-openbsd.elf-fold.h
index 290a88eb..763d9080 100644
--- a/src/stub/i386-openbsd.elf-fold.h
+++ b/src/stub/i386-openbsd.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define OPENBSD_I386ELF_FOLD_SIZE    2025
-#define OPENBSD_I386ELF_FOLD_ADLER32 0x4b605db7
-#define OPENBSD_I386ELF_FOLD_CRC32   0x59c73b6b
+#define STUB_I386_OPENBSD_ELF_FOLD_SIZE    2025
+#define STUB_I386_OPENBSD_ELF_FOLD_ADLER32 0x4b605db7
+#define STUB_I386_OPENBSD_ELF_FOLD_CRC32   0x59c73b6b
 
-unsigned char openbsd_i386elf_fold[2025] = {
+unsigned char stub_i386_openbsd_elf_fold[2025] = {
 127, 69, 76, 70,  1,  1,  1, 12,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
diff --git a/src/stub/i386-win32.pe.h b/src/stub/i386-win32.pe.h
index 1da45592..6d72e703 100644
--- a/src/stub/i386-win32.pe.h
+++ b/src/stub/i386-win32.pe.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    42482
-#define NRV_LOADER_ADLER32 0x579122a4
-#define NRV_LOADER_CRC32   0xaf0e084b
+#define STUB_I386_WIN32_PE_SIZE    42482
+#define STUB_I386_WIN32_PE_ADLER32 0x579122a4
+#define STUB_I386_WIN32_PE_CRC32   0xaf0e084b
 
-unsigned char nrv_loader[42482] = {
+unsigned char stub_i386_win32_pe[42482] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
 172, 31,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/m68k-atari.tos.h b/src/stub/m68k-atari.tos.h
index ba652e93..8cac44d2 100644
--- a/src/stub/m68k-atari.tos.h
+++ b/src/stub/m68k-atari.tos.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    25878
-#define NRV_LOADER_ADLER32 0x97ff2b81
-#define NRV_LOADER_CRC32   0xec5b1712
+#define STUB_M68K_ATARI_TOS_SIZE    25878
+#define STUB_M68K_ATARI_TOS_ADLER32 0x97ff2b81
+#define STUB_M68K_ATARI_TOS_CRC32   0xec5b1712
 
-unsigned char nrv_loader[25878] = {
+unsigned char stub_m68k_atari_tos[25878] = {
 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  1,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0, 26,152,  1,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,   /* 0x  20 */
diff --git a/src/stub/mipsel.r3000-ps1.h b/src/stub/mipsel.r3000-ps1.h
index 4229c7de..146388a6 100644
--- a/src/stub/mipsel.r3000-ps1.h
+++ b/src/stub/mipsel.r3000-ps1.h
@@ -27,11 +27,11 @@
  */
 
 
-#define NRV_LOADER_SIZE    26795
-#define NRV_LOADER_ADLER32 0xa9c7e09e
-#define NRV_LOADER_CRC32   0x18b357f8
+#define STUB_MIPSEL_R3000_PS1_SIZE    26795
+#define STUB_MIPSEL_R3000_PS1_ADLER32 0xa9c7e09e
+#define STUB_MIPSEL_R3000_PS1_CRC32   0x18b357f8
 
-unsigned char nrv_loader[26795] = {
+unsigned char stub_mipsel_r3000_ps1[26795] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   1,  0,  8,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
  36, 41,  0,  0,  1,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,   /* 0x  20 */
diff --git a/src/stub/powerpc-darwin.macho-entry.h b/src/stub/powerpc-darwin.macho-entry.h
index 9b54830d..f3c78feb 100644
--- a/src/stub/powerpc-darwin.macho-entry.h
+++ b/src/stub/powerpc-darwin.macho-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define L_MAC_PPC32_LOADER_SIZE    9698
-#define L_MAC_PPC32_LOADER_ADLER32 0x57dbe1c2
-#define L_MAC_PPC32_LOADER_CRC32   0x5a4d8013
+#define STUB_POWERPC_DARWIN_MACHO_ENTRY_SIZE    9698
+#define STUB_POWERPC_DARWIN_MACHO_ENTRY_ADLER32 0x57dbe1c2
+#define STUB_POWERPC_DARWIN_MACHO_ENTRY_CRC32   0x5a4d8013
 
-unsigned char l_mac_ppc32_loader[9698] = {
+unsigned char stub_powerpc_darwin_macho_entry[9698] = {
 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  1,  0, 20,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0, 24,120,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,   /* 0x  20 */
diff --git a/src/stub/powerpc-darwin.macho-fold.h b/src/stub/powerpc-darwin.macho-fold.h
index b4edbff5..bfc49488 100644
--- a/src/stub/powerpc-darwin.macho-fold.h
+++ b/src/stub/powerpc-darwin.macho-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define FOLD_MACHPPC32_SIZE    1660
-#define FOLD_MACHPPC32_ADLER32 0xfc8b272c
-#define FOLD_MACHPPC32_CRC32   0x62ce0ae3
+#define STUB_POWERPC_DARWIN_MACHO_FOLD_SIZE    1660
+#define STUB_POWERPC_DARWIN_MACHO_FOLD_ADLER32 0xfc8b272c
+#define STUB_POWERPC_DARWIN_MACHO_FOLD_CRC32   0x62ce0ae3
 
-unsigned char fold_machppc32[1660] = {
+unsigned char stub_powerpc_darwin_macho_fold[1660] = {
  72,  0,  0,105, 40,  6,  0,208, 76,130,  0, 32, 84,132,240,191,   /* 0x   0 */
  77,130,  0, 32, 60,  0,  0, 16,124,  4,  0, 64, 65,128,  0,  8,   /* 0x  10 */
 124,  4,  3,120, 56,165,  1, 32,124,103, 27,120, 56, 99,255,252,   /* 0x  20 */
diff --git a/src/stub/powerpc-linux.elf-entry.h b/src/stub/powerpc-linux.elf-entry.h
index 24374fb7..0309eb63 100644
--- a/src/stub/powerpc-linux.elf-entry.h
+++ b/src/stub/powerpc-linux.elf-entry.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELFPPC32_LOADER_SIZE    10127
-#define LINUX_ELFPPC32_LOADER_ADLER32 0x9dde2c46
-#define LINUX_ELFPPC32_LOADER_CRC32   0xb7957c12
+#define STUB_POWERPC_LINUX_ELF_ENTRY_SIZE    10127
+#define STUB_POWERPC_LINUX_ELF_ENTRY_ADLER32 0x9dde2c46
+#define STUB_POWERPC_LINUX_ELF_ENTRY_CRC32   0xb7957c12
 
-unsigned char linux_elfppc32_loader[10127] = {
+unsigned char stub_powerpc_linux_elf_entry[10127] = {
 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  1,  0, 20,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  10 */
   0,  0, 24,224,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,   /* 0x  20 */
diff --git a/src/stub/powerpc-linux.elf-fold.h b/src/stub/powerpc-linux.elf-fold.h
index a1593f89..fa31d6fb 100644
--- a/src/stub/powerpc-linux.elf-fold.h
+++ b/src/stub/powerpc-linux.elf-fold.h
@@ -27,11 +27,11 @@
  */
 
 
-#define LINUX_ELFPPC32_FOLD_SIZE    1944
-#define LINUX_ELFPPC32_FOLD_ADLER32 0x727175e2
-#define LINUX_ELFPPC32_FOLD_CRC32   0xe344893c
+#define STUB_POWERPC_LINUX_ELF_FOLD_SIZE    1944
+#define STUB_POWERPC_LINUX_ELF_FOLD_ADLER32 0x727175e2
+#define STUB_POWERPC_LINUX_ELF_FOLD_CRC32   0xe344893c
 
-unsigned char linux_elfppc32_fold[1944] = {
+unsigned char stub_powerpc_linux_elf_fold[1944] = {
 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   0,  2,  0, 20,  0,  0,  0,  1,  0, 16,  0,128,  0,  0,  0, 52,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,   /* 0x  20 */