Regenerated copyrights: canonicalized names, no emails

38 files changed, 83 insertions, 83 deletions

diff --git a/src/expr/attribute.cpp b/src/expr/attribute.cpp
index d1d50cad5..20d52e3cc 100644
--- a/src/expr/attribute.cpp
+++ b/src/expr/attribute.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file attribute.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: 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/expr/attribute.h b/src/expr/attribute.h
index 440ebfbe0..b155b3a1c 100644
--- a/src/expr/attribute.h
+++ b/src/expr/attribute.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file attribute.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Christopher L. Conway, 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/expr/attribute_internals.h b/src/expr/attribute_internals.h
index d3d8c7ca0..d7a61e32c 100644
--- a/src/expr/attribute_internals.h
+++ b/src/expr/attribute_internals.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file attribute_internals.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** 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/expr/command.cpp b/src/expr/command.cpp
index b370894d2..3a88a6cba 100644
--- a/src/expr/command.cpp
+++ b/src/expr/command.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file command.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Kshitij Bansal, Dejan Jovanovic, 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/expr/command.h b/src/expr/command.h
index da67a8290..38a8b1efa 100644
--- a/src/expr/command.h
+++ b/src/expr/command.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file command.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Kshitij Bansal, Christopher L. Conway, Dejan Jovanovic, Francois Bobot, 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/expr/convenience_node_builders.h b/src/expr/convenience_node_builders.h
index ff1fd6e5c..93b8d460d 100644
--- a/src/expr/convenience_node_builders.h
+++ b/src/expr/convenience_node_builders.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file convenience_node_builders.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/expr/expr_manager_scope.h b/src/expr/expr_manager_scope.h
index 4dfbe2cf7..ea5452eac 100644
--- a/src/expr/expr_manager_scope.h
+++ b/src/expr/expr_manager_scope.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file expr_manager_scope.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** 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/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp
index 242c772e7..524bc2095 100644
--- a/src/expr/expr_manager_template.cpp
+++ b/src/expr/expr_manager_template.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_manager_template.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic, Christopher L. Conway
+ ** Minor contributors (to current version): Kshitij Bansal, 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/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index 7b5ea953f..fd81c9bf8 100644
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_manager_template.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Andrew Reynolds, Tim King, Christopher L. Conway
  ** 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/expr/expr_stream.h b/src/expr/expr_stream.h
index 10c8ee2ee..edfa4ba07 100644
--- a/src/expr/expr_stream.h
+++ b/src/expr/expr_stream.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file expr_stream.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/expr/expr_template.cpp b/src/expr/expr_template.cpp
index 707baa935..7e809ed62 100644
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_template.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, Kshitij Bansal, Christopher L. Conway
  ** 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/expr/expr_template.h b/src/expr/expr_template.h
index eb8a588c6..7772de81e 100644
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_template.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Liana Hadarean, Kshitij Bansal, Tim King, Christopher L. Conway
  ** 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/expr/kind_map.h b/src/expr/kind_map.h
index a7cae2259..e66f8c3b3 100644
--- a/src/expr/kind_map.h
+++ b/src/expr/kind_map.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file kind_map.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
  ** 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/expr/kind_template.h b/src/expr/kind_template.h
index 1b50567b4..b98a9a373 100644
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file kind_template.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: 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/expr/metakind_template.h b/src/expr/metakind_template.h
index ddb6515aa..10b67b4d6 100644
--- a/src/expr/metakind_template.h
+++ b/src/expr/metakind_template.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file metakind_template.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** 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/expr/node.cpp b/src/expr/node.cpp
index 78085ba8c..30f7ce8b9 100644
--- a/src/expr/node.cpp
+++ b/src/expr/node.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file node.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** 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/expr/node.h b/src/expr/node.h
index 5857eedcb..7003aae87 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Francois Bobot, Tim King, Clark Barrett, Christopher L. Conway
  ** 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/expr/node_builder.h b/src/expr/node_builder.h
index bd3827f47..773828ccb 100644
--- a/src/expr/node_builder.h
+++ b/src/expr/node_builder.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_builder.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Christopher L. Conway
  ** 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/expr/node_manager.cpp b/src/expr/node_manager.cpp
