Regenerated copyrights: canonicalized names, no emails

29 files changed, 73 insertions, 73 deletions

diff --git a/src/theory/bv/bitblast_strategies.cpp b/src/theory/bv/bitblast_strategies.cpp
index 265523c18..bc7da8786 100644
--- a/src/theory/bv/bitblast_strategies.cpp
+++ b/src/theory/bv/bitblast_strategies.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bitblast_strategies.cpp
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
  ** Major contributors: none
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Minor contributors (to current version): Clark Barrett, Dejan Jovanovic, Morgan Deters, lianah, Tim King
  ** 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/bv/bitblast_strategies.h b/src/theory/bv/bitblast_strategies.h
index 3d9ba5936..cb29e430b 100644
--- a/src/theory/bv/bitblast_strategies.h
+++ b/src/theory/bv/bitblast_strategies.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bitblast_strategies.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
  ** 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/bv/bitblaster.cpp b/src/theory/bv/bitblaster.cpp
index 5f99e33db..cf841bb56 100644
--- a/src/theory/bv/bitblaster.cpp
+++ b/src/theory/bv/bitblaster.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bitblaster.cpp
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Morgan Deters, lianah
  ** 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/bv/bitblaster.h b/src/theory/bv/bitblaster.h
index d4ba482ed..2c52a2670 100644
--- a/src/theory/bv/bitblaster.h
+++ b/src/theory/bv/bitblaster.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bitblaster.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
  ** Major contributors: none
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): lianah, 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/bv/bv_inequality_graph.cpp b/src/theory/bv/bv_inequality_graph.cpp
index 760a38a16..ccdfc1583 100644
--- a/src/theory/bv/bv_inequality_graph.cpp
+++ b/src/theory/bv/bv_inequality_graph.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_inequality_graph.cpp
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
+ ** 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/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h
index fcb48ed61..200c49195 100644
--- a/src/theory/bv/bv_inequality_graph.h
+++ b/src/theory/bv/bv_inequality_graph.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file bv_inequality_graph.h
  ** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: lianah
+ ** Major contributors: Liana Hadarean
  ** 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/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h
index ea0eedabb..8374a3f75 100644
--- a/src/theory/bv/bv_subtheory.h
+++ b/src/theory/bv/bv_subtheory.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_subtheory.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Dejan Jovanovic, lianah
+ ** 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/bv/bv_subtheory_bitblast.cpp b/src/theory/bv/bv_subtheory_bitblast.cpp
index 1fbab8514..237b04172 100644
--- a/src/theory/bv/bv_subtheory_bitblast.cpp
+++ b/src/theory/bv/bv_subtheory_bitblast.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_subtheory_bitblast.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: lianah
+ ** Minor contributors (to current version): Liana Hadarean, 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/bv/bv_subtheory_bitblast.h b/src/theory/bv/bv_subtheory_bitblast.h
index d295b0ee7..1eef61daf 100644
--- a/src/theory/bv/bv_subtheory_bitblast.h
+++ b/src/theory/bv/bv_subtheory_bitblast.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_subtheory_bitblast.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, lianah
+ ** Minor contributors (to current version): Liana Hadarean
  ** 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/bv/bv_subtheory_core.cpp b/src/theory/bv/bv_subtheory_core.cpp
index 5853eed50..a1c8f0e9a 100644
--- a/src/theory/bv/bv_subtheory_core.cpp
+++ b/src/theory/bv/bv_subtheory_core.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file bv_subtheory_core.cpp
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
  ** 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/bv/bv_subtheory_core.h b/src/theory/bv/bv_subtheory_core.h
index a460c91fa..423408a7c 100644
--- a/src/theory/bv/bv_subtheory_core.h
+++ b/src/theory/bv/bv_subtheory_core.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_subtheory_core.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
+ ** 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/bv/bv_subtheory_inequality.cpp b/src/theory/bv/bv_subtheory_inequality.cpp
index 15b51d2c8..40093f070 100644
--- a/src/theory/bv/bv_subtheory_inequality.cpp
+++ b/src/theory/bv/bv_subtheory_inequality.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file bv_subtheory_inequality.cpp
  ** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: lianah
+ ** Major contributors: Liana Hadarean
  ** 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/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h
index d79ea6e1c..390a329ff 100644
--- a/src/theory/bv/bv_subtheory_inequality.h
+++ b/src/theory/bv/bv_subtheory_inequality.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file bv_subtheory_inequality.h
  ** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
