Regenerated copyrights: canonicalized names, no emails

56 files changed, 102 insertions, 102 deletions

diff --git a/test/unit/context/cdlist_black.h b/test/unit/context/cdlist_black.h
index 3987cd2f7..a969ebd42 100644
--- a/test/unit/context/cdlist_black.h
+++ b/test/unit/context/cdlist_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdlist_black.h
  ** \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>
+ ** 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/test/unit/context/cdlist_context_memory_black.h b/test/unit/context/cdlist_context_memory_black.h
index cc049a568..fed2df5cb 100644
--- a/test/unit/context/cdlist_context_memory_black.h
+++ b/test/unit/context/cdlist_context_memory_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdlist_context_memory_black.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/test/unit/context/cdmap_black.h b/test/unit/context/cdmap_black.h
index 731c1406d..3ec697dd9 100644
--- a/test/unit/context/cdmap_black.h
+++ b/test/unit/context/cdmap_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdmap_black.h
  ** \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>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): 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/test/unit/context/cdmap_white.h b/test/unit/context/cdmap_white.h
index c2d350f94..e71d2b4ad 100644
--- a/test/unit/context/cdmap_white.h
+++ b/test/unit/context/cdmap_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdmap_white.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/test/unit/context/cdo_black.h b/test/unit/context/cdo_black.h
index 65dff6197..c665423ac 100644
--- a/test/unit/context/cdo_black.h
+++ b/test/unit/context/cdo_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file cdo_black.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/test/unit/context/cdvector_black.h b/test/unit/context/cdvector_black.h
index 7f9b5bfd7..54fdd277e 100644
--- a/test/unit/context/cdvector_black.h
+++ b/test/unit/context/cdvector_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdvector_black.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/test/unit/context/context_black.h b/test/unit/context/context_black.h
index 45ba0d066..bc7f5a639 100644
--- a/test/unit/context/context_black.h
+++ b/test/unit/context/context_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file context_black.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/test/unit/context/context_mm_black.h b/test/unit/context/context_mm_black.h
index 80793c532..8c249996d 100644
--- a/test/unit/context/context_mm_black.h
+++ b/test/unit/context/context_mm_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file context_mm_black.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/test/unit/context/context_white.h b/test/unit/context/context_white.h
index a8bbcfdb6..0461e9124 100644
--- a/test/unit/context/context_white.h
+++ b/test/unit/context/context_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file context_white.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/test/unit/context/stacking_map_black.h b/test/unit/context/stacking_map_black.h
index f1f13d765..92a9546c2 100644
--- a/test/unit/context/stacking_map_black.h
+++ b/test/unit/context/stacking_map_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file stacking_map_black.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/test/unit/context/stacking_vector_black.h b/test/unit/context/stacking_vector_black.h
index 70220727a..82966a564 100644
--- a/test/unit/context/stacking_vector_black.h
+++ b/test/unit/context/stacking_vector_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file stacking_vector_black.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/test/unit/expr/attribute_black.h b/test/unit/expr/attribute_black.h
index 87e18302f..b27d556c1 100644
--- a/test/unit/expr/attribute_black.h
+++ b/test/unit/expr/attribute_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file attribute_black.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Tim King
+ ** Minor contributors (to current version): 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/test/unit/expr/attribute_white.h b/test/unit/expr/attribute_white.h
index b0edcd1a2..11a3d85c8 100644
--- a/test/unit/expr/attribute_white.h
+++ b/test/unit/expr/attribute_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file attribute_white.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>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Christopher L. Conway, 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/test/unit/expr/expr_manager_public.h b/test/unit/expr/expr_manager_public.h
index 8cb2db74f..d5929a266 100644
--- a/test/unit/expr/expr_manager_public.h
+++ b/test/unit/expr/expr_manager_public.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_manager_public.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Christopher L. Conway
  ** 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/test/unit/expr/expr_public.h b/test/unit/expr/expr_public.h
index d16491f77..c66b5cb1f 100644
--- a/test/unit/expr/expr_public.h
+++ b/test/unit/expr/expr_public.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file expr_public.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway, Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, 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/test/unit/expr/kind_black.h b/test/unit/expr/kind_black.h
index 319cfb7ac..d591f0c9f 100644
--- a/test/unit/expr/kind_black.h
+++ b/test/unit/expr/kind_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file kind_black.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/test/unit/expr/kind_map_black.h b/test/unit/expr/kind_map_black.h
index 67968d997..605dd92b5 100644
--- a/test/unit/expr/kind_map_black.h
+++ b/test/unit/expr/kind_map_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file kind_map_black.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/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index 8649075d8..8e8263fe7 100644
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_black.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** Minor contributors (to current version): Christopher L. Conway, 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/test/unit/expr/node_builder_black.h b/test/unit/expr/node_builder_black.h
index 478460248..1467b90c5 100644
--- a/test/unit/expr/node_builder_black.h
+++ b/test/unit/expr/node_builder_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_builder_black.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Christopher L. Conway, 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/test/unit/expr/node_manager_black.h b/test/unit/expr/node_manager_black.h
index 24b9cc80a..8c70dfdcf 100644
--- a/test/unit/expr/node_manager_black.h
+++ b/test/unit/expr/node_manager_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_manager_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
+ ** 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/test/unit/expr/node_manager_white.h b/test/unit/expr/node_manager_white.h
index aca8cfe3c..26872846e 100644
--- a/test/unit/expr/node_manager_white.h
+++ b/test/unit/expr/node_manager_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_manager_white.h
  ** \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>
