diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index bdd7b758b2..85c3e884d9 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  * \author Herbert Voß
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Julien Rioux
  * \author Jürgen Spitzmüller
  *
diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index ca5cdad366..f4051bf225 100644
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -6,7 +6,7 @@
  *
  * \author Angus Leeming
  * \author Herbert Voß
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Julien Rioux
  *
  * Full author contact details are available in file CREDITS.
diff --git a/src/CiteEnginesList.cpp b/src/CiteEnginesList.cpp
index aeb60dd56a..6a1cef1a11 100644
--- a/src/CiteEnginesList.cpp
+++ b/src/CiteEnginesList.cpp
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
diff --git a/src/CiteEnginesList.h b/src/CiteEnginesList.h
index 6b795b47af..2979f004bc 100644
--- a/src/CiteEnginesList.h
+++ b/src/CiteEnginesList.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
diff --git a/src/Counters.cpp b/src/Counters.cpp
index a955d02399..519cb27346 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -6,7 +6,7 @@
  * \author Lars Gullik Bjønnes
  * \author Martin Vermeer
  * \author André Pönitz
- * \author Richard Heck (roman numerals)
+ * \author Richard Kimberly Heck (roman numerals)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/DocumentClassPtr.h b/src/DocumentClassPtr.h
index 42479b3137..62e79e25e4 100644
--- a/src/DocumentClassPtr.h
+++ b/src/DocumentClassPtr.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/Graph.cpp b/src/Graph.cpp
index 86694eea58..0165bdacc9 100644
--- a/src/Graph.cpp
+++ b/src/Graph.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur (original code)
- * \author Richard Heck (re-implementation)
+ * \author Richard Kimberly Heck (re-implementation)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/Graph.h b/src/Graph.h
index 2f5de3de36..3f3404052f 100644
--- a/src/Graph.h
+++ b/src/Graph.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur (original code)
- * \author Richard Heck (re-implementation)
+ * \author Richard Kimberly Heck (re-implementation)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index f2b27a118d..87548187ed 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (typedefs and such)
+ * \author Richard Kimberly Heck (typedefs and such)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/LayoutModuleList.h b/src/LayoutModuleList.h
index aa9925109d..868c1cf945 100644
--- a/src/LayoutModuleList.h
+++ b/src/LayoutModuleList.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index d283058046..d8fd34cc72 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/ModuleList.h b/src/ModuleList.h
index 1095f9ee64..b3327f7528 100644
--- a/src/ModuleList.h
+++ b/src/ModuleList.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/OutputEnums.h b/src/OutputEnums.h
index 3ab787b381..436fab7dbd 100644
--- a/src/OutputEnums.h
+++ b/src/OutputEnums.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8bcc165250..bd16ca4402 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -5,7 +5,7 @@
  *
  * \author Asger Alstrup
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (XHTML output)
+ * \author Richard Kimberly Heck (XHTML output)
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
diff --git a/src/frontends/qt/GuiCitation.cpp b/src/frontends/qt/GuiCitation.cpp
index a263ddf2cf..4f34a0fa1a 100644
--- a/src/frontends/qt/GuiCitation.cpp
+++ b/src/frontends/qt/GuiCitation.cpp
@@ -7,7 +7,7 @@
  * \author Angus Leeming
  * \author Kalle Dalheimer
  * \author Abdelrazak Younes
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/GuiCitation.h b/src/frontends/qt/GuiCitation.h
index 6859b7337e..36a3eb2324 100644
--- a/src/frontends/qt/GuiCitation.h
+++ b/src/frontends/qt/GuiCitation.h
@@ -7,7 +7,7 @@
  * \author Angus Leeming
  * \author Kalle Dalheimer
  * \author Abdelrazak Younes
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 4918381327..3025a2691f 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
- * \author Richard Heck (modules)
+ * \author Richard Kimberly Heck (modules)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/GuiDocument.h b/src/frontends/qt/GuiDocument.h
index 76bdd65488..b6a51c5b74 100644
--- a/src/frontends/qt/GuiDocument.h
+++ b/src/frontends/qt/GuiDocument.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
- * \author Richard Heck (modules)
+ * \author Richard Kimberly Heck (modules)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/GuiGraphics.cpp b/src/frontends/qt/GuiGraphics.cpp
index 10764c19ca..b20fed7d01 100644
--- a/src/frontends/qt/GuiGraphics.cpp
+++ b/src/frontends/qt/GuiGraphics.cpp
@@ -7,7 +7,7 @@
  * \author John Levon
  * \author Edwin Leuven
  * \author Herbert Voß
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/GuiIdListModel.cpp b/src/frontends/qt/GuiIdListModel.cpp
index d38a087f7c..fc0c7daa1b 100644
--- a/src/frontends/qt/GuiIdListModel.cpp
+++ b/src/frontends/qt/GuiIdListModel.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Some of this code is based upon qstringlistmodel.{h,cpp}, which is
  * part of the Qt toolkit, copyright (C) 1992-2007 Trolltech ASA, and
