diff --git a/gencat/Makefile b/gencat/Makefile
index 09b9b31..51b19a1 100644
--- a/gencat/Makefile
+++ b/gencat/Makefile
@@ -11,7 +11,7 @@
 
 PREFIX ?= /usr/local
 
-OBJS = gencat.o tree.o libs.o pdf.o
+OBJS = gencat.o tree.o comp.o pdf.o
 
 SHELL = /bin/bash
 CFLAGS = -Wall -g
diff --git a/gencat/libs.c b/gencat/comp.c
similarity index 98%
rename from gencat/libs.c
rename to gencat/comp.c
index 0f357e1..9c66d2b 100644
--- a/gencat/libs.c
+++ b/gencat/comp.c
@@ -1,5 +1,5 @@
 /*
- * libs.c - Component libraries
+ * comp.c - Component libraries
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -18,7 +18,7 @@
 #include <dirent.h>
 
 #include "util.h"
-#include "libs.h"
+#include "comp.h"
 
 
 struct entry {
diff --git a/gencat/libs.h b/gencat/comp.h
similarity index 86%
rename from gencat/libs.h
rename to gencat/comp.h
index 35a7b46..8305873 100644
--- a/gencat/libs.h
+++ b/gencat/comp.h
@@ -1,5 +1,5 @@
 /*
- * libs.h - Component libraries
+ * comp.h - Component libraries
  *
  * Copyright 2012 by Werner Almesberger
  *
@@ -9,8 +9,8 @@
  * (at your option) any later version.
  */
 
-#ifndef LIBS_H
-#define LIBS_H
+#ifndef COMP_H
+#define COMP_H
 
 struct name {
 	const char *s;
@@ -21,4 +21,4 @@ const char *lookup_sym(const char *name, const struct name **names, int *units);
 void add_lib(const char *path);
 void add_libdir(const char *path);
 
-#endif /* !LIBS_H */
+#endif /* !COMP_H */
diff --git a/gencat/gencat.c b/gencat/gencat.c
index 78097d9..31bc32e 100644
--- a/gencat/gencat.c
+++ b/gencat/gencat.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include "tree.h"
-#include "libs.h"
+#include "comp.h"
 #include "pdf.h"
 #include "gencat.h"
 
diff --git a/gencat/tree.h b/gencat/tree.h
index 29fa8f2..23e04fc 100644
--- a/gencat/tree.h
+++ b/gencat/tree.h
@@ -12,7 +12,7 @@
 #ifndef TREE_H
 #define TREE_H
 
-#include "libs.h"
+#include "comp.h"
 
 
 struct line {