diff --git a/src/help.cpp b/src/help.cpp
index 9c6b13a4..de21cf63 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -97,14 +97,14 @@ struct PackerNames
         const char* fname;
         const char* sname;
     };
-    Entry names[32];
+    Entry names[64];
     size_t names_count;
     const options_t *o;
     PackerNames() : names_count(0), o(NULL) { }
     void add(const Packer *p)
     {
         p->assertPacker();
-        assert(names_count < 32);
+        assert(names_count < 64);
         names[names_count].fname = p->getFullName(o);
         names[names_count].sname = p->getName();
         names_count++;
diff --git a/src/p_com.h b/src/p_com.h
index 3fd2103c..07661a4d 100644
--- a/src/p_com.h
+++ b/src/p_com.h
@@ -42,7 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_COM; }
     virtual const char *getName() const { return "dos/com"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-dos16.com"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/p_djgpp2.h b/src/p_djgpp2.h
index 30952ae6..fd4cfae3 100644
--- a/src/p_djgpp2.h
+++ b/src/p_djgpp2.h
@@ -43,7 +43,7 @@ public:
     virtual int getVersion() const { return 14; }
     virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
     virtual const char *getName() const { return "djgpp2/coff"; }
-    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2.coff"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/p_exe.h b/src/p_exe.h
index 75d6afe6..5dc98da0 100644
--- a/src/p_exe.h
+++ b/src/p_exe.h
@@ -42,7 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_EXE; }
     virtual const char *getName() const { return "dos/exe"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-dos16.exe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/p_lx_exc.h b/src/p_lx_exc.h
index 1a10c02b..fec81e22 100644
--- a/src/p_lx_exc.h
+++ b/src/p_lx_exc.h
@@ -138,7 +138,7 @@ class PackBSDI386 : public PackLinuxI386
 public:
     PackBSDI386(InputFile *f);
     virtual int getFormat() const { return UPX_F_BSD_i386; }
-    virtual const char *getName() const { return "*BSD/386"; }
+    virtual const char *getName() const { return "BSD/386"; }
     virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; }
 
 protected:
diff --git a/src/p_sys.h b/src/p_sys.h
index a0c35691..5e70d16e 100644
--- a/src/p_sys.h
+++ b/src/p_sys.h
@@ -42,7 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_SYS; }
     virtual const char *getName() const { return "dos/sys"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-dos16.sys"; }
 
     virtual bool canPack();
 
diff --git a/src/p_tmt.h b/src/p_tmt.h
index eb469a9a..47374bf3 100644
--- a/src/p_tmt.h
+++ b/src/p_tmt.h
@@ -42,7 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_TMT_ADAM; }
     virtual const char *getName() const { return "tmt/adam"; }
-    virtual const char *getFullName(const options_t *) const { return "i386-dos32.tmt"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.tmt.adam"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h
index 03b3371c..798254de 100644
--- a/src/p_vmlinx.h
+++ b/src/p_vmlinx.h
@@ -175,7 +175,7 @@ public:
         Ehdr::ELFCLASS32, Ehdr::ELFDATA2MSB, "_vmlinux_start") { }
     virtual int getFormat() const { return UPX_F_VMLINUX_PPC32; }
     virtual const char *getName() const { return "vmlinux/ppc32"; }
-    virtual const char *getFullName(const options_t *) const { return "ppc32-linux.kernel.vmlinux"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc-linux.kernel.vmlinux"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/p_w16ne.h b/src/p_w16ne.h
index 92cc43e0..734f8107 100644
--- a/src/p_w16ne.h
+++ b/src/p_w16ne.h
@@ -42,7 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_WIN16_NE; }
     virtual const char *getName() const { return "win16/ne"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
+    virtual const char *getFullName(const options_t *) const { return "i286-win16.ne"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
diff --git a/src/packer.cpp b/src/packer.cpp
index 369980ce..79b0761f 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -67,8 +67,9 @@ void Packer::assertPacker() const
     assert(getVersion() >= 11);
     assert(getVersion() <= 14);
     assert(strlen(getName()) <= 13);
-    assert(strlen(getFullName(opt)) <= 26);     // "i386-linux.kernel.bvmlinuz"
-    assert(strlen(getFullName(NULL)) <= 26);    // "i386-linux.kernel.bvmlinuz"
+    // info: 32 is limit for show_all_packers() in help.cpp
+    assert(strlen(getFullName(opt)) <= 28);
+    assert(strlen(getFullName(NULL)) <= 28);
     if (bele == NULL) fprintf(stderr, "%s\n", getName());
     assert(bele != NULL);
 #if 1