diff --git a/src/frontends/qt/GuiIdListModel.h b/src/frontends/qt/GuiIdListModel.h
index 53da3ecd06..bc1592e05f 100644
--- a/src/frontends/qt/GuiIdListModel.h
+++ b/src/frontends/qt/GuiIdListModel.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Some of this code is based upon qstringlistmodel.{h,cpp}, which is
  * part of the Qt toolkit, copyright (C) 1992-2007 Trolltech ASA, and
diff --git a/src/frontends/qt/GuiParagraph.cpp b/src/frontends/qt/GuiParagraph.cpp
index 2b78fb471b..3f1e64f219 100644
--- a/src/frontends/qt/GuiParagraph.cpp
+++ b/src/frontends/qt/GuiParagraph.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Abdelrazak Younes
  * \author Angus Leeming
  *
diff --git a/src/frontends/qt/GuiSelectionManager.cpp b/src/frontends/qt/GuiSelectionManager.cpp
index 5732d1efa0..b5c34ee7f2 100644
--- a/src/frontends/qt/GuiSelectionManager.cpp
+++ b/src/frontends/qt/GuiSelectionManager.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Et Alia
  *
  * Some of the material in this file previously appeared in
diff --git a/src/frontends/qt/GuiSelectionManager.h b/src/frontends/qt/GuiSelectionManager.h
index dbf93893e9..905b259904 100644
--- a/src/frontends/qt/GuiSelectionManager.h
+++ b/src/frontends/qt/GuiSelectionManager.h
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  * \author Et Alia
  *
  * Full author contact details are available in file CREDITS.
diff --git a/src/frontends/qt/Validator.cpp b/src/frontends/qt/Validator.cpp
index c0f5c27e57..7c97345ccf 100644
--- a/src/frontends/qt/Validator.cpp
+++ b/src/frontends/qt/Validator.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/Validator.h b/src/frontends/qt/Validator.h
index 87a1a1c91f..1ece3a471e 100644
--- a/src/frontends/qt/Validator.h
+++ b/src/frontends/qt/Validator.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  *
diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp
index ee71aa1b7e..27fe094c12 100644
--- a/src/frontends/qt/qt_helpers.cpp
+++ b/src/frontends/qt/qt_helpers.cpp
@@ -5,7 +5,7 @@
  *
  * \author Dekel Tsur
  * \author Jürgen Spitzmüller
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/qt_helpers.h b/src/frontends/qt/qt_helpers.h
index 102c0137de..73f7db9ef6 100644
--- a/src/frontends/qt/qt_helpers.h
+++ b/src/frontends/qt/qt_helpers.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/frontends/qt/qt_i18n.h b/src/frontends/qt/qt_i18n.h
index 0111f5e198..66b5f8ac58 100644
--- a/src/frontends/qt/qt_i18n.h
+++ b/src/frontends/qt/qt_i18n.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 20ae1f2ac9..6566c4e521 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author Richard Heck (BibTeX parser improvements)
+ * \author Richard Kimberly Heck (BibTeX parser improvements)
  * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index c3df45a36a..09c9ee85a0 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  * \author Georg Baum
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 3e33054d48..1800fb599d 100644
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -6,7 +6,7 @@
  *
  * \author Angus Leeming
  * \author Georg Baum
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 45c5a236d1..ccee25f4ab 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (conversion to InsetCommand)
+ * \author Richard Kimberly Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index a2542543e3..4b589ca4d8 100644
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (conversion to InsetCommand)
+ * \author Richard Kimberly Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 5b5308ddcf..c5ed2daa86 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 88143d5faa..2b9fc02497 100644
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/output_docbook.h b/src/output_docbook.h
index 401018d6dc..a65e0c8f84 100644
--- a/src/output_docbook.h
+++ b/src/output_docbook.h
@@ -7,7 +7,7 @@
  * \author Lars Gullik Bjønnes
  * \author José Matos
  * \author Thibaut Cuvelier
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 60be35c9a1..f1bcfb879b 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * This code is based upon output_docbook.cpp
  *
diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index e9ca2716b8..3877fb0c7b 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */