diff --git a/npa/doc/Doxyfile.in b/npa/doc/Doxyfile.in
index 28a331b..01da733 100644
--- a/npa/doc/Doxyfile.in
+++ b/npa/doc/Doxyfile.in
@@ -1,7 +1,7 @@
 FILE_PATTERNS          = *.h
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
-GENERATE_TAGFILE       = @builddir@/@PACKAGE_NAME@.tag
+GENERATE_TAGFILE       = @builddir@/@PACKAGE@.tag
 GENERATE_XML           = YES
 INPUT                  = @top_srcdir@/src/npa
 OPTIMIZE_OUTPUT_FOR_C  = YES
diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am
index e3bab45..f25e105 100644
--- a/npa/doc/Makefile.am
+++ b/npa/doc/Makefile.am
@@ -1,6 +1,7 @@
 DOXYGEN ?= doxygen
 
 do_subst = sed \
+	   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
 	   -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \
 	   -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
diff --git a/npa/doc/api.rst b/npa/doc/api.rst
index 83d4bcc..31de7ac 100644
--- a/npa/doc/api.rst
+++ b/npa/doc/api.rst
@@ -51,12 +51,6 @@ Interface to German identity card (neuer Personalausweis, nPA)
 The complete documentation can be found `here
 <_static/doxygen-npa/group__npa.html>`__.
 
------
-Types
------
-.. doxygenstruct:: establish_pace_channel_input
-.. doxygenstruct:: establish_pace_channel_output
-
 ---------
 Functions
 ---------