diff --git a/genex/DESC b/gencat/DESC
similarity index 100%
rename from genex/DESC
rename to gencat/DESC
diff --git a/genex/Makefile b/gencat/Makefile
similarity index 69%
rename from genex/Makefile
rename to gencat/Makefile
index a7b77cc..6a7b1d6 100644
--- a/genex/Makefile
+++ b/gencat/Makefile
@@ -11,7 +11,7 @@
 
 PREFIX ?= /usr/local
 
-OBJS = genex.o comp.o libs.o pdf.o
+OBJS = gencat.o comp.o libs.o pdf.o
 
 SHELL = /bin/bash
 CFLAGS = -Wall -g
@@ -35,9 +35,9 @@ endif
 
 .PHONY:		all clean spotless install uninstall
 
-all:		genex-bin
+all:		gencat-bin
 
-genex-bin:	$(OBJS)
+gencat-bin:	$(OBJS)
 		$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 %.o:		%.c
@@ -54,24 +54,24 @@ clean:
 		rm -f $(OBJS) $(OBJS:.o=.d)
 
 spotless:	clean
-		rm -f genex-bin
+		rm -f gencat-bin
 
 #
-# Note: we use .../lib/genex/ instead of .../libexec/genex/ because FHS-3.0
+# Note: we use .../lib/gencat/ instead of .../libexec/gencat/ because FHS-3.0
 # does not define libexec under the /usr/local/ hierarchy. (And older versions
 # of FHS don't define libexec at all.)
 #
 
 install:	all
 		mkdir -p $(DESTDIR)/$(PREFIX)/bin
-		mkdir -p $(DESTDIR)/$(PREFIX)/lib/genex
-		./mkgenex-wrapper -m 755 -p $(DESTDIR)/$(PREFIX)/lib/genex/ \
-		  $(DESTDIR)/$(PREFIX)/bin/genex
-		install -m 755 genex-bin $(DESTDIR)/$(PREFIX)/lib/genex/
-		install -m 755 sym2xps $(DESTDIR)/$(PREFIX)/lib/genex/
-		install -m 755 expand-pintype $(DESTDIR)/$(PREFIX)/lib/genex/
+		mkdir -p $(DESTDIR)/$(PREFIX)/lib/gencat
+		./mkgencat-wrapper -m 755 -p $(DESTDIR)/$(PREFIX)/lib/gencat/ \
+		  $(DESTDIR)/$(PREFIX)/bin/gencat
+		install -m 755 gencat-bin $(DESTDIR)/$(PREFIX)/lib/gencat/
+		install -m 755 sym2xps $(DESTDIR)/$(PREFIX)/lib/gencat/
+		install -m 755 expand-pintype $(DESTDIR)/$(PREFIX)/lib/gencat/
 
 uninstall:
-		rm -f $(DESTDIR)/$(PREFIX)/bin/genex
-		rm -rf $(DESTDIR)/$(PREFIX)/lib/genex
+		rm -f $(DESTDIR)/$(PREFIX)/bin/gencat
+		rm -rf $(DESTDIR)/$(PREFIX)/lib/gencat
 
diff --git a/genex/comp.c b/gencat/comp.c
similarity index 100%
rename from genex/comp.c
rename to gencat/comp.c
diff --git a/genex/comp.h b/gencat/comp.h
similarity index 100%
rename from genex/comp.h
rename to gencat/comp.h
diff --git a/genex/expand-pintype b/gencat/expand-pintype
similarity index 100%
rename from genex/expand-pintype
rename to gencat/expand-pintype
diff --git a/genex/genex b/gencat/gencat
similarity index 52%
rename from genex/genex
rename to gencat/gencat
index faa45f7..73339d0 100755
--- a/genex/genex
+++ b/gencat/gencat
@@ -1,3 +1,3 @@
 #!/bin/sh
 PATH=$PATH:.
-exec genex-bin "$@"
+exec gencat-bin "$@"
diff --git a/genex/genex.c b/gencat/gencat.c
similarity index 97%
rename from genex/genex.c
rename to gencat/gencat.c
index c9e4f9e..68335a4 100644
--- a/genex/genex.c
+++ b/gencat/gencat.c
@@ -1,5 +1,5 @@
 /*
- * genex.c - Generate expanded component view
+ * gencat.c - Generate expanded component view
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -18,7 +18,7 @@
 #include "comp.h"
 #include "libs.h"
 #include "pdf.h"
-#include "genex.h"
+#include "gencat.h"
 
 
 int quiet = 0;
diff --git a/genex/genex.h b/gencat/gencat.h
similarity index 75%
rename from genex/genex.h
rename to gencat/gencat.h
index 9ccfdab..94f006d 100644
--- a/genex/genex.h
+++ b/gencat/gencat.h
@@ -1,5 +1,5 @@
 /*
- * genex.h - Generate expanded component view
+ * gencat.h - Generate expanded component view
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -9,9 +9,9 @@
  * (at your option) any later version.
  */
 
-#ifndef GENEX_H
-#define	GENEX_H
+#ifndef GENCAT_H
+#define	GENCAT_H
 
 extern int quiet;
 
-#endif /* !GENEX_H */
+#endif /* !GENCAT_H */
diff --git a/genex/libs.c b/gencat/libs.c
similarity index 100%
rename from genex/libs.c
rename to gencat/libs.c
diff --git a/genex/libs.h b/gencat/libs.h
similarity index 100%
rename from genex/libs.h
rename to gencat/libs.h
diff --git a/genex/mkgenex-wrapper b/gencat/mkgencat-wrapper
similarity index 90%
rename from genex/mkgenex-wrapper
rename to gencat/mkgencat-wrapper
index 7e9d6e9..7c02a4f 100755
--- a/genex/mkgenex-wrapper
+++ b/gencat/mkgencat-wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# mkgenex-wrapper - Generate wrapper script for genex
+# mkgencat-wrapper - Generate wrapper script for gencat
 #
 # Copyright 2012 by Werner Almesberger
 #
@@ -42,7 +42,7 @@ trap "rm -f _wrapper" 0
 cat <<EOF >_wrapper
 #!/bin/sh
 PATH=\$PATH:$DIR
-exec genex-bin "\$@"
+exec gencat-bin "\$@"
 EOF
 chmod $MODE _wrapper
 
diff --git a/genex/pdf.c b/gencat/pdf.c
similarity index 99%
rename from genex/pdf.c
rename to gencat/pdf.c
index ad447cc..922df46 100644
--- a/genex/pdf.c
+++ b/gencat/pdf.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "genex.h"
+#include "gencat.h"
 #include "comp.h"
 #include "pdf.h"
 
diff --git a/genex/pdf.h b/gencat/pdf.h
similarity index 100%
rename from genex/pdf.h
rename to gencat/pdf.h
diff --git a/genex/run b/gencat/run
similarity index 94%
rename from genex/run
rename to gencat/run
index 53a3c87..950b8bb 100755
--- a/genex/run
+++ b/gencat/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Hack: ps2pdf is happy with the PS generate, but if we invoke gs diretctly,
 # isn't. Some voodoo is still missing ...
-./genex -p \
+./gencat -p \
     -L /home/qi/kicad-libs/components  \
     /home/qi/kicad-libs/components/EXPAND DESC >out.pdf
diff --git a/genex/sym2xps b/gencat/sym2xps
similarity index 100%
rename from genex/sym2xps
rename to gencat/sym2xps
diff --git a/genex/util.h b/gencat/util.h
similarity index 100%
rename from genex/util.h
rename to gencat/util.h