diff --git a/doc/src/pair_quip.rst b/doc/src/pair_quip.rst
index d40d4c3179..96a6e21767 100644
--- a/doc/src/pair_quip.rst
+++ b/doc/src/pair_quip.rst
@@ -29,7 +29,7 @@ from GitHub:
 `https://github.com/libAtoms/QUIP <https://github.com/libAtoms/QUIP>`_. The
 interface is chiefly intended to be used to run Gaussian Approximation
 Potentials (GAP), which are described in the following publications:
-:ref:`(Bartok et al) <Bartok2010>` and :ref:`(PhD thesis of Bartok) <Bartok_PhD>`.
+:ref:`(Bartok et al) <Bartok_2010>` and :ref:`(PhD thesis of Bartok) <Bartok_PhD>`.
 
 Only a single pair_coeff command is used with the *quip* style that
 specifies a QUIP potential file containing the parameters of the
diff --git a/doc/utils/sphinx-config/conf.py.in b/doc/utils/sphinx-config/conf.py.in
index e2451cd4f1..d12decf1a2 100644
--- a/doc/utils/sphinx-config/conf.py.in
+++ b/doc/utils/sphinx-config/conf.py.in
@@ -383,6 +383,12 @@ man_pages = [
 #man_show_urls = False
 
 
+# strip off LAMMPS_NS:: from index entries
+cpp_index_common_prefix = [
+    'LAMMPS_NS::',
+    '_LMP_STYLE_CONST::', '_LMP_TYPE_CONST::', '_LMP_VAR_CONST::',
+]
+
 # -- Options for Texinfo output -------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples