diff --git a/genkicat/Makefile b/genkicat/Makefile
index 9116dff..0515c94 100644
--- a/genkicat/Makefile
+++ b/genkicat/Makefile
@@ -11,7 +11,7 @@
 
 PREFIX ?= /usr/local
 
-OBJS = gencat.o tree.o libs.o run.o comp.o fped.o pdf.o
+OBJS = genkicat.o tree.o libs.o run.o comp.o fped.o pdf.o
 
 SHELL = /bin/bash
 CFLAGS = -Wall -g
@@ -35,9 +35,9 @@ endif
 
 .PHONY:		all clean spotless install uninstall
 
-all:		gencat-bin
+all:		genkicat-bin
 
-gencat-bin:	$(OBJS)
+genkicat-bin:	$(OBJS)
 		$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 %.o:		%.c
@@ -54,24 +54,24 @@ clean:
 		rm -f $(OBJS) $(OBJS:.o=.d)
 
 spotless:	clean
-		rm -f gencat-bin
+		rm -f genkicat-bin
 
 #
-# 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.)
+# Note: we use .../lib/genkicat/ instead of .../libexec/genkicat/ 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/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/
+		mkdir -p $(DESTDIR)/$(PREFIX)/lib/genkicat
+		./mkgenkicat-wrapper -m 755 -p \
+		  $(DESTDIR)/$(PREFIX)/lib/genkicat/ \
+		  $(DESTDIR)/$(PREFIX)/bin/genkicat
+		install -m 755 genkicat-bin $(DESTDIR)/$(PREFIX)/lib/genkicat/
+		install -m 755 sym2xps $(DESTDIR)/$(PREFIX)/lib/genkicat/
+		install -m 755 expand-pintype $(DESTDIR)/$(PREFIX)/lib/genkicat/
 
 uninstall:
-		rm -f $(DESTDIR)/$(PREFIX)/bin/gencat
-		rm -rf $(DESTDIR)/$(PREFIX)/lib/gencat
-
+		rm -f $(DESTDIR)/$(PREFIX)/bin/genkicat
+		rm -rf $(DESTDIR)/$(PREFIX)/lib/genkicat
diff --git a/genkicat/gencat b/genkicat/gencat
index 73339d0..1a97f76 100755
--- a/genkicat/gencat
+++ b/genkicat/gencat
@@ -1,3 +1,3 @@
 #!/bin/sh
 PATH=$PATH:.
-exec gencat-bin "$@"
+exec genkicat-bin "$@"
diff --git a/genkicat/genkicat.c b/genkicat/genkicat.c
index 8e5637e..1fc9951 100644
--- a/genkicat/genkicat.c
+++ b/genkicat/genkicat.c
@@ -1,5 +1,5 @@
 /*
- * gencat.c - Generate expanded component view
+ * genkicat.c - Generate expanded component view
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -18,7 +18,7 @@
 #include "tree.h"
 #include "libs.h"
 #include "pdf.h"
-#include "gencat.h"
+#include "genkicat.h"
 
 
 int quiet = 0;
diff --git a/genkicat/genkicat.h b/genkicat/genkicat.h
index 94f006d..490c600 100644
--- a/genkicat/genkicat.h
+++ b/genkicat/genkicat.h
@@ -1,5 +1,5 @@
 /*
- * gencat.h - Generate expanded component view
+ * genkicat.h - Generate expanded component view
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -9,9 +9,9 @@
  * (at your option) any later version.
  */
 
-#ifndef GENCAT_H
-#define	GENCAT_H
+#ifndef GENKICAT_H
+#define	GENKICAT_H
 
 extern int quiet;
 
-#endif /* !GENCAT_H */
+#endif /* !GENKICAT_H */
diff --git a/genkicat/mkgenkicat-wrapper b/genkicat/mkgenkicat-wrapper
index 7c02a4f..5e75f58 100755
--- a/genkicat/mkgenkicat-wrapper
+++ b/genkicat/mkgenkicat-wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# mkgencat-wrapper - Generate wrapper script for gencat
+# mkgenkicat-wrapper - Generate wrapper script for genkicat
 #
 # Copyright 2012 by Werner Almesberger
 #
@@ -42,7 +42,7 @@ trap "rm -f _wrapper" 0
 cat <<EOF >_wrapper
 #!/bin/sh
 PATH=\$PATH:$DIR
-exec gencat-bin "\$@"
+exec genkicat-bin "\$@"
 EOF
 chmod $MODE _wrapper
 
diff --git a/genkicat/pdf.c b/genkicat/pdf.c
index 71db644..1a1c024 100644
--- a/genkicat/pdf.c
+++ b/genkicat/pdf.c
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include "util.h"
-#include "gencat.h"
+#include "genkicat.h"
 #include "tree.h"
 #include "libs.h"
 #include "pdf.h"
diff --git a/genkicat/run b/genkicat/run
index 950b8bb..22be23d 100755
--- a/genkicat/run
+++ b/genkicat/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 ...
-./gencat -p \
+./genkicat -p \
     -L /home/qi/kicad-libs/components  \
     /home/qi/kicad-libs/components/EXPAND DESC >out.pdf