diff --git a/Source/build.cpp b/Source/build.cpp
index 2c90fcd1..bab1d8fa 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -86,7 +86,7 @@ CEXEBuild::CEXEBuild() :
   ns_func.add("",0); // make sure offset 0 is special on these (i.e. never used by a label)
   ns_label.add("",0);
 
-  exeheader_size = zlib_exehead_size;
+  exehead_original_size = zlib_exehead_size;
   update_exehead(zlib_exehead, zlib_exehead_size);
 
 #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
@@ -2585,9 +2585,9 @@ int CEXEBuild::write_output(void)
   INFO_MSG("\nUsing %s%s compression.\n\n", compressor->GetName(), build_compress_whole?" (compress whole)":"");
 #endif
 
-  int total_usize=exeheader_size;
+  int total_usize=exehead_original_size;
 
-  INFO_MSG("EXE header size:          %10d / %d bytes\n",m_exehead_size,exeheader_size);
+  INFO_MSG("EXE header size:          %10d / %d bytes\n",m_exehead_size,exehead_original_size);
 
   if (build_compress_whole) {
     INFO_MSG("Install code:                          (%d bytes)\n",
diff --git a/Source/exedata.cpp b/Source/exedata.cpp
index 05acf0be..d8625cc5 100644
--- a/Source/exedata.cpp
+++ b/Source/exedata.cpp
@@ -23,8 +23,7 @@
 size_t zlib_exehead_size=sizeof(zlib_exehead);
 size_t bzip2_exehead_size=sizeof(bzip2_exehead);
 size_t lzma_exehead_size=sizeof(lzma_exehead);
-// TODO: rename to exehead_original_size
-size_t exeheader_size=0;
+size_t exehead_original_size=0;
 
 size_t icondata_size=sizeof(icon_data)-22;
 size_t unicondata_size=sizeof(unicon_data)-22;
diff --git a/Source/exedata.h b/Source/exedata.h
index 397a84e6..a6896aa8 100644
--- a/Source/exedata.h
+++ b/Source/exedata.h
@@ -7,7 +7,7 @@
 extern size_t zlib_exehead_size;
 extern size_t bzip2_exehead_size;
 extern size_t lzma_exehead_size;
-extern size_t exeheader_size;
+extern size_t exehead_original_size;
 extern size_t icondata_size;
 extern size_t unicondata_size;