+ ** 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/test/unit/expr/node_self_iterator_black.h b/test/unit/expr/node_self_iterator_black.h
index 07ca96579..31de84643 100644
--- a/test/unit/expr/node_self_iterator_black.h
+++ b/test/unit/expr/node_self_iterator_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file node_self_iterator_black.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/test/unit/expr/node_white.h b/test/unit/expr/node_white.h
index 66a6b1482..58ef7134f 100644
--- a/test/unit/expr/node_white.h
+++ b/test/unit/expr/node_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file node_white.h
  ** \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>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): 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/test/unit/expr/symbol_table_black.h b/test/unit/expr/symbol_table_black.h
index 74b58c527..386bcaa91 100644
--- a/test/unit/expr/symbol_table_black.h
+++ b/test/unit/expr/symbol_table_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file symbol_table_black.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** 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/test/unit/expr/type_cardinality_public.h b/test/unit/expr/type_cardinality_public.h
index 1b5090ebe..2441b7b0d 100644
--- a/test/unit/expr/type_cardinality_public.h
+++ b/test/unit/expr/type_cardinality_public.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_cardinality_public.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/test/unit/expr/type_node_white.h b/test/unit/expr/type_node_white.h
index 7417636ca..ae6e00616 100644
--- a/test/unit/expr/type_node_white.h
+++ b/test/unit/expr/type_node_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_node_white.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/test/unit/main/interactive_shell_black.h b/test/unit/main/interactive_shell_black.h
index 6e31ed21e..fa2a3f0e2 100644
--- a/test/unit/main/interactive_shell_black.h
+++ b/test/unit/main/interactive_shell_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file interactive_shell_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Christopher L. Conway
  ** 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/test/unit/memory.h b/test/unit/memory.h
index 42b91d314..44eec00d0 100644
--- a/test/unit/memory.h
+++ b/test/unit/memory.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file memory.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/test/unit/parser/parser_black.h b/test/unit/parser/parser_black.h
index a1e87ce9f..1dbaf7cdf 100644
--- a/test/unit/parser/parser_black.h
+++ b/test/unit/parser/parser_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file parser_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/test/unit/parser/parser_builder_black.h b/test/unit/parser/parser_builder_black.h
index da29dd1a6..58432ff86 100644
--- a/test/unit/parser/parser_builder_black.h
+++ b/test/unit/parser/parser_builder_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file parser_builder_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Christopher L. Conway
  ** 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/test/unit/prop/cnf_stream_white.h b/test/unit/prop/cnf_stream_white.h
index d1d420f42..e71dcb41d 100644
--- a/test/unit/prop/cnf_stream_white.h
+++ b/test/unit/prop/cnf_stream_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cnf_stream_white.h
  ** \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): Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic, Christopher L. Conway
+ ** 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/test/unit/theory/logic_info_white.h b/test/unit/theory/logic_info_white.h
index 8b576a266..a0d415296 100644
--- a/test/unit/theory/logic_info_white.h
+++ b/test/unit/theory/logic_info_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file logic_info_white.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/test/unit/theory/stacking_map_black.h b/test/unit/theory/stacking_map_black.h
index 27a162244..d867ef7fa 100644
--- a/test/unit/theory/stacking_map_black.h
+++ b/test/unit/theory/stacking_map_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file stacking_map_black.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/test/unit/theory/theory_arith_white.h b/test/unit/theory/theory_arith_white.h
index 4f2ea6998..844fb57d1 100644
--- a/test/unit/theory/theory_arith_white.h
+++ b/test/unit/theory/theory_arith_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_arith_white.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/test/unit/theory/theory_black.h b/test/unit/theory/theory_black.h
index 5a40ab099..8ea9f42a7 100644
--- a/test/unit/theory/theory_black.h
+++ b/test/unit/theory/theory_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_black.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Clark Barrett
+ ** 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/test/unit/theory/theory_bv_white.h b/test/unit/theory/theory_bv_white.h
index 24c17e413..1dbc36e5f 100644
--- a/test/unit/theory/theory_bv_white.h
+++ b/test/unit/theory/theory_bv_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_bv_white.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/test/unit/theory/theory_engine_white.h b/test/unit/theory/theory_engine_white.h
index c9e0f5517..c9bea1795 100644
--- a/test/unit/theory/theory_engine_white.h
+++ b/test/unit/theory/theory_engine_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_engine_white.h
  ** \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>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, 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/test/unit/theory/theory_white.h b/test/unit/theory/theory_white.h
