25 files changed, 36 insertions, 36 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 7e1614320d..283d8573b4 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
 # Copyright 2001 Gerald Combs
 #
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 410aba44ee..059a6b75af 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index aded30f365..a2bb2ecd61 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index f2f16d783f..370d73865a 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c
index 1b949b2ea5..485ab5bc4d 100644
--- a/epan/dfilter/dfunctions.c
+++ b/epan/dfilter/dfunctions.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * 
  * Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
  *
diff --git a/epan/dfilter/dfunctions.h b/epan/dfilter/dfunctions.h
index 3e7ca3f0de..8abf520ecc 100644
--- a/epan/dfilter/dfunctions.h
+++ b/epan/dfilter/dfunctions.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * 
  * Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
  *
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index ad3a467243..9d368abb18 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index da773b7759..cdc8f96453 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index 5a374ea786..13a52f5ad4 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs
  * Copyright 1999 Gerald Combs
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index 6a139681fc..e5d5be1f22 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs
  * Copyright 1999 Gerald Combs
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index 5da0b1c2ad..e7ac516fd4 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index 545c923c85..4697c891cb 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -2,8 +2,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  * 
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 9e91bff0e5..9949f9f021 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.h b/epan/dfilter/semcheck.h
index fec5d80e96..14851a4bfd 100644
--- a/epan/dfilter/semcheck.h
+++ b/epan/dfilter/semcheck.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c
index c6c8a5af83..0cbdb3fd70 100644
--- a/epan/dfilter/sttype-function.c
+++ b/epan/dfilter/sttype-function.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2006 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/epan/dfilter/sttype-function.h b/epan/dfilter/sttype-function.h
index b93f2e3273..fb8e7085a7 100644
--- a/epan/dfilter/sttype-function.h
+++ b/epan/dfilter/sttype-function.h
@@ -1,7 +1,7 @@
 /*
  * $Id: sttype-test.h 11400 2004-07-18 00:24:25Z guy $
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index c8765dac0f..5017fc4ac9 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index 3879fdae14..a5e90bb396 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index c1be33af6c..775ec51412 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/sttype-range.h b/epan/dfilter/sttype-range.h
index b4fc480148..66c97bf349 100644
--- a/epan/dfilter/sttype-range.h
+++ b/epan/dfilter/sttype-range.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-string.c b/epan/dfilter/sttype-string.c
index bc92d8ae8b..c24c1609e7 100644
--- a/epan/dfilter/sttype-string.c
+++ b/epan/dfilter/sttype-string.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 9a0408efaf..b8a9668779 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/sttype-test.h b/epan/dfilter/sttype-test.h
index ad615f0a4d..855e0dd79f 100644
--- a/epan/dfilter/sttype-test.h
+++ b/epan/dfilter/sttype-test.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 62b54d97fe..51bb0879f3 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index d57c850f90..635feeda32 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or