diff --git a/examples/SimpleRotation.cpp b/examples/SimpleRotation.cpp
index 1079ca3d0..09385132a 100644
--- a/examples/SimpleRotation.cpp
+++ b/examples/SimpleRotation.cpp
@@ -15,8 +15,8 @@
  * This is a super-simple example of optimizing a single rotation according to a single prior
  *
  *  Created on: Jul 1, 2010
- *  @Author: Frank Dellaert
- *  @Author: Alex Cunningham
+ *  @author Frank Dellaert
+ *  @author Alex Cunningham
  */
 
 #include <cmath>
diff --git a/examples/easyPoint2KalmanFilter.cpp b/examples/easyPoint2KalmanFilter.cpp
index a1d67b651..075006c69 100644
--- a/examples/easyPoint2KalmanFilter.cpp
+++ b/examples/easyPoint2KalmanFilter.cpp
@@ -17,8 +17,8 @@
  * operations as in elaboratePoint2KalmanFilter
  *
  *  Created on: Aug 19, 2011
- *  @Author: Frank Dellaert
- *  @Author: Stephen Williams
+ *  @author Frank Dellaert
+ *  @author Stephen Williams
  */
 
 #include <gtsam/nonlinear/ExtendedKalmanFilter-inl.h>
diff --git a/examples/elaboratePoint2KalmanFilter.cpp b/examples/elaboratePoint2KalmanFilter.cpp
index 5a767e364..d46b1e0ba 100644
--- a/examples/elaboratePoint2KalmanFilter.cpp
+++ b/examples/elaboratePoint2KalmanFilter.cpp
@@ -16,8 +16,8 @@
  * This example manually creates all of the needed data structures
  *
  *  Created on: Aug 19, 2011
- *  @Author: Frank Dellaert
- *  @Author: Stephen Williams
+ *  @author Frank Dellaert
+ *  @author Stephen Williams
  */
 
 #include <gtsam/slam/PriorFactor.h>
diff --git a/gtsam/base/BTree.h b/gtsam/base/BTree.h
index 56bc0f4de..69db4d3a0 100644
--- a/gtsam/base/BTree.h
+++ b/gtsam/base/BTree.h
@@ -12,8 +12,8 @@
 /**
  *  Created on: Feb 3, 2010
  *  @brief: purely functional binary tree
- *  @Author: Chris Beall
- *  @Author: Frank Dellaert
+ *  @author Chris Beall
+ *  @author Frank Dellaert
  */
 
 #include <stack>
diff --git a/gtsam/base/tests/testBTree.cpp b/gtsam/base/tests/testBTree.cpp
index da6b56015..e6b4c5e7c 100644
--- a/gtsam/base/tests/testBTree.cpp
+++ b/gtsam/base/tests/testBTree.cpp
@@ -13,8 +13,8 @@
  * testBTree.cpp
  *
  *  Created on: Feb 3, 2010
- *  @Author: Chris Beall
- *  @Author: Frank Dellaert
+ *  @author Chris Beall
+ *  @author Frank Dellaert
  */
 
 #include <boost/shared_ptr.hpp>
diff --git a/gtsam/inference/JunctionTree-inl.h b/gtsam/inference/JunctionTree-inl.h
index a2a613f59..ed0033d91 100644
--- a/gtsam/inference/JunctionTree-inl.h
+++ b/gtsam/inference/JunctionTree-inl.h
@@ -12,8 +12,8 @@
 /*
  * JunctionTree-inl.h
  * Created on: Feb 4, 2010
- * @Author: Kai Ni
- * @Author: Frank Dellaert
+ * @author Kai Ni
+ * @author Frank Dellaert
  * @brief: The junction tree, template bodies
  */
 
diff --git a/gtsam/inference/JunctionTree.h b/gtsam/inference/JunctionTree.h
index f1e85db0b..2395a62a3 100644
--- a/gtsam/inference/JunctionTree.h
+++ b/gtsam/inference/JunctionTree.h
@@ -12,8 +12,8 @@
 /*
  * JunctionTree.h
  * Created on: Feb 4, 2010
- * @Author: Kai Ni
- * @Author: Frank Dellaert
+ * @author Kai Ni
+ * @author Frank Dellaert
  * @brief: The junction tree
  */
 
diff --git a/gtsam/linear/KalmanFilter.cpp b/gtsam/linear/KalmanFilter.cpp
index 5e84961af..227c270d7 100644
--- a/gtsam/linear/KalmanFilter.cpp
+++ b/gtsam/linear/KalmanFilter.cpp
@@ -16,8 +16,8 @@
  * Implemented using factor graphs, i.e., does LDL-based SRIF, really.
  *
  *  Created on: Sep 3, 2011
- *  @Author: Stephen Williams
- *  @Author: Frank Dellaert
+ *  @author Stephen Williams
+ *  @author Frank Dellaert
  */
 
 #include <gtsam/linear/GaussianSequentialSolver.h>
diff --git a/gtsam/linear/KalmanFilter.h b/gtsam/linear/KalmanFilter.h
index 3d803fea7..34580104a 100644
--- a/gtsam/linear/KalmanFilter.h
+++ b/gtsam/linear/KalmanFilter.h
@@ -16,8 +16,8 @@
  * Implemented using factor graphs, i.e., does LDL-based SRIF, really.
  *
  *  Created on: Sep 3, 2011