index e2894ae07..126f57060 100644
--- a/test/unit/theory/theory_white.h
+++ b/test/unit/theory/theory_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file theory_white.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett, 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/test/unit/theory/type_enumerator_white.h b/test/unit/theory/type_enumerator_white.h
index c497d1a94..4e80b7d20 100644
--- a/test/unit/theory/type_enumerator_white.h
+++ b/test/unit/theory/type_enumerator_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file type_enumerator_white.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/test/unit/util/array_store_all_black.h b/test/unit/util/array_store_all_black.h
index 9091c7797..094368703 100644
--- a/test/unit/util/array_store_all_black.h
+++ b/test/unit/util/array_store_all_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file array_store_all_black.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/test/unit/util/assert_white.h b/test/unit/util/assert_white.h
index c318a2d1e..6ecd013c9 100644
--- a/test/unit/util/assert_white.h
+++ b/test/unit/util/assert_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file assert_white.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/test/unit/util/bitvector_black.h b/test/unit/util/bitvector_black.h
index 214c63291..505aa3e7f 100644
--- a/test/unit/util/bitvector_black.h
+++ b/test/unit/util/bitvector_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file bitvector_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h
index c79f46f65..e032f48cc 100644
--- a/test/unit/util/boolean_simplification_black.h
+++ b/test/unit/util/boolean_simplification_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file boolean_simplification_black.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/test/unit/util/cardinality_public.h b/test/unit/util/cardinality_public.h
index c4f867dbd..8d05f96f8 100644
--- a/test/unit/util/cardinality_public.h
+++ b/test/unit/util/cardinality_public.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file cardinality_public.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/test/unit/util/configuration_black.h b/test/unit/util/configuration_black.h
index 807ebdf2a..978b73eab 100644
--- a/test/unit/util/configuration_black.h
+++ b/test/unit/util/configuration_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file configuration_black.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/test/unit/util/datatype_black.h b/test/unit/util/datatype_black.h
index 0289a247a..d88d72b85 100644
--- a/test/unit/util/datatype_black.h
+++ b/test/unit/util/datatype_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file datatype_black.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** 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/test/unit/util/exception_black.h b/test/unit/util/exception_black.h
index f21f784f8..1dab7c6a6 100644
--- a/test/unit/util/exception_black.h
+++ b/test/unit/util/exception_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file exception_black.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/test/unit/util/integer_black.h b/test/unit/util/integer_black.h
index b35f75f74..48f32a307 100644
--- a/test/unit/util/integer_black.h
+++ b/test/unit/util/integer_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file integer_black.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): 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/test/unit/util/integer_white.h b/test/unit/util/integer_white.h
index e3f9b5527..70b692412 100644
--- a/test/unit/util/integer_white.h
+++ b/test/unit/util/integer_white.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file integer_white.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/test/unit/util/output_black.h b/test/unit/util/output_black.h
index ec878d63d..c507d8552 100644
--- a/test/unit/util/output_black.h
+++ b/test/unit/util/output_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file output_black.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/test/unit/util/rational_black.h b/test/unit/util/rational_black.h
index 0df1b26c8..7cd4c4ce4 100644
--- a/test/unit/util/rational_black.h
+++ b/test/unit/util/rational_black.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file rational_black.h
  ** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/test/unit/util/rational_white.h b/test/unit/util/rational_white.h
index 6c437af60..b9d0002f8 100644
--- a/test/unit/util/rational_white.h
+++ b/test/unit/util/rational_white.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file rational_white.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/test/unit/util/recursion_breaker_black.h b/test/unit/util/recursion_breaker_black.h
index 5f7482300..9cbecae93 100644
--- a/test/unit/util/recursion_breaker_black.h
+++ b/test/unit/util/recursion_breaker_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file recursion_breaker_black.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/test/unit/util/stats_black.h b/test/unit/util/stats_black.h
index e6b55b57b..3e3f6b942 100644
--- a/test/unit/util/stats_black.h
+++ b/test/unit/util/stats_black.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file stats_black.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/test/unit/util/subrange_bound_white.h b/test/unit/util/subrange_bound_white.h
index 4b3e8ce76..2261c0bbb 100644
--- a/test/unit/util/subrange_bound_white.h
+++ b/test/unit/util/subrange_bound_white.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file subrange_bound_white.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/test/unit/util/trans_closure_black.h b/test/unit/util/trans_closure_black.h
index d1e9073b2..f2ae8fbe1 100644
--- a/test/unit/util/trans_closure_black.h
+++ b/test/unit/util/trans_closure_black.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file trans_closure_black.h
  ** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
  ** 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