+ ** Original author: lianah
  ** Major contributors: none
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>
+ ** Minor contributors (to current version): Liana Hadarean
  ** 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/bv/cd_set_collection.h b/src/theory/bv/cd_set_collection.h
index 518043ec0..01aeeab91 100644
--- a/src/theory/bv/cd_set_collection.h
+++ b/src/theory/bv/cd_set_collection.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cd_set_collection.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
  ** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, 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/bv/slicer.cpp b/src/theory/bv/slicer.cpp
index fd344aed5..e8e4ff84b 100644
--- a/src/theory/bv/slicer.cpp
+++ b/src/theory/bv/slicer.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file slicer.cpp
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
  ** 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/bv/slicer.h b/src/theory/bv/slicer.h
index 7da12fc6d..fefbad756 100644
--- a/src/theory/bv/slicer.h
+++ b/src/theory/bv/slicer.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file slicer.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
  ** 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/bv/theory_bv.cpp b/src/theory/bv/theory_bv.cpp
index 39fc68823..228a4d8a3 100644
--- a/src/theory/bv/theory_bv.cpp
+++ b/src/theory/bv/theory_bv.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean, lianah
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, Clark Barrett
  ** 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/bv/theory_bv.h b/src/theory/bv/theory_bv.h
index c0c8823c1..8b184f972 100644
--- a/src/theory/bv/theory_bv.h
+++ b/src/theory/bv/theory_bv.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: lianah <lianahady@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: lianah, Dejan Jovanovic, Liana Hadarean
+ ** Minor contributors (to current version): Clark Barrett, Tim King, Andrew Reynolds
  ** 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/bv/theory_bv_rewrite_rules.h b/src/theory/bv/theory_bv_rewrite_rules.h
index 4000fe77e..e9a3494f0 100644
--- a/src/theory/bv/theory_bv_rewrite_rules.h
+++ b/src/theory/bv/theory_bv_rewrite_rules.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean
+ ** Minor contributors (to current version): Tim King, Clark Barrett, 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/bv/theory_bv_rewrite_rules_constant_evaluation.h b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
index c7ce164eb..a5368d2c9 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules_constant_evaluation.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): lianah, Morgan Deters, Tim King
  ** 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/bv/theory_bv_rewrite_rules_core.h b/src/theory/bv/theory_bv_rewrite_rules_core.h
index e6260e074..43acfef75 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_core.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_core.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules_core.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
  ** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, Clark Barrett, Liana Hadarean, 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/bv/theory_bv_rewrite_rules_normalization.h b/src/theory/bv/theory_bv_rewrite_rules_normalization.h
index 28ae9d0b3..4ba09ef67 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_normalization.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_normalization.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules_normalization.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters, Tim King
  ** 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/bv/theory_bv_rewrite_rules_operator_elimination.h b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
index 6f54f5a52..06ddc215d 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules_operator_elimination.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Morgan Deters, Tim King
  ** 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/bv/theory_bv_rewrite_rules_simplification.h b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
index 20e143d2f..bcfb189af 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_simplification.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewrite_rules_simplification.h
  ** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Morgan Deters, Dejan Jovanovic, Tim King
  ** 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/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp
index b16c426e6..a712a8391 100644
--- a/src/theory/bv/theory_bv_rewriter.cpp
+++ b/src/theory/bv/theory_bv_rewriter.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewriter.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean
+ ** Minor contributors (to current version): Tim King, Morgan Deters, Clark Barrett
  ** 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/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h
index 1ef936028..183b5e8d5 100644
--- a/src/theory/bv/theory_bv_rewriter.h
+++ b/src/theory/bv/theory_bv_rewriter.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_rewriter.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean
+ ** Minor contributors (to current version): Tim King
  ** 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/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h
index af331237c..00284e7ae 100644
--- a/src/theory/bv/theory_bv_type_rules.h
+++ b/src/theory/bv/theory_bv_type_rules.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file theory_bv_type_rules.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean, Morgan Deters, Christopher L. Conway
  ** 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/bv/theory_bv_utils.h b/src/theory/bv/theory_bv_utils.h
index 77e36860d..dffdf10df 100644
--- a/src/theory/bv/theory_bv_utils.h
+++ b/src/theory/bv/theory_bv_utils.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_utils.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: lianah, Liana Hadarean
+ ** Minor contributors (to current version): Clark Barrett, 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/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h
index b68d199ec..01741737f 100644
--- a/src/theory/bv/type_enumerator.h
+++ b/src/theory/bv/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.