- *  @Author: Stephen Williams
- *  @Author: Frank Dellaert
+ *  @author Stephen Williams
+ *  @author Frank Dellaert
  */
 
 #include <gtsam/linear/GaussianConditional.h>
diff --git a/gtsam/linear/SharedDiagonal.h b/gtsam/linear/SharedDiagonal.h
index 335a9373d..a81696256 100644
--- a/gtsam/linear/SharedDiagonal.h
+++ b/gtsam/linear/SharedDiagonal.h
@@ -12,7 +12,7 @@
 /**
  * SharedDiagonal.h
  * @brief Class that wraps a shared noise model with diagonal covariance
- * @Author: Frank Dellaert
+ * @author Frank Dellaert
  * Created on: Jan 22, 2010
  */
 
diff --git a/gtsam/linear/SharedGaussian.h b/gtsam/linear/SharedGaussian.h
index e7853c989..520f3d858 100644
--- a/gtsam/linear/SharedGaussian.h
+++ b/gtsam/linear/SharedGaussian.h
@@ -12,7 +12,7 @@
 /**
  * SharedGaussian.h
  * @brief Class that wraps a shared noise model with diagonal covariance
- * @Author: Frank Dellaert
+ * @author Frank Dellaert
  * Created on: Jan 22, 2010
  */
 
diff --git a/gtsam/linear/tests/testErrors.cpp b/gtsam/linear/tests/testErrors.cpp
index 6fbb5bcbf..a5e10d709 100644
--- a/gtsam/linear/tests/testErrors.cpp
+++ b/gtsam/linear/tests/testErrors.cpp
@@ -13,7 +13,7 @@
  * testErrors.cpp
  *
  *  Created on: Feb 20, 2010
- *  @Author: Frank Dellaert
+ *  @author Frank Dellaert
  */
 
 #include <boost/assign/std/list.hpp> // for +=
diff --git a/gtsam/linear/tests/testKalmanFilter.cpp b/gtsam/linear/tests/testKalmanFilter.cpp
index bf771fae1..285f0d1b9 100644
--- a/gtsam/linear/tests/testKalmanFilter.cpp
+++ b/gtsam/linear/tests/testKalmanFilter.cpp
@@ -15,8 +15,8 @@
  * Test simple linear Kalman filter on a moving 2D point
  *
  *  Created on: Sep 3, 2011
- *  @Author: Stephen Williams
- *  @Author: Frank Dellaert
+ *  @author Stephen Williams
+ *  @author Frank Dellaert
  */
 
 #include <gtsam/linear/KalmanFilter.h>
diff --git a/gtsam/nonlinear/LieValues.h b/gtsam/nonlinear/LieValues.h
index 0cd65f273..63687b984 100644
--- a/gtsam/nonlinear/LieValues.h
+++ b/gtsam/nonlinear/LieValues.h
@@ -11,7 +11,7 @@
 
 /**
  * @file LieValues.h
- * @Author: Richard Roberts
+ * @author Richard Roberts
  *
  * @brief A templated config for Lie-group elements
  *
diff --git a/gtsam/nonlinear/NonlinearOptimizer-inl.h b/gtsam/nonlinear/NonlinearOptimizer-inl.h
index 15f39df1d..1102df92f 100644
--- a/gtsam/nonlinear/NonlinearOptimizer-inl.h
+++ b/gtsam/nonlinear/NonlinearOptimizer-inl.h
@@ -14,7 +14,7 @@
  * This is a template definition file, include it where needed (only!)
  * so that the appropriate code is generated and link errors avoided.
  * @brief: Encapsulates nonlinear optimization state
- * @Author: Frank Dellaert
+ * @author Frank Dellaert
  * Created on: Sep 7, 2009
  */
 
diff --git a/gtsam/nonlinear/NonlinearOptimizer.cpp b/gtsam/nonlinear/NonlinearOptimizer.cpp
index 31c3e5fa4..e5cbfeecf 100644
--- a/gtsam/nonlinear/NonlinearOptimizer.cpp
+++ b/gtsam/nonlinear/NonlinearOptimizer.cpp
@@ -12,7 +12,7 @@
 /**
  * NonlinearOptimizer.cpp
  * @brief: Convergence functions not dependent on graph types
- * @Author: Frank Dellaert
+ * @author Frank Dellaert
  * Created on: Jul 17, 2010
  */
 
diff --git a/gtsam/nonlinear/NonlinearOptimizer.h b/gtsam/nonlinear/NonlinearOptimizer.h
index 3474ca1d2..5cd5ca863 100644
--- a/gtsam/nonlinear/NonlinearOptimizer.h
+++ b/gtsam/nonlinear/NonlinearOptimizer.h
@@ -12,7 +12,7 @@
 /**
  * NonlinearOptimizer.h
  * @brief: Encapsulates nonlinear optimization state
- * @Author: Frank Dellaert
+ * @author Frank Dellaert
  * Created on: Sep 7, 2009
  */