Regenerated copyrights: canonicalized names, no emails

40 files changed, 77 insertions, 77 deletions

diff --git a/src/theory/arith/arith_heuristic_pivot_rule.cpp b/src/theory/arith/arith_heuristic_pivot_rule.cpp
index 6d0794d27..4fbc84892 100644
--- a/src/theory/arith/arith_heuristic_pivot_rule.cpp
+++ b/src/theory/arith/arith_heuristic_pivot_rule.cpp
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_heuristic_pivot_rule.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_heuristic_pivot_rule.h b/src/theory/arith/arith_heuristic_pivot_rule.h
index 6c1b17a5b..a1ecc5b2c 100644
--- a/src/theory/arith/arith_heuristic_pivot_rule.h
+++ b/src/theory/arith/arith_heuristic_pivot_rule.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_heuristic_pivot_rule.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_priority_queue.cpp b/src/theory/arith/arith_priority_queue.cpp
index d9bdde5d5..9fc30c136 100644
--- a/src/theory/arith/arith_priority_queue.cpp
+++ b/src/theory/arith/arith_priority_queue.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file arith_priority_queue.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/arith_priority_queue.h b/src/theory/arith/arith_priority_queue.h
index 695a981cb..912799dde 100644
--- a/src/theory/arith/arith_priority_queue.h
+++ b/src/theory/arith/arith_priority_queue.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arith_priority_queue.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/arith_propagation_mode.cpp b/src/theory/arith/arith_propagation_mode.cpp
index bd87bbab8..23ca96056 100644
--- a/src/theory/arith/arith_propagation_mode.cpp
+++ b/src/theory/arith/arith_propagation_mode.cpp
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_propagation_mode.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_propagation_mode.h b/src/theory/arith/arith_propagation_mode.h
index 0d3db014e..97867043f 100644
--- a/src/theory/arith/arith_propagation_mode.h
+++ b/src/theory/arith/arith_propagation_mode.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_propagation_mode.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp
index 41e8c2542..aa5049ed4 100644
--- a/src/theory/arith/arith_rewriter.cpp
+++ b/src/theory/arith/arith_rewriter.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arith_rewriter.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Morgan Deters, Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h
index 8c9aba83e..91b4099ab 100644
--- a/src/theory/arith/arith_rewriter.h
+++ b/src/theory/arith/arith_rewriter.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file arith_rewriter.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/arith_static_learner.cpp b/src/theory/arith/arith_static_learner.cpp
index 551fd819b..a4dfb1fa4 100644
--- a/src/theory/arith/arith_static_learner.cpp
+++ b/src/theory/arith/arith_static_learner.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file arith_static_learner.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h
index 0414e2f09..c4bf92a16 100644
--- a/src/theory/arith/arith_static_learner.h
+++ b/src/theory/arith/arith_static_learner.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arith_static_learner.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/arith_unate_lemma_mode.cpp b/src/theory/arith/arith_unate_lemma_mode.cpp
index b3efaf1a0..ec7e81cf3 100644
--- a/src/theory/arith/arith_unate_lemma_mode.cpp
+++ b/src/theory/arith/arith_unate_lemma_mode.cpp
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_unate_lemma_mode.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_unate_lemma_mode.h b/src/theory/arith/arith_unate_lemma_mode.h
index 3f8214889..212ea85b1 100644
--- a/src/theory/arith/arith_unate_lemma_mode.h
+++ b/src/theory/arith/arith_unate_lemma_mode.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arith_unate_lemma_mode.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h
index a68eb6568..2efd895f2 100644
--- a/src/theory/arith/arith_utilities.h
+++ b/src/theory/arith/arith_utilities.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arith_utilities.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/arithvar.cpp b/src/theory/arith/arithvar.cpp
index cbcdfb866..ce05383da 100644
--- a/src/theory/arith/arithvar.cpp
+++ b/src/theory/arith/arithvar.cpp
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file arithvar.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arithvar.h b/src/theory/arith/arithvar.h
index 7e2573394..e6cecff3f 100644
--- a/src/theory/arith/arithvar.h
+++ b/src/theory/arith/arithvar.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arithvar.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h
index 17e9a8f56..552beb82c 100644
--- a/src/theory/arith/arithvar_node_map.h
+++ b/src/theory/arith/arithvar_node_map.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file arithvar_node_map.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/congruence_manager.cpp b/src/theory/arith/congruence_manager.cpp
index 8af9152db..c10d59234 100644
--- a/src/theory/arith/congruence_manager.cpp
+++ b/src/theory/arith/congruence_manager.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file congruence_manager.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h
index 5edcbe435..b0a4467bf 100644
--- a/src/theory/arith/congruence_manager.h
+++ b/src/theory/arith/congruence_manager.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file congruence_manager.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp
index 3132f869f..28b999852 100644
--- a/src/theory/arith/constraint.cpp
+++ b/src/theory/arith/constraint.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file constraint.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h
index 26af01e63..e1c55f113 100644
--- a/src/theory/arith/constraint.h
+++ b/src/theory/arith/constraint.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file constraint.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h
index 65c950ab5..f01c64b60 100644
--- a/src/theory/arith/constraint_forward.h
+++ b/src/theory/arith/constraint_forward.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file constraint_forward.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/delta_rational.cpp b/src/theory/arith/delta_rational.cpp
index b6394887d..811658df8 100644
--- a/src/theory/arith/delta_rational.cpp
+++ b/src/theory/arith/delta_rational.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file delta_rational.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/delta_rational.h b/src/theory/arith/delta_rational.h
index 2a280f634..e97bde555 100644
--- a/src/theory/arith/delta_rational.h
+++ b/src/theory/arith/delta_rational.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file delta_rational.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/dio_solver.cpp b/src/theory/arith/dio_solver.cpp
index e090e5b62..a0a932bb4 100644
--- a/src/theory/arith/dio_solver.cpp
+++ b/src/theory/arith/dio_solver.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file dio_solver.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h
index 87e9f5215..b940bce76 100644
--- a/src/theory/arith/dio_solver.h
+++ b/src/theory/arith/dio_solver.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file dio_solver.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/linear_equality.cpp b/src/theory/arith/linear_equality.cpp
index 81501fc53..7229eba95 100644
--- a/src/theory/arith/linear_equality.cpp
+++ b/src/theory/arith/linear_equality.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file linear_equality.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/linear_equality.h b/src/theory/arith/linear_equality.h
index 39da88faa..14df8d819 100644
--- a/src/theory/arith/linear_equality.h
+++ b/src/theory/arith/linear_equality.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file linear_equality.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/matrix.cpp b/src/theory/arith/matrix.cpp
index 3ddc73666..9fee74324 100644
--- a/src/theory/arith/matrix.cpp
+++ b/src/theory/arith/matrix.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file matrix.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/matrix.h b/src/theory/arith/matrix.h
index 9d4cee0e1..51c2114a0 100644
--- a/src/theory/arith/matrix.h
+++ b/src/theory/arith/matrix.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file matrix.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/normal_form.cpp b/src/theory/arith/normal_form.cpp
index b0c225461..8454ca210 100644
--- a/src/theory/arith/normal_form.cpp
+++ b/src/theory/arith/normal_form.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file normal_form.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h
index 24d295fb5..bcf9cbfa4 100644
--- a/src/theory/arith/normal_form.h
+++ b/src/theory/arith/normal_form.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file normal_form.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/options_handlers.h b/src/theory/arith/options_handlers.h
index 06c367687..1e2ab379a 100644
--- a/src/theory/arith/options_handlers.h
+++ b/src/theory/arith/options_handlers.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file options_handlers.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/theory/arith/partial_model.cpp b/src/theory/arith/partial_model.cpp
index 33ce5dcdf..6bbaa1e5e 100644
--- a/src/theory/arith/partial_model.cpp
+++ b/src/theory/arith/partial_model.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file partial_model.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h
index f3cf5164b..820b1b909 100644
--- a/src/theory/arith/partial_model.h
+++ b/src/theory/arith/partial_model.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file partial_model.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/simplex.cpp b/src/theory/arith/simplex.cpp
index 8f8a9b261..ea8fefc6f 100644
--- a/src/theory/arith/simplex.cpp
+++ b/src/theory/arith/simplex.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file simplex.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h
index a1f451059..a20920257 100644
--- a/src/theory/arith/simplex.h
+++ b/src/theory/arith/simplex.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file simplex.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp
index 0ed10d4aa..8c31c02ac 100644
--- a/src/theory/arith/theory_arith.cpp
+++ b/src/theory/arith/theory_arith.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_arith.cpp
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Kshitij Bansal, Andrew Reynolds, Morgan Deters, Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h
index a63a0bbb3..0e5a7e7e4 100644
--- a/src/theory/arith/theory_arith.h
+++ b/src/theory/arith/theory_arith.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_arith.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h
index 32def6116..cc8451f8b 100644
--- a/src/theory/arith/theory_arith_type_rules.h
+++ b/src/theory/arith/theory_arith_type_rules.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file theory_arith_type_rules.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Christopher L. Conway, Morgan Deters
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
diff --git a/src/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h
index dc6ff4b1f..30cfe20cd 100644
--- a/src/theory/arith/type_enumerator.h
+++ b/src/theory/arith/type_enumerator.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_enumerator.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.