index d0a58b5d8..cc890b9b9 100644
--- a/src/expr/node_manager.cpp
+++ b/src/expr/node_manager.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_manager.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, Morgan Deters
+ ** Minor contributors (to current version): ACSYS, 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/expr/node_manager.h b/src/expr/node_manager.h
index 4706d8872..0c62d31c5 100644
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_manager.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, Morgan Deters
+ ** Minor contributors (to current version): ACSYS, Tim King, Kshitij Bansal
  ** 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/expr/node_self_iterator.h b/src/expr/node_self_iterator.h
index a4977f817..e1cca1aef 100644
--- a/src/expr/node_self_iterator.h
+++ b/src/expr/node_self_iterator.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file node_self_iterator.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/expr/node_value.cpp b/src/expr/node_value.cpp
index 452ac85d1..ed7a8add3 100644
--- a/src/expr/node_value.cpp
+++ b/src/expr/node_value.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_value.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** 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/expr/node_value.h b/src/expr/node_value.h
index aa6491c9c..13fdc6a7f 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_value.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Christopher L. Conway, Tim King, 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/expr/options_handlers.h b/src/expr/options_handlers.h
index a111c5d96..1959c10c4 100644
--- a/src/expr/options_handlers.h
+++ b/src/expr/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/expr/pickle_data.cpp b/src/expr/pickle_data.cpp
index f329a4dad..e80e20fc8 100644
--- a/src/expr/pickle_data.cpp
+++ b/src/expr/pickle_data.cpp
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file pickle_data.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/expr/pickle_data.h b/src/expr/pickle_data.h
index 29ddb8c80..b9c20f27a 100644
--- a/src/expr/pickle_data.h
+++ b/src/expr/pickle_data.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file pickle_data.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/expr/pickler.cpp b/src/expr/pickler.cpp
index 8cd3140c0..065805a65 100644
--- a/src/expr/pickler.cpp
+++ b/src/expr/pickler.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file pickler.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, Kshitij Bansal
  ** 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/expr/pickler.h b/src/expr/pickler.h
index bedfd212a..afaf72600 100644
--- a/src/expr/pickler.h
+++ b/src/expr/pickler.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file pickler.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal
  ** 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/expr/symbol_table.cpp b/src/expr/symbol_table.cpp
index 05c344777..e36219a81 100644
--- a/src/expr/symbol_table.cpp
+++ b/src/expr/symbol_table.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file symbol_table.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic, Francois Bobot
  ** 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/expr/symbol_table.h b/src/expr/symbol_table.h
index 464d00376..63a7e299b 100644
--- a/src/expr/symbol_table.h
+++ b/src/expr/symbol_table.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file symbol_table.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic, Francois Bobot
  ** 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/expr/type.cpp b/src/expr/type.cpp
index 020b18a6c..71c25bd50 100644
--- a/src/expr/type.cpp
+++ b/src/expr/type.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file type.cpp
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
+ ** Minor contributors (to current version): 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/expr/type.h b/src/expr/type.h
index 5a4a59fb2..5e4e86264 100644
--- a/src/expr/type.h
+++ b/src/expr/type.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file type.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
+ ** Minor contributors (to current version): 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/expr/type_checker.h b/src/expr/type_checker.h
index 25764bf70..ac461bb7b 100644
--- a/src/expr/type_checker.h
+++ b/src/expr/type_checker.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_checker.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/expr/type_checker_template.cpp b/src/expr/type_checker_template.cpp
index 69e52ba95..aa7039f52 100644
--- a/src/expr/type_checker_template.cpp
+++ b/src/expr/type_checker_template.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file type_checker_template.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>
+ ** Minor contributors (to current version): 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/expr/type_node.cpp b/src/expr/type_node.cpp
index 003e26cb7..e654b5d71 100644
--- a/src/expr/type_node.cpp
+++ b/src/expr/type_node.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file type_node.cpp
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Morgan Deters
+ ** Minor contributors (to current version): 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/expr/type_node.h b/src/expr/type_node.h
index 9e3b4deda..35d630a91 100644
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file type_node.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett, Andrew Reynolds, 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/expr/type_properties_template.h b/src/expr/type_properties_template.h
index 8e251302d..fc68fcf8c 100644
--- a/src/expr/type_properties_template.h
+++ b/src/expr/type_properties_template.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_properties_template.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/expr/variable_type_map.h b/src/expr/variable_type_map.h
index cbafcfc31..416850622 100644
--- a/src/expr/variable_type_map.h
+++ b/src/expr/variable_type_map.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file variable_type_map.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.