diff --git a/src/p_djgpp2.cpp b/src/p_djgpp2.cpp
index a03daa85..1af42c6a 100644
--- a/src/p_djgpp2.cpp
+++ b/src/p_djgpp2.cpp
@@ -58,7 +58,7 @@ PackDjgpp2::PackDjgpp2(InputFile *f) :
 
 const int *PackDjgpp2::getCompressionMethods(int method, int level) const
 {
-    return Packer::getDefaultCompressionMethods_LE32(method, level);
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 
 
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index f49b7fd8..1898e951 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -84,7 +84,7 @@ PackLinuxI386elf::buildLoader(const Filter *ft)
 {
     unsigned char tmp[sizeof(linux_i386elf_fold)];
     memcpy(tmp, linux_i386elf_fold, sizeof(linux_i386elf_fold));
-    checkPatch(0,0,0,0);  // reset
+    checkPatch(NULL, 0, 0, 0);  // reset
     if (opt->unix.ptinterp) {
         unsigned j;
         for (j = 0; j < sizeof(linux_i386elf_fold)-1; ++j) {
diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp
index a2dff550..ccf6af9d 100644
--- a/src/p_lx_exc.cpp
+++ b/src/p_lx_exc.cpp
@@ -57,7 +57,7 @@ static const
 
 const int *PackLinuxI386::getCompressionMethods(int method, int level) const
 {
-    return Packer::getDefaultCompressionMethods_LE32(method, level);
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 
 const int *PackLinuxI386::getFilters() const
@@ -289,7 +289,7 @@ PackLinuxI386::buildLinuxLoader(
     int sz_cto = getLoaderSize();
     if (0x20==(ft->id & 0xF0) || 0x30==(ft->id & 0xF0)) {  // push byte '?'  ; cto8
         patch_le16(ptr_cto, sz_cto, "\x6a?", 0x6a + (ft->cto << 8));
-        checkPatch(0,0,0,0);  // reset
+        checkPatch(NULL, 0, 0, 0);  // reset
     }
     // PackHeader and overlay_offset at the end of the output file,
     // after the compressed data.
@@ -307,7 +307,7 @@ PackLinuxI386::buildLoader(Filter const *ft)
     // patch loader
     // note: we only can use /proc/<pid>/fd when exetype > 0.
     //   also, we sleep much longer when compressing a script.
-    checkPatch(0,0,0,0);  // reset
+    checkPatch(NULL, 0, 0, 0);  // reset
     patch_le32(buf,sz_fold,"UPX4",exetype > 0 ? 3 : 15);   // sleep time
     patch_le32(buf,sz_fold,"UPX3",progid);
     patch_le32(buf,sz_fold,"UPX2",exetype > 0 ? 0 : 0x7fffffff);
diff --git a/src/p_lx_sh.cpp b/src/p_lx_sh.cpp
index 30cf7e4f..05af05b9 100644
--- a/src/p_lx_sh.cpp
+++ b/src/p_lx_sh.cpp
@@ -66,7 +66,7 @@ PackLinuxI386sh::buildLoader(Filter const *ft)
     MemBuffer buf(sz_fold);
     memcpy(buf, linux_i386sh_fold, sz_fold);
 
-    checkPatch(0,0,0,0);  // reset
+    checkPatch(NULL, 0, 0, 0);  // reset
     patch_le32(buf,sz_fold,"UPX3",l_shname);
     patch_le32(buf,sz_fold,"UPX2",o_shname);
 
diff --git a/src/p_tmt.cpp b/src/p_tmt.cpp
index 0986187c..f8ca4305 100644
--- a/src/p_tmt.cpp
+++ b/src/p_tmt.cpp
@@ -50,7 +50,7 @@ PackTmt::PackTmt(InputFile *f) : super(f)
 
 const int *PackTmt::getCompressionMethods(int method, int level) const
 {
-    return Packer::getDefaultCompressionMethods_LE32(method, level);
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 
 
diff --git a/src/p_vmlinz.cpp b/src/p_vmlinz.cpp
index 871ca882..3268abfb 100644
--- a/src/p_vmlinz.cpp
+++ b/src/p_vmlinz.cpp
@@ -58,7 +58,7 @@ PackVmlinuzI386::PackVmlinuzI386(InputFile *f) :
 
 const int *PackVmlinuzI386::getCompressionMethods(int method, int level) const
 {
-    return Packer::getDefaultCompressionMethods_LE32(method, level);
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 
 
diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp
index d6c5d2b8..7f94198c 100644
--- a/src/p_w32pe.cpp
+++ b/src/p_w32pe.cpp
@@ -124,7 +124,7 @@ PackW32Pe::~PackW32Pe()
 const int *PackW32Pe::getCompressionMethods(int method, int level) const
 {
     bool small = ih.codesize + ih.datasize <= 256*1024;
-    return Packer::getDefaultCompressionMethods_LE32(method, level, small);
+    return Packer::getDefaultCompressionMethods_le32(method, level, small);
 }
 
 
diff --git a/src/p_wcle.cpp b/src/p_wcle.cpp
index 4e94b2e9..2a15b95c 100644
--- a/src/p_wcle.cpp
+++ b/src/p_wcle.cpp
@@ -68,7 +68,7 @@ static const
 
 const int *PackWcle::getCompressionMethods(int method, int level) const
 {
-    return Packer::getDefaultCompressionMethods_LE32(method, level);
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 
 
diff --git a/src/packer.cpp b/src/packer.cpp
index f590db48..05acce32 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -712,7 +712,7 @@ int Packer::patch_be16(void *b, int blen, unsigned old, unsigned new_)
     checkPatch(b, blen, boff, 2);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_be16(p,new_);
+    set_be16(p, new_);
 
     return boff;
 }
@@ -724,7 +724,7 @@ int Packer::patch_be16(void *b, int blen, const void *old, unsigned new_)
     checkPatch(b, blen, boff, 2);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_be16(p,new_);
+    set_be16(p, new_);
 
     return boff;
 }
@@ -736,7 +736,7 @@ int Packer::patch_be32(void *b, int blen, unsigned old, unsigned new_)
     checkPatch(b, blen, boff, 4);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_be32(p,new_);
+    set_be32(p, new_);
 
     return boff;
 }
@@ -748,7 +748,7 @@ int Packer::patch_be32(void *b, int blen, const void *old, unsigned new_)
     checkPatch(b, blen, boff, 4);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_be32(p,new_);
+    set_be32(p, new_);
 
     return boff;
 }
@@ -760,7 +760,7 @@ int Packer::patch_le16(void *b, int blen, unsigned old, unsigned new_)
     checkPatch(b, blen, boff, 2);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_le16(p,new_);
+    set_le16(p, new_);
 
     return boff;
 }
@@ -772,7 +772,7 @@ int Packer::patch_le16(void *b, int blen, const void *old, unsigned new_)
     checkPatch(b, blen, boff, 2);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_le16(p,new_);
+    set_le16(p, new_);
 
     return boff;
 }
@@ -784,7 +784,7 @@ int Packer::patch_le32(void *b, int blen, unsigned old, unsigned new_)
     checkPatch(b, blen, boff, 4);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_le32(p,new_);
+    set_le32(p, new_);
 
     return boff;
 }
@@ -796,7 +796,7 @@ int Packer::patch_le32(void *b, int blen, const void *old, unsigned new_)
     checkPatch(b, blen, boff, 4);
 
     unsigned char *p = (unsigned char *)b + boff;
-    set_le32(p,new_);
+    set_le32(p, new_);
 
     return boff;
 }
@@ -941,7 +941,7 @@ const int *Packer::getDefaultCompressionMethods_8(int method, int level, int sma
 }
 
 
-const int *Packer::getDefaultCompressionMethods_LE32(int method, int level, int small) const
+const int *Packer::getDefaultCompressionMethods_le32(int method, int level, int small) const
 {
     static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, M_NRV2E_LE32, -1 };
     static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, M_NRV2E_LE32, -1 };
diff --git a/src/packer.h b/src/packer.h
index 3a58bd13..b4b82074 100644
--- a/src/packer.h
+++ b/src/packer.h
@@ -241,7 +241,7 @@ protected:
 
     // compression method util
     const int *getDefaultCompressionMethods_8(int method, int level, int small=-1) const;
-    const int *getDefaultCompressionMethods_LE32(int method, int level, int small=-1) const;
+    const int *getDefaultCompressionMethods_le32(int method, int level, int small=-1) const;
 public:
     static bool isValidCompressionMethod(int method);