diff --git a/src/lib-managesieve/managesieve-parser.c b/src/lib-managesieve/managesieve-parser.c
index 5f4a7dbbfbe9db1c492931e194fad09498ba3c97..2a79344ecc597e66650050ab1e9d4c9031e32dae 100644
--- a/src/lib-managesieve/managesieve-parser.c
+++ b/src/lib-managesieve/managesieve-parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-managesieve/managesieve-parser.h b/src/lib-managesieve/managesieve-parser.h
index dd12ae34a6a604fb16d3316475ccc586fa8b500f..caf3fa2baf1d2458dd0db215b346dcedb38f75aa 100644
--- a/src/lib-managesieve/managesieve-parser.h
+++ b/src/lib-managesieve/managesieve-parser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_PARSER_H
diff --git a/src/lib-managesieve/managesieve-quote.c b/src/lib-managesieve/managesieve-quote.c
index 15f8334d6f75354342ef137487a6507bd149ef44..1be1e62a7195ad87a887f703aff05b5ca06a0034 100644
--- a/src/lib-managesieve/managesieve-quote.c
+++ b/src/lib-managesieve/managesieve-quote.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-managesieve/managesieve-quote.h b/src/lib-managesieve/managesieve-quote.h
index 423cc8a6091a2681d8b34bccb6d884725d24af35..1c5c15bbf0b8dae8cbf1e2cd146171876aaacc0f 100644
--- a/src/lib-managesieve/managesieve-quote.h
+++ b/src/lib-managesieve/managesieve-quote.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __IMAP_QUOTE_H
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index 1caf70beb6193dbf9ee5bdfb38bc2f1b420fcaa9..9aebd8ad57a7ed395e1ebbefa2535df68ed9f8b7 100644
--- a/src/lib-sieve-tool/mail-raw.c
+++ b/src/lib-sieve-tool/mail-raw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* FIXME: This file was gratefully stolen from dovecot/src/deliver/deliver.c and 
diff --git a/src/lib-sieve-tool/mail-raw.h b/src/lib-sieve-tool/mail-raw.h
index 68943049aa1b4fcfd6ca4d4d319d02d8a265a758..8e672ad3058c57b6788e08883653a80a3f475680 100644
--- a/src/lib-sieve-tool/mail-raw.h
+++ b/src/lib-sieve-tool/mail-raw.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MAIL_RAW_H
diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index 9c7a19cae719ca24a38c225eade244c2a3f39fb1..35827436bcc171e6130a98de0a3b996c700340c6 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h
index 948334a3228c18a4bb89ec924ffc01d939decaaf..da1e4a91fcea40dfe3ddff0647cd8de32c1f461c 100644
--- a/src/lib-sieve-tool/sieve-tool.h
+++ b/src/lib-sieve-tool/sieve-tool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_TOOL_H
diff --git a/src/lib-sieve/cmd-discard.c b/src/lib-sieve/cmd-discard.c
index 0fcece096d739658271490763af9e6b2bbfb3931..91bfdb5cd77663b92fbafd56d7c8923bda28d388 100644
--- a/src/lib-sieve/cmd-discard.c
+++ b/src/lib-sieve/cmd-discard.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-if.c b/src/lib-sieve/cmd-if.c
index 2d2aaae61b0f89eff8a327053585b7b4d6501aeb..0c471bd362c655c8c6783cfbfd9af054866a430d 100644
--- a/src/lib-sieve/cmd-if.c
+++ b/src/lib-sieve/cmd-if.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/cmd-keep.c b/src/lib-sieve/cmd-keep.c
index 7f56149306cbd7cc7b6e390acfe1fddfdae0a850..7f734ce3578ca9a9f379b6480d6b43b44e2823a8 100644
--- a/src/lib-sieve/cmd-keep.c
+++ b/src/lib-sieve/cmd-keep.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-redirect.c b/src/lib-sieve/cmd-redirect.c
index dcf991647718aa1e270bb4e16aa592f0c1b19fac..5701047c0c39103116fa1e9f48601d9f90f69989 100644
--- a/src/lib-sieve/cmd-redirect.c
+++ b/src/lib-sieve/cmd-redirect.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-require.c b/src/lib-sieve/cmd-require.c
index 2a0448c51a663a845ba5c051c4af45c6ed31241e..38afd431823e91acd83e61ae064f02e5e1158076 100644
--- a/src/lib-sieve/cmd-require.c
+++ b/src/lib-sieve/cmd-require.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-stop.c b/src/lib-sieve/cmd-stop.c
index 41e158d4215deddb4d4ca5c7e8089c6a8562e7f7..b28469ed1cc5e6092aff93b69f2a06b4dfc333e5 100644
--- a/src/lib-sieve/cmd-stop.c
+++ b/src/lib-sieve/cmd-stop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/cmp-i-ascii-casemap.c b/src/lib-sieve/cmp-i-ascii-casemap.c
index 692d852306a3c537b910599305c653fa704c33ed..35dcaf1df4d037bb1d113bc79872c83e58be695a 100644
--- a/src/lib-sieve/cmp-i-ascii-casemap.c
+++ b/src/lib-sieve/cmp-i-ascii-casemap.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 /* Comparator 'i;ascii-casemap': 
diff --git a/src/lib-sieve/cmp-i-octet.c b/src/lib-sieve/cmp-i-octet.c
index 944af7651065789668088e8c03e382194c732980..7ca123dab00f216f76b30a5951ef1ff8067e7d79 100644
--- a/src/lib-sieve/cmp-i-octet.c
+++ b/src/lib-sieve/cmp-i-octet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 /* Comparator 'i;octet': 
diff --git a/src/lib-sieve/ext-encoded-character.c b/src/lib-sieve/ext-encoded-character.c
index 3a7fe33459e7893fc7b993e8a2d4014da08275e2..29e7ba35716a5c38da9ef0c56836cf24a5999069 100644
--- a/src/lib-sieve/ext-encoded-character.c
+++ b/src/lib-sieve/ext-encoded-character.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension encoded-character
diff --git a/src/lib-sieve/ext-envelope.c b/src/lib-sieve/ext-envelope.c
index 2de4996200e70f208f95d92c6478b91fb5e674ff..92064737e442ab8dd19cf674f559ba1b3cbc9b15 100644
--- a/src/lib-sieve/ext-envelope.c
+++ b/src/lib-sieve/ext-envelope.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension envelope
diff --git a/src/lib-sieve/ext-fileinto.c b/src/lib-sieve/ext-fileinto.c
index 80b4b8b9eeceb69dd6af389979605e86732d767e..63a83f30e1a7dcc9223318f364556513942c0e70 100644
--- a/src/lib-sieve/ext-fileinto.c
+++ b/src/lib-sieve/ext-fileinto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension fileinto
diff --git a/src/lib-sieve/ext-reject.c b/src/lib-sieve/ext-reject.c
index 8663da25cf80cdd17d849760fd149707412513f6..c4d5cf57c0dd37d64cb293aea879df5235d8b3b9 100644
--- a/src/lib-sieve/ext-reject.c
+++ b/src/lib-sieve/ext-reject.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension reject
diff --git a/src/lib-sieve/mcht-contains.c b/src/lib-sieve/mcht-contains.c
index 23b2afa4359baa67b58580238324d58b1160f8fb..ac99c7f582419bb424c086746c01145dd8d61750 100644
--- a/src/lib-sieve/mcht-contains.c
+++ b/src/lib-sieve/mcht-contains.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 /* Match-type ':contains' 
diff --git a/src/lib-sieve/mcht-is.c b/src/lib-sieve/mcht-is.c
index c3ac2fab3dc34e110ab097a680c6b7b4b61deb64..eaf7885d8f823adf7445b8b6805baead1fe4a408 100644
--- a/src/lib-sieve/mcht-is.c
+++ b/src/lib-sieve/mcht-is.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 /* Match-type ':is': 
diff --git a/src/lib-sieve/mcht-matches.c b/src/lib-sieve/mcht-matches.c
index e14f1dd6a21d0f43e4f5e008b1a62f22bdbd5716..72a18b03992ca2d729e6b54e8e9c1c8c33527fbc 100644
--- a/src/lib-sieve/mcht-matches.c
+++ b/src/lib-sieve/mcht-matches.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 /* Match-type ':matches' 
diff --git a/src/lib-sieve/plugins/body/ext-body-common.c b/src/lib-sieve/plugins/body/ext-body-common.c
index 2d80d8ae49f2920a8bc125c01961da3681ee680a..6fe883e245028e6b37364a81878991ed55f575f0 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.c
+++ b/src/lib-sieve/plugins/body/ext-body-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/body/ext-body-common.h b/src/lib-sieve/plugins/body/ext-body-common.h
index d2c1fa58b9a287bc611f15fea53f57d25e74a946..50cf09096b4c426d9aa1b61c75e3616bdcba7b14 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.h
+++ b/src/lib-sieve/plugins/body/ext-body-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_BODY_COMMON_H
diff --git a/src/lib-sieve/plugins/body/ext-body.c b/src/lib-sieve/plugins/body/ext-body.c
index 1df905afebf837967c623e37b3fe52bdfd352a28..1055d809fcf0152116ad1b27e012ee033ad0abac 100644
--- a/src/lib-sieve/plugins/body/ext-body.c
+++ b/src/lib-sieve/plugins/body/ext-body.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension body
diff --git a/src/lib-sieve/plugins/body/tst-body.c b/src/lib-sieve/plugins/body/tst-body.c
index 36b4a6cf843ea7cf62594062264d89b9266f4ee4..f10382cfa1eadd9cbef15c63f8c989ad90c43fc8 100644
--- a/src/lib-sieve/plugins/body/tst-body.c
+++ b/src/lib-sieve/plugins/body/tst-body.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "sieve-extensions.h"
diff --git a/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c b/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
index 5196382b101c571a1d8c4a7b49ba2400371f1a51..6c1c161673fecfff5b6474fc961a7b96910a0ba4 100644
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension comparator-i;ascii-numeric
diff --git a/src/lib-sieve/plugins/copy/ext-copy.c b/src/lib-sieve/plugins/copy/ext-copy.c
index 534272dc1a7c548b52ee80faec6a14f14a970042..f44dda7ff7e8d543a63bfc76bc2fca0350278b54 100644
--- a/src/lib-sieve/plugins/copy/ext-copy.c
+++ b/src/lib-sieve/plugins/copy/ext-copy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension copy
diff --git a/src/lib-sieve/plugins/date/ext-date-common.c b/src/lib-sieve/plugins/date/ext-date-common.c
index ce69112500f436e98295975354be8284e24c4ef0..5edaff616e92f28c55b87bf8ae8bfde2674436d1 100644
--- a/src/lib-sieve/plugins/date/ext-date-common.c
+++ b/src/lib-sieve/plugins/date/ext-date-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/date/ext-date-common.h b/src/lib-sieve/plugins/date/ext-date-common.h
index 07e578e70b016930a2f2c5d2dddc79c3609a0398..7cbe9c2f348bd815aaf862c809ffd5d3a8f5c1b3 100644
--- a/src/lib-sieve/plugins/date/ext-date-common.h
+++ b/src/lib-sieve/plugins/date/ext-date-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_DATE_COMMON_H
diff --git a/src/lib-sieve/plugins/date/ext-date.c b/src/lib-sieve/plugins/date/ext-date.c
index 4792868c17ae942e0c28a1ee5aa3d5132047b233..aa56fda3b4f882e702138ee33276a180d04fb024 100644
--- a/src/lib-sieve/plugins/date/ext-date.c
+++ b/src/lib-sieve/plugins/date/ext-date.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension date
diff --git a/src/lib-sieve/plugins/date/tst-date.c b/src/lib-sieve/plugins/date/tst-date.c
index 201cf404717ca1db7c9042796fad6ddad28a7dbd..ce6e0885d5b74c90a447219fd5abb8e986f059af 100644
--- a/src/lib-sieve/plugins/date/tst-date.c
+++ b/src/lib-sieve/plugins/date/tst-date.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/enotify/cmd-notify.c b/src/lib-sieve/plugins/enotify/cmd-notify.c
index b331e76aca5ffe23ebd49462df1df4dd0a7ffe3a..523b5dfc2ecb00ccbc52fc363710240ce7a957ca 100644
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.c b/src/lib-sieve/plugins/enotify/ext-enotify-common.c
index d4df47f0f6f8b445b362f9254595300313c42be9..86b9d13fb39be6299088e6ef11e7a48aa576c6b5 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.c
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.h b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
index 65c2274af13e0750dbba8c9aa1b362a2ff445378..b10b5bdc5053c16f31fd2e57aa5cf37857b7f392 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_ENOTIFY_COMMON_H
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
index 00db4e6ba6ea07ecb93e68ae18c3510fe383b97b..76b60787dc0fa9d086e618dc2434636eb17dcce8 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_ENOTIFY_LIMITS_H
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify.c b/src/lib-sieve/plugins/enotify/ext-enotify.c
index c5a5b6e00a8acf60cb09e190f028b00acda87961..70915ce1458ef8c45ca50cdbbbcbc7d3e2095f44 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify.c
+++ b/src/lib-sieve/plugins/enotify/ext-enotify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension enotify
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
index 946ebd359f27fc2e96bafd5005e89d332de53f0a..3083d0eb63e4f6dab92a60090e9f4962691c2063 100644
--- a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 /* Notify method mailto
diff --git a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.c b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.c
index 03d60062713fd50fc7ab3079d98a12681f556dea..dad6676778b0cd7300e756e6d280d91e5b35828f 100644
--- a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
   
 /* FIXME: URI syntax conforms to something somewhere in between RFC 2368 and
diff --git a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
index 11264739a81740e99c506478b026e06517a99b95..2d960819bd94ce6de911906d9f1b81c3f2c61ff1 100644
--- a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
+++ b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __URI_MAILTO_H
diff --git a/src/lib-sieve/plugins/enotify/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
index 17a4439fb69c484e4c05335d74d7c6711498bf0f..b42fd2d49f4c1e3f11ad08a5a567bff417af6ccc 100644
--- a/src/lib-sieve/plugins/enotify/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 /* Notify method mailto
diff --git a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
index e455d7e5b8975c83ff4b02dbab1b38fc5bb13b7c..a87edd3523d002c857ee537b5054ae74d0c5afb5 100644
--- a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
+++ b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_EXT_ENOTIFY_H
diff --git a/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c b/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
index 73c982929720fb9609001e30e6f2b3cbc70cf274..412582d092a837865581b886b4cae4ea6ae169a7 100644
--- a/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
+++ b/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include <stdio.h>
diff --git a/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c b/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
index 1774de2cc880bcf354709da2495b3e1cd98cb8f2..acbdcfa07ecffafa78fc0c63295d42cec5274020 100644
--- a/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
+++ b/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c b/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
index 0a762e74e930ce19165fa4b022690795ad29ef7a..3952860a4a1e07ebfc5420123e1e15aca093d69e 100644
--- a/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
+++ b/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/environment/ext-environment-common.c b/src/lib-sieve/plugins/environment/ext-environment-common.c
index b6ffdf04d4524e9474139abd5a3057cfffc6ce05..58fc2919fabfa3a96c36775d4fae2f4c57442ea8 100644
--- a/src/lib-sieve/plugins/environment/ext-environment-common.c
+++ b/src/lib-sieve/plugins/environment/ext-environment-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/environment/ext-environment-common.h b/src/lib-sieve/plugins/environment/ext-environment-common.h
index d3927d86aa28876f2f44c83fe325fbb1a11213f0..f644f4dc25f3a8844bd8cfd69fb8a70edb52c7c8 100644
--- a/src/lib-sieve/plugins/environment/ext-environment-common.h
+++ b/src/lib-sieve/plugins/environment/ext-environment-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_ENVIRONMENT_COMMON_H
diff --git a/src/lib-sieve/plugins/environment/ext-environment.c b/src/lib-sieve/plugins/environment/ext-environment.c
index 36de5c94ce13a3ddcaa95a14f3b778b3fac0ccd7..70ce76ffe5ace9221667733cbd54adec158e6ec8 100644
--- a/src/lib-sieve/plugins/environment/ext-environment.c
+++ b/src/lib-sieve/plugins/environment/ext-environment.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension variables
diff --git a/src/lib-sieve/plugins/environment/sieve-ext-environment.h b/src/lib-sieve/plugins/environment/sieve-ext-environment.h
index d4bc50232850b3ccac11479fad8489eedde262f6..a7bd1ad7184a739d0589af5151ebe6478062bbfc 100644
--- a/src/lib-sieve/plugins/environment/sieve-ext-environment.h
+++ b/src/lib-sieve/plugins/environment/sieve-ext-environment.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_EXT_ENVIRONMENT_H
diff --git a/src/lib-sieve/plugins/environment/tst-environment.c b/src/lib-sieve/plugins/environment/tst-environment.c
index b25ac49cb123a77f7873f0ed2fc6282baee9db56..cd84fe0bb1a1b9af61823331c595a0dc7108f4fc 100644
--- a/src/lib-sieve/plugins/environment/tst-environment.c
+++ b/src/lib-sieve/plugins/environment/tst-environment.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/imap4flags/cmd-flag.c b/src/lib-sieve/plugins/imap4flags/cmd-flag.c
index 59564da886a9c44040e255103cbefaef66d41aa8..7c7e9246a15ddcf4f34d1d4f150c7cf775d2ae0b 100644
--- a/src/lib-sieve/plugins/imap4flags/cmd-flag.c
+++ b/src/lib-sieve/plugins/imap4flags/cmd-flag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
index 63003e25a1e910a39cdef2684a98e7aa4031118c..6eef77adc1795aef7d5b84c8d4915902cf948ea5 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
index 9194463c8aa1948b4fd478ac3e1c3e0ed5a7ee71..f381f914569d142fccbe9d266fee5151c2288775 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_IMAP4FLAGS_COMMON_H
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
index f8f187ea81223c9d019c968f3f0b4df6d6a1a195..36c7494dc07fdc8bb704b976e12fa28f559ca537 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension imap4flags
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imapflags.c b/src/lib-sieve/plugins/imap4flags/ext-imapflags.c
index 350c5501af35d7ecadf58a9cd2943c28210b3a4e..030fb1916e5165b24dc18a2b1e0ce846595508b9 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imapflags.c
+++ b/src/lib-sieve/plugins/imap4flags/ext-imapflags.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension imapflags
diff --git a/src/lib-sieve/plugins/imap4flags/tag-flags.c b/src/lib-sieve/plugins/imap4flags/tag-flags.c
index fc7e708344462c578dbccdf9b07148abfa4b8d1e..d8fc8c23071ae4b1d98ff93167ac44e9d4da2ffb 100644
--- a/src/lib-sieve/plugins/imap4flags/tag-flags.c
+++ b/src/lib-sieve/plugins/imap4flags/tag-flags.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
index a3e6837a1649b91a13fdd250f4000969828ae0ae..cbfd7eb9e3c714dae45594619d19b40713d09f78 100644
--- a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
+++ b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-global.c b/src/lib-sieve/plugins/include/cmd-global.c
index 1b6fb43e8034ea9d84113dede70dcfd89abed1d2..1b8cd32fbad38feefcd6dfe7a4d010423ed74e63 100644
--- a/src/lib-sieve/plugins/include/cmd-global.c
+++ b/src/lib-sieve/plugins/include/cmd-global.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-include.c b/src/lib-sieve/plugins/include/cmd-include.c
index dd915b44cc41afbdc59258ebf0b5723690ab4dc5..0edf44556646ce5127fe8ffe49bcfc6003752c0a 100644
--- a/src/lib-sieve/plugins/include/cmd-include.c
+++ b/src/lib-sieve/plugins/include/cmd-include.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-return.c b/src/lib-sieve/plugins/include/cmd-return.c
index 3b5a71546e4aff49501276f96f8a34e464df59b2..92d59a56bf4bc32b9aed64f3bb17ccfb2e23196a 100644
--- a/src/lib-sieve/plugins/include/cmd-return.c
+++ b/src/lib-sieve/plugins/include/cmd-return.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-binary.c b/src/lib-sieve/plugins/include/ext-include-binary.c
index 35ef1e927238d2c9415d861660ad26bb717c35bc..45e9e7a787d96572a37e12090e5e74c0b60750f8 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.c
+++ b/src/lib-sieve/plugins/include/ext-include-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-binary.h b/src/lib-sieve/plugins/include/ext-include-binary.h
index d5a68cab8e13ada7369b8a89d987a0cd6b2b2f4d..0a76931f62309d19edc12805fd22d19cb0688f57 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.h
+++ b/src/lib-sieve/plugins/include/ext-include-binary.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_BINARY_H
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index a1bcf839cde8e69ff59bf68b107e7730439a7462..8e94fde8c312c5f609eac7966eb630eefdcfaad7 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-common.h b/src/lib-sieve/plugins/include/ext-include-common.h
index 34c6932cbe1d68b453914582396682298ed8006e..2cdeb4955702c95ea82cf3d4c74917e6d3bd13f6 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.h
+++ b/src/lib-sieve/plugins/include/ext-include-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_COMMON_H
diff --git a/src/lib-sieve/plugins/include/ext-include-limits.h b/src/lib-sieve/plugins/include/ext-include-limits.h
index 7ce3dfb6c6b4f641aad6731fcdb681b1dfe9f66d..723a18ce157352fc37aa3a1904aeb003db54151d 100644
--- a/src/lib-sieve/plugins/include/ext-include-limits.h
+++ b/src/lib-sieve/plugins/include/ext-include-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_LIMITS_H
diff --git a/src/lib-sieve/plugins/include/ext-include-variables.c b/src/lib-sieve/plugins/include/ext-include-variables.c
index f3c2750d79956b548e0a2aeb12315d9e43adb795..093eb19fc6ff0f6cd583d1916b2a29fea3082a03 100644
--- a/src/lib-sieve/plugins/include/ext-include-variables.c
+++ b/src/lib-sieve/plugins/include/ext-include-variables.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-variables.h b/src/lib-sieve/plugins/include/ext-include-variables.h
index 39388e5c7826609f93968e46a8f1f5a511a3b7ae..23c0aae78af81b355b5e4e7a09298bb7e2d141c5 100644
--- a/src/lib-sieve/plugins/include/ext-include-variables.h
+++ b/src/lib-sieve/plugins/include/ext-include-variables.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_VARIABLES_H
diff --git a/src/lib-sieve/plugins/include/ext-include.c b/src/lib-sieve/plugins/include/ext-include.c
index 4ca12b6c0174f90bbac7beef6d6a1f5bddd51029..738db2fdd759d2bdf9f2b801f77ddb0f46157fe7 100644
--- a/src/lib-sieve/plugins/include/ext-include.c
+++ b/src/lib-sieve/plugins/include/ext-include.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension include
diff --git a/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h b/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
index e6d1db4feab8a391485dc5e78869e3202ed0eed6..f6d518f6dcb75770806af57fa781c1036201b018 100644
--- a/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
+++ b/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_MAILBOX_COMMON_H
diff --git a/src/lib-sieve/plugins/mailbox/ext-mailbox.c b/src/lib-sieve/plugins/mailbox/ext-mailbox.c
index e556a66672c89961a86047f1e1e54668483cc5d6..8bc509e7c07417fd7cbee95e5b2cd473cf0de08e 100644
--- a/src/lib-sieve/plugins/mailbox/ext-mailbox.c
+++ b/src/lib-sieve/plugins/mailbox/ext-mailbox.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension mailbox
diff --git a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
index 7ad0d1aea72326941be3f775c6c172cf255c550a..2cf438b6ad5f827ea83ac20f8af53a37b379e8c5 100644
--- a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
+++ b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c b/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c
index 4c50b3f1962636eae687729f95c90f2aed36e1fc..21ecf67e0319e34894539fafc53ee7a683980ca8 100644
--- a/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c
+++ b/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/notify/cmd-denotify.c b/src/lib-sieve/plugins/notify/cmd-denotify.c
index 5c68d9de330c6d25691bb97730c0fb8a3711ed21..0f332fd62e5eaca218dcebc21eec81795283c185 100644
--- a/src/lib-sieve/plugins/notify/cmd-denotify.c
+++ b/src/lib-sieve/plugins/notify/cmd-denotify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/notify/cmd-notify.c b/src/lib-sieve/plugins/notify/cmd-notify.c
index b50620b08ab178b58c3bb27b8fa19d88bc857310..1b0c426626fcc2d899cc86c5f6c0e1885f2024ea 100644
--- a/src/lib-sieve/plugins/notify/cmd-notify.c
+++ b/src/lib-sieve/plugins/notify/cmd-notify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.c b/src/lib-sieve/plugins/notify/ext-notify-common.c
index f5039824f46bf204c099a7abbece2a20c33d69ef..b700719fc2ea70f7c9b864e75cc808f91d9d4df9 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-common.c
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.h b/src/lib-sieve/plugins/notify/ext-notify-common.h
index a8c482c7908a355505901bc83f316dd712a6bce1..5da1a7dc51acd3be3a90f5f1909dc0bc25a1078c 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-common.h
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_NOTIFY_COMMON_H
diff --git a/src/lib-sieve/plugins/notify/ext-notify-limits.h b/src/lib-sieve/plugins/notify/ext-notify-limits.h
index 3d4a4ca0d1ebf32563d82f3137ee860befa095b4..0c10e1a656e90fa95f11b4708c9fd7faa4258e7a 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-limits.h
+++ b/src/lib-sieve/plugins/notify/ext-notify-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_NOTIFY_LIMITS_H
diff --git a/src/lib-sieve/plugins/notify/ext-notify.c b/src/lib-sieve/plugins/notify/ext-notify.c
index 25dd0b7f60a25ead0c39dcf8a78b75bb4f1b91c4..9c709fce6eb6228ada0df6f1f3c9b6c5cc76806c 100644
--- a/src/lib-sieve/plugins/notify/ext-notify.c
+++ b/src/lib-sieve/plugins/notify/ext-notify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension notify
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.c b/src/lib-sieve/plugins/regex/ext-regex-common.c
index 4abe6e6bb27e0415fa684d1d4cdb388758feb9c9..14f5d5648dbf36c369ab58df9441f6b46d6d8d7d 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.c
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.h b/src/lib-sieve/plugins/regex/ext-regex-common.h
index 4139c8d9f3a421e4be566b72d06a92633693293a..a10f36f2efdf311786fee7b3455349337599cd99 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.h
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_REGEX_COMMON_H
diff --git a/src/lib-sieve/plugins/regex/ext-regex.c b/src/lib-sieve/plugins/regex/ext-regex.c
index 5010fd96a3bdc368c22fab7b9060dcce53f86a98..ed293be944ba3934dea02629c950bbaaf6b21b4d 100644
--- a/src/lib-sieve/plugins/regex/ext-regex.c
+++ b/src/lib-sieve/plugins/regex/ext-regex.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension regex
diff --git a/src/lib-sieve/plugins/regex/mcht-regex.c b/src/lib-sieve/plugins/regex/mcht-regex.c
index ea70c23dea2b310b08df90362b1c4abd565f17bf..9d1061564939c569d5e18da0bb59516216978fa7 100644
--- a/src/lib-sieve/plugins/regex/mcht-regex.c
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Match-type ':regex'
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.c b/src/lib-sieve/plugins/relational/ext-relational-common.c
index 792fde0a032484dd1529e13582699522e4a1dfee..98c6bb8979d6fc94d7fb9df328aea49d0f122995 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.c
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Syntax:
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.h b/src/lib-sieve/plugins/relational/ext-relational-common.h
index 17c03cb9d60460b8ca2fb978358f32ab0b83e473..3106c1bf01a872597ebd7ac2c02ecf780a6415c4 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.h
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_RELATIONAL_COMMON_H
diff --git a/src/lib-sieve/plugins/relational/ext-relational.c b/src/lib-sieve/plugins/relational/ext-relational.c
index 4d06c37ae50ef8a4825d093ff64cb6a2fc915c01..ebf13e11a2e4f0b9d569ada78991612779150ed1 100644
--- a/src/lib-sieve/plugins/relational/ext-relational.c
+++ b/src/lib-sieve/plugins/relational/ext-relational.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension relational
diff --git a/src/lib-sieve/plugins/relational/mcht-count.c b/src/lib-sieve/plugins/relational/mcht-count.c
index e4c45809a289646ea2260f5645a2c9ec4bf3771c..2ea848df4fe7ddf3eb0d0027295e96df2c46821b 100644
--- a/src/lib-sieve/plugins/relational/mcht-count.c
+++ b/src/lib-sieve/plugins/relational/mcht-count.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 /* Match-type ':count' 
diff --git a/src/lib-sieve/plugins/relational/mcht-value.c b/src/lib-sieve/plugins/relational/mcht-value.c
index fac3de9e0daea6b8ed7ec3c4fd2c5052cf385e4c..728cb5973c59dc3ac9e779b6507b4395e9db1976 100644
--- a/src/lib-sieve/plugins/relational/mcht-value.c
+++ b/src/lib-sieve/plugins/relational/mcht-value.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
index 06f95f77ac9b71c1e2f9ae3eced3f8b2b0ddc159..139f161d75202bdb1ea3e7f79e99ba64aea94d8f 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
index 81870cacd9d9332a432e877990449506eb32ff72..53637ec459a61dd2f9353530f1eeaa1ad8ff3f74 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_SPAMVIRUSTEST_COMMON_H
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c
index 1b4dd86072ced81dc9c9c01c12d0221be1415dff..1da356c6210ba835f3c21ae398c80b75ebd7b3e4 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extensions spamtest, spamtestplus and virustest
diff --git a/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c b/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c
index 8a977724405913480b1d84400e330d64970c2c99..3845e62a1e77360778fd4783fb56b943ffb4da5f 100644
--- a/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c
+++ b/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index 399b568add20c1ce99fd1571dbb2e121357ace09..87266c9ad713383252dcbf7a45ca5d2c59343fc5 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension subaddress
diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index 45736768e03400db214edd25a8537a57f589e0e8..8fc057354603c20fd14093486b60795ef3aa25cc 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation-common.h b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
index 099ca279ad9e625a667071ee5773193b4406b846..1879524656a492b5649e74ba4d89925f0638063b 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation-common.h
+++ b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VACATION_COMMON_H
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation.c b/src/lib-sieve/plugins/vacation/ext-vacation.c
index b358d2e3006da1c7ea4d4073baf4d2e3ba866d38..45850e87ff255acbbd0c3dc0a48d1ae5d94ed8f6 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation.c
+++ b/src/lib-sieve/plugins/vacation/ext-vacation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension vacation
diff --git a/src/lib-sieve/plugins/variables/cmd-set.c b/src/lib-sieve/plugins/variables/cmd-set.c
index d2ec4cb486dfee874d2c9abe84c44790662121d8..8002710dfd788dc1ebda030d23e68ab22888fb2c 100644
--- a/src/lib-sieve/plugins/variables/cmd-set.c
+++ b/src/lib-sieve/plugins/variables/cmd-set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-arguments.c b/src/lib-sieve/plugins/variables/ext-variables-arguments.c
index d0874c68e729d93a3c6d9e19d5ea3ffb4c87d7c9..cd92e51805454fb09dec15c49dba16fc9045935f 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-arguments.h b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
index 683181f762d6dc133242a5372768dce4acc9234f..260fc3ede1612994bc3e0c871d70cfd0ff7fecfc 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_ARGUMENTS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index ac9fb55e809485eca62b3149adecd58ad56e835e..d184162a342330454b3f7c74482c72c53ff57204 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.h b/src/lib-sieve/plugins/variables/ext-variables-common.h
index c06deec9b7f437c9fdfd5ea51fa816294784f81b..85db0725060a8506d14463fdd2807f602fd988ea 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_COMMON_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-dump.c b/src/lib-sieve/plugins/variables/ext-variables-dump.c
index 8e847b90975ea8af5bf485a772b98f463d17391f..b0d322b1295f3261e7bc07cc48285c6330c64ea8 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-dump.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-dump.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-dump.h b/src/lib-sieve/plugins/variables/ext-variables-dump.h
index e3d5089837090f735e80619d61798f16dfa9edd6..7b09d68184956f0a461db0d147a87b314e4e84c8 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-dump.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-dump.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_DUMP_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-limits.h b/src/lib-sieve/plugins/variables/ext-variables-limits.h
index e1b09a17c53d9ffa8dce926097cdd963f8b25135..e2a62aeea53ac63d65cd815d5fa74344fe23adfe 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-limits.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_LIMITS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
index 1ef6919283910186e04b8bba80531f24cd474b07..5549572ec605711888943f8978fdea422ac30d28 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
index 64dc163fac42e93c6303d3fc3c0d7704d04fc9f3..2449cffaeeb482bdf6ff67089dc99f300cdb90a7 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_MODIFIERS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.c b/src/lib-sieve/plugins/variables/ext-variables-name.c
index 2c2d5cf3531e0d9f7560ef5ff997e4f9ef77a666..fc15d209b405e15cf25d82f949b2a41b383f536f 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.h b/src/lib-sieve/plugins/variables/ext-variables-name.h
index 447644ff129bfd25c57e58dd34456ad4459d0d2f..7204a2f0699a8d98ddef60ccdb1591d40b4c89d0 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_NAME
diff --git a/src/lib-sieve/plugins/variables/ext-variables-namespaces.c b/src/lib-sieve/plugins/variables/ext-variables-namespaces.c
index 9ee1aec0a147240a7992db7927fe771d5ceb8383..8e378bb658ba2b8209dc8217afbf0ba84247e9b8 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-namespaces.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-namespaces.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-namespaces.h b/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
index 2e7030101ed031ccf4b37107e1a399d61eb25c72..0fab43f72f342aac61923fb8ffb2c1d871e2568e 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_NAMESPACES_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-operands.c b/src/lib-sieve/plugins/variables/ext-variables-operands.c
index 0e294d8e5ce19a8f36fda436f34260b29bbf464f..35c6e19bff2359632b86bfeb5fb51615442b1026 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-operands.h b/src/lib-sieve/plugins/variables/ext-variables-operands.h
index 57d722b70b1403fc145587242db4017963834d04..53549539b10637fcf9f57f1dbdb398f22ab71415 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_OPERANDS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables.c b/src/lib-sieve/plugins/variables/ext-variables.c
index a4a6926a177c117e8c0ff9aab0048a88a385df04..e8e47937cf193b2a204300b5a2e6b56db54b9d1d 100644
--- a/src/lib-sieve/plugins/variables/ext-variables.c
+++ b/src/lib-sieve/plugins/variables/ext-variables.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension variables
diff --git a/src/lib-sieve/plugins/variables/sieve-ext-variables.h b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
index 6d1f74ecc9cf16fb2701d47fdc3c892b710aaaef..6540ef6d584ef72c876fe5d08372e9f4bf7c4011 100644
--- a/src/lib-sieve/plugins/variables/sieve-ext-variables.h
+++ b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* 
diff --git a/src/lib-sieve/plugins/variables/tst-string.c b/src/lib-sieve/plugins/variables/tst-string.c
index 5d7f0bdd6f5d506120182b4347049c8e0ae414a0..c1de29fb4b90de27a0176053580f9c73e08b157a 100644
--- a/src/lib-sieve/plugins/variables/tst-string.c
+++ b/src/lib-sieve/plugins/variables/tst-string.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/rfc2822.c b/src/lib-sieve/rfc2822.c
index 8f79f0c5c3ac09a61d08714b32fb4b97f42aca9e..77135fe19d781c308b084d7e3f68be2b0648f893 100644
--- a/src/lib-sieve/rfc2822.c
+++ b/src/lib-sieve/rfc2822.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 /* NOTE: much of the functionality implemented here should eventually appear
diff --git a/src/lib-sieve/rfc2822.h b/src/lib-sieve/rfc2822.h
index 9a6ef1e41166d9787b945aa63ee73187d1dd4b3c..c75d14087fd02b5980fbb7d975a50af3fdbe57b9 100644
--- a/src/lib-sieve/rfc2822.h
+++ b/src/lib-sieve/rfc2822.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __RFC2822_H
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index a2e8a439b04ddcf04b401e698cfd92cf6ea40160..819ea1fa335a076e0ab1f3ec1230155bbb09a1e3 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-actions.h b/src/lib-sieve/sieve-actions.h
index 9ab035209314238380822d12d63f858c3102fea5..543a31773ad2073ac7870896d03130edddae8fd6 100644
--- a/src/lib-sieve/sieve-actions.h
+++ b/src/lib-sieve/sieve-actions.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_ACTIONS_H
diff --git a/src/lib-sieve/sieve-address-parts.c b/src/lib-sieve/sieve-address-parts.c
index 13b696a5469b00ada026f2b0120df950d587d7d8..c2eca71c8b14dd906954a4e67b203d2f6f74b4d7 100644
--- a/src/lib-sieve/sieve-address-parts.c
+++ b/src/lib-sieve/sieve-address-parts.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-address-parts.h b/src/lib-sieve/sieve-address-parts.h
index 3e7a09524d06f5fbba6e450fe28e3e5ba845e5fa..077d46e4ae73a1321c8168839995894935842edd 100644
--- a/src/lib-sieve/sieve-address-parts.h
+++ b/src/lib-sieve/sieve-address-parts.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_ADDRESS_PARTS_H
diff --git a/src/lib-sieve/sieve-address.c b/src/lib-sieve/sieve-address.c
index 0d983b750929a10467d193f05bb6f88d4e8da3e4..2433e3b0e44735589ea9e878310cd43ac6d597a3 100644
--- a/src/lib-sieve/sieve-address.c
+++ b/src/lib-sieve/sieve-address.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-address.h b/src/lib-sieve/sieve-address.h
index 72ec0ede4ad3eb0b30ea0601a29c0f203bc2a0d0..841bf8bbf72aa48bbf830c708eca5fe9bdf4104b 100644
--- a/src/lib-sieve/sieve-address.h
+++ b/src/lib-sieve/sieve-address.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_ADDRESS_H
diff --git a/src/lib-sieve/sieve-ast.c b/src/lib-sieve/sieve-ast.c
index b55cb7a162d0cb102f2daa7ff9b4fd2a4cd8e32c..8313e6505e59abc00521664d8f5aa235c84029d6 100644
--- a/src/lib-sieve/sieve-ast.c
+++ b/src/lib-sieve/sieve-ast.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-ast.h b/src/lib-sieve/sieve-ast.h
index 5008881ed781240360d5aeb79e0dcbb284d5480e..36150bf1c8a28a86cf055518dddd2837d8400037 100644
--- a/src/lib-sieve/sieve-ast.h
+++ b/src/lib-sieve/sieve-ast.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_AST_H
diff --git a/src/lib-sieve/sieve-binary-code.c b/src/lib-sieve/sieve-binary-code.c
index 9324bcf22df61d5a7c496020a29c7c2263942365..fd48fc7b07a6530d34bd213f8fe12e0c8f7d2380 100644
--- a/src/lib-sieve/sieve-binary-code.c
+++ b/src/lib-sieve/sieve-binary-code.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary-debug.c b/src/lib-sieve/sieve-binary-debug.c
index af71c6d24c9cd5cf8e5dfb109824b6b3a042e9cc..b38040a57b1e2f20974a26ef7b04a129dd476835 100644
--- a/src/lib-sieve/sieve-binary-debug.c
+++ b/src/lib-sieve/sieve-binary-debug.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary-dumper.c b/src/lib-sieve/sieve-binary-dumper.c
index 455b4fe8418d28078ac27adb474e9ff235fc3934..f86a861ac2da9376b4d7303d550295763eb96c92 100644
--- a/src/lib-sieve/sieve-binary-dumper.c
+++ b/src/lib-sieve/sieve-binary-dumper.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary-dumper.h b/src/lib-sieve/sieve-binary-dumper.h
index 47ff8198185e7edc55446ac422b6c3bbdf1fe44b..24238963a4ea1adfe56f3fc6cd4de26ffa4f1501 100644
--- a/src/lib-sieve/sieve-binary-dumper.h
+++ b/src/lib-sieve/sieve-binary-dumper.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_BINARY_DUMPER_H
diff --git a/src/lib-sieve/sieve-binary-file.c b/src/lib-sieve/sieve-binary-file.c
index 4e59058f87b3c5a2cb9f317269630ad0f00b1253..ea6306dd4dce1a5763ff951e5fd3e6ef93ef9f8b 100644
--- a/src/lib-sieve/sieve-binary-file.c
+++ b/src/lib-sieve/sieve-binary-file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary-private.h b/src/lib-sieve/sieve-binary-private.h
index 97e08d3b22a0e6a411d65999f2d9046fce8d5c16..e241247dfac7b556bdc84ae3793e2d70527f4f48 100644
--- a/src/lib-sieve/sieve-binary-private.h
+++ b/src/lib-sieve/sieve-binary-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_BINARY_PRIVATE_H
diff --git a/src/lib-sieve/sieve-binary.c b/src/lib-sieve/sieve-binary.c
index bf695be6aee825a5096635512b292c2e297ea3a7..6e9b70daf79ff679665a570e2479bdd687a16861 100644
--- a/src/lib-sieve/sieve-binary.c
+++ b/src/lib-sieve/sieve-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary.h b/src/lib-sieve/sieve-binary.h
index 3d63282d6d18f62b85ce7f677570c4406fd483db..d33754ca4859dc20190e55e253666c8d49d6b21f 100644
--- a/src/lib-sieve/sieve-binary.h
+++ b/src/lib-sieve/sieve-binary.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_BINARY_H
diff --git a/src/lib-sieve/sieve-code-dumper.c b/src/lib-sieve/sieve-code-dumper.c
index cd12e700f2576b425798fd8dd7cfa7745e53f5f7..c38b148c3b89c5cb46e1cba90ef2b531d341b3db 100644
--- a/src/lib-sieve/sieve-code-dumper.c
+++ b/src/lib-sieve/sieve-code-dumper.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-code-dumper.h b/src/lib-sieve/sieve-code-dumper.h
index fe5fbfa934a4439c0bbaebdd73ec9c4e31e42d99..d8e403e0cfe88be621fa1ccfbdc8ceb87b48c242 100644
--- a/src/lib-sieve/sieve-code-dumper.h
+++ b/src/lib-sieve/sieve-code-dumper.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_CODE_DUMPER_H
diff --git a/src/lib-sieve/sieve-code.c b/src/lib-sieve/sieve-code.c
index 1c237a9de5b5138ad61cae3bb0dff4f75a22b44e..d0899159097e9ad8d69b89e9a13f3a81524f2cad 100644
--- a/src/lib-sieve/sieve-code.c
+++ b/src/lib-sieve/sieve-code.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-code.h b/src/lib-sieve/sieve-code.h
index 302baa5fc39e15e180e2ada2caf03935dae363a6..5f768f5e7ee7ecadf4c6742b7b89bb4bc3a5dd2e 100644
--- a/src/lib-sieve/sieve-code.h
+++ b/src/lib-sieve/sieve-code.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_CODE_H
diff --git a/src/lib-sieve/sieve-commands.c b/src/lib-sieve/sieve-commands.c
index 5245ee2de8c49b9ad9743ee1af18efd92314b3e0..5f84767210f9f2d9cda76fa208da0397758c23f0 100644
--- a/src/lib-sieve/sieve-commands.c
+++ b/src/lib-sieve/sieve-commands.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-commands.h b/src/lib-sieve/sieve-commands.h
index b94949ff0be654f51d59cb95654231a9f9182a9b..58a7cfb00eeed43d6ce19458040a857432bb3597 100644
--- a/src/lib-sieve/sieve-commands.h
+++ b/src/lib-sieve/sieve-commands.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_COMMANDS_H
diff --git a/src/lib-sieve/sieve-common.h b/src/lib-sieve/sieve-common.h
index db4209e10b07f196b4111be8beb25c264fda57d8..5c03e08716204916a6618a7349d9068aaef43e0a 100644
--- a/src/lib-sieve/sieve-common.h
+++ b/src/lib-sieve/sieve-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_COMMON_H
diff --git a/src/lib-sieve/sieve-comparators.c b/src/lib-sieve/sieve-comparators.c
index 81dca88e474cf92166e5ee80fd2eedd6287d5a44..eb82ffb7cb1e0b9f5aeaab0afd7cd16724804c82 100644
--- a/src/lib-sieve/sieve-comparators.c
+++ b/src/lib-sieve/sieve-comparators.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-comparators.h b/src/lib-sieve/sieve-comparators.h
index d0058425d64fdd739d26243be0c99d6c1a1d07d1..d31ba401d35a8ef480971d971fa3da153e58db50 100644
--- a/src/lib-sieve/sieve-comparators.h
+++ b/src/lib-sieve/sieve-comparators.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_COMPARATORS_H
diff --git a/src/lib-sieve/sieve-config.h b/src/lib-sieve/sieve-config.h
index ad28a7666242852615e2a172f035ac5d84495ebc..a7e5f30b37400758cdac4c00c9aab4fff1ff95a7 100644
--- a/src/lib-sieve/sieve-config.h
+++ b/src/lib-sieve/sieve-config.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_CONFIG_H
diff --git a/src/lib-sieve/sieve-dump.h b/src/lib-sieve/sieve-dump.h
index a5c20ca77c683577b659e3f0a5b3b5450d7ad033..474e33620b64f483a76647672e3a344deaa423aa 100644
--- a/src/lib-sieve/sieve-dump.h
+++ b/src/lib-sieve/sieve-dump.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_DUMP_H
diff --git a/src/lib-sieve/sieve-error-private.h b/src/lib-sieve/sieve-error-private.h
index cca58130176a4b97898484780be5ee0447b5cfe1..62368f1d6dbbb1300286f2e3e8a5b6b305fa4938 100644
--- a/src/lib-sieve/sieve-error-private.h
+++ b/src/lib-sieve/sieve-error-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_ERROR_PRIVATE_H
diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index 9e6bcf5520af2d6277428408a0c9973a57db372a..e3a52614357d8739971a0de396c8d5cbd0f2020b 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h
index 4f2e2c78c4625bdaf21d70ba6fe1c0189e6b43a4..fd7d743b2024ca3237c7b33173ef928db19d070c 100644
--- a/src/lib-sieve/sieve-error.h
+++ b/src/lib-sieve/sieve-error.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_ERROR_H
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 5552ffcd97c911f7cbe23e99fe37ed215259a4ae..6b7924d3b8df76a2f70ef21bafc8ac70cca342b5 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-extensions.h b/src/lib-sieve/sieve-extensions.h
index fc9bc6ac85602fd6621b6475f75ced20274fccb7..d039c62664931a9d6814e9af2239cbb69a096209 100644
--- a/src/lib-sieve/sieve-extensions.h
+++ b/src/lib-sieve/sieve-extensions.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_EXTENSIONS_H
diff --git a/src/lib-sieve/sieve-generator.c b/src/lib-sieve/sieve-generator.c
index 0d04b701677bd4050f75e8748c01c2d6c091b990..c51dc450ea2c1467465a42bb108e0904580750a6 100644
--- a/src/lib-sieve/sieve-generator.c
+++ b/src/lib-sieve/sieve-generator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-generator.h b/src/lib-sieve/sieve-generator.h
index 0d177e9756a1ec89d25c4ba45873b05ca81e1f87..90d7fdf1e8f4525fedac7dc10e42a47166bd848c 100644
--- a/src/lib-sieve/sieve-generator.h
+++ b/src/lib-sieve/sieve-generator.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_GENERATOR_H
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index ec2b85fcaaaac4458846c94d0c896cd24ff9ebd3..9f1af6136ee1fa5c0dbe0780c0b07cc3148d97b4 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-interpreter.h b/src/lib-sieve/sieve-interpreter.h
index 15d3f9ad4ca6d381c20c42030e3a425b5be5d6b3..bece383199d59666d18006c4c6b83b791e64b7bb 100644
--- a/src/lib-sieve/sieve-interpreter.h
+++ b/src/lib-sieve/sieve-interpreter.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_INTERPRETER_H
diff --git a/src/lib-sieve/sieve-lexer.c b/src/lib-sieve/sieve-lexer.c
index f6633604e9b857d22953198a71aab1f1100f3daf..6aa443f65a6de3ff07cc1d197693ba55638801c6 100644
--- a/src/lib-sieve/sieve-lexer.c
+++ b/src/lib-sieve/sieve-lexer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-lexer.h b/src/lib-sieve/sieve-lexer.h
index 8ae52baf809cc6a681c9551f9e6aa9bc8524c3ef..9b3fbec1a66e5941e787735382d0e28362f0cfc6 100644
--- a/src/lib-sieve/sieve-lexer.h
+++ b/src/lib-sieve/sieve-lexer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_LEXER_H
diff --git a/src/lib-sieve/sieve-limits.h b/src/lib-sieve/sieve-limits.h
index 1147fbdf8a32147c73cfb8b01b3e3894f2343794..1b206870282664320e0c019cf7ed5ba3e1a08cb5 100644
--- a/src/lib-sieve/sieve-limits.h
+++ b/src/lib-sieve/sieve-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_LIMITS_H
diff --git a/src/lib-sieve/sieve-match-types.c b/src/lib-sieve/sieve-match-types.c
index cc5bd307dafa616b2c08ebf3ab8d43ffb1151e3d..6185e3d68f7b2ba5c1628d10b90f7f79e8516aea 100644
--- a/src/lib-sieve/sieve-match-types.c
+++ b/src/lib-sieve/sieve-match-types.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-match-types.h b/src/lib-sieve/sieve-match-types.h
index 79d633c001f0306b0b6e92e7b61c2f14e523a5ad..a2b1606b1c324758953c6ff1aadd17330926a503 100644
--- a/src/lib-sieve/sieve-match-types.h
+++ b/src/lib-sieve/sieve-match-types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_MATCH_TYPES_H
diff --git a/src/lib-sieve/sieve-match.c b/src/lib-sieve/sieve-match.c
index 9cf43775149944d9eec35832bcac354bc515f6e1..79e799a388511eb6f6c1ab4b8ec70115488d3804 100644
--- a/src/lib-sieve/sieve-match.c
+++ b/src/lib-sieve/sieve-match.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-match.h b/src/lib-sieve/sieve-match.h
index 804d72acde204e911b90177ba46f7e34ee2dbaf9..731e4563eb12b8eb038ff2cd022e9f7fcc9f806b 100644
--- a/src/lib-sieve/sieve-match.h
+++ b/src/lib-sieve/sieve-match.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_MATCH_H
diff --git a/src/lib-sieve/sieve-message.c b/src/lib-sieve/sieve-message.c
index ba346be20b50b155b545017f8f8cbf4e86a8aca2..005dadc8c8985d13f301e4042afe012a9fbe901f 100644
--- a/src/lib-sieve/sieve-message.c
+++ b/src/lib-sieve/sieve-message.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-message.h b/src/lib-sieve/sieve-message.h
index a7c145e579f24e121efe8ecc29bf8031e805385d..47a275623f9df3695f925d5a41c34be9b0168552 100644
--- a/src/lib-sieve/sieve-message.h
+++ b/src/lib-sieve/sieve-message.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_MESSAGE_H
diff --git a/src/lib-sieve/sieve-objects.c b/src/lib-sieve/sieve-objects.c
index bfbe1d54253bbebab1156f3d002bf36ce51f1977..5e9f815aa3b33bf2fd90d1b892af70424d2ef963 100644
--- a/src/lib-sieve/sieve-objects.c
+++ b/src/lib-sieve/sieve-objects.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/sieve-objects.h b/src/lib-sieve/sieve-objects.h
index 4ffb1219613d05f568238ef5cdb7dfc71dc09b4e..74dcedee2bcef8207ae88932fa06ca5468b8defa 100644
--- a/src/lib-sieve/sieve-objects.h
+++ b/src/lib-sieve/sieve-objects.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_OBJECTS_H
diff --git a/src/lib-sieve/sieve-parser.c b/src/lib-sieve/sieve-parser.c
index 2e0f8cb950cc181c901df1d71fab94bad6015bbc..b894176e1b400f307a1b692af716e74af91e264f 100644
--- a/src/lib-sieve/sieve-parser.c
+++ b/src/lib-sieve/sieve-parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-parser.h b/src/lib-sieve/sieve-parser.h
index d0ab19f64d09eb9391119221b31b8f86f3559918..ac5ebdadeb2312a3864c9f923d085d75899160a2 100644
--- a/src/lib-sieve/sieve-parser.h
+++ b/src/lib-sieve/sieve-parser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_PARSER_H
diff --git a/src/lib-sieve/sieve-plugins.c b/src/lib-sieve/sieve-plugins.c
index b81ac910c2473453716f646b5a3ae785b0a9ddcb..182e857df320eb8bcecdce327b9300488d82cab5 100644
--- a/src/lib-sieve/sieve-plugins.c
+++ b/src/lib-sieve/sieve-plugins.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-plugins.h b/src/lib-sieve/sieve-plugins.h
index 1e702795ba7e11d60d0fc39ad6c8fcbf34dea06f..e45ba76559bfa04fd4cba146fb0b6ce1d6fac4dc 100644
--- a/src/lib-sieve/sieve-plugins.h
+++ b/src/lib-sieve/sieve-plugins.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_PLUGINS_H
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index ce8b5d1b4e15272bbc92768977ac633938e1669a..5a7adf523b9eb4bc5c1220abb607ecd4804b8895 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-result.h b/src/lib-sieve/sieve-result.h
index 0bb4e64912658fadcd4f2995e17799ce2c610b2e..65f4db81e92f34fb03005735c030c9806f38daa9 100644
--- a/src/lib-sieve/sieve-result.h
+++ b/src/lib-sieve/sieve-result.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_RESULT_H
diff --git a/src/lib-sieve/sieve-runtime-trace.c b/src/lib-sieve/sieve-runtime-trace.c
index 048fe82b395f09af49369ddefc635cd1f1a50d09..aca8359706010a332ca0237913933dbca1d2f06e 100644
--- a/src/lib-sieve/sieve-runtime-trace.c
+++ b/src/lib-sieve/sieve-runtime-trace.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-runtime-trace.h b/src/lib-sieve/sieve-runtime-trace.h
index 81ebaf0460f789de431a478bfc33bd72fda3250a..1bee312347da83fc0022eee12d9a2b06014456b4 100644
--- a/src/lib-sieve/sieve-runtime-trace.h
+++ b/src/lib-sieve/sieve-runtime-trace.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_RUNTIME_TRACE_H
diff --git a/src/lib-sieve/sieve-runtime.h b/src/lib-sieve/sieve-runtime.h
index 15b4c1a6b5f5a458060cca5c6da94f99e0f10ed5..e39c5affaf1e8183d6a8a6150f3d1323b58e163f 100644
--- a/src/lib-sieve/sieve-runtime.h
+++ b/src/lib-sieve/sieve-runtime.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_RUNTIME_H
diff --git a/src/lib-sieve/sieve-script-private.h b/src/lib-sieve/sieve-script-private.h
index aef0d759af9f863a124ae81f5ebf9cadcf224aba..cc9ff0fd662427471a4e4c2b37c5e98fed24707f 100644
--- a/src/lib-sieve/sieve-script-private.h
+++ b/src/lib-sieve/sieve-script-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SCRIPT_PRIVATE_H
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index cd2c28f68050b59e29ac9c5494a2c66feeb4c344..c590117d32bfdf01e02c34903324a9e3560fdb42 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-script.h b/src/lib-sieve/sieve-script.h
index e6d1515c50b77ddc6c5854aa6349bdeba8bbe3d6..4dcf4a34914e3ef571b733419c697ba13407e6ba 100644
--- a/src/lib-sieve/sieve-script.h
+++ b/src/lib-sieve/sieve-script.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SCRIPT_H
diff --git a/src/lib-sieve/sieve-settings.c b/src/lib-sieve/sieve-settings.c
index 884c63413e1b70b30380702180b7a1f5d34a2200..9c318b2147fbce87785c63e59e488b9036f3d73a 100644
--- a/src/lib-sieve/sieve-settings.c
+++ b/src/lib-sieve/sieve-settings.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-settings.h b/src/lib-sieve/sieve-settings.h
index 93507b7aa1d9189f74d5e1ee34bdaad70f556649..176bf00178a1b77cfe9457faa99568089a943878 100644
--- a/src/lib-sieve/sieve-settings.h
+++ b/src/lib-sieve/sieve-settings.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SETTINGS_H
diff --git a/src/lib-sieve/sieve-smtp.c b/src/lib-sieve/sieve-smtp.c
index 1259c04506874026c5e5d010b04a6ff230670e28..22744cddb19c51d2defab22c65d024997a59ea3e 100644
--- a/src/lib-sieve/sieve-smtp.c
+++ b/src/lib-sieve/sieve-smtp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 #include "lib.h"
 
diff --git a/src/lib-sieve/sieve-smtp.h b/src/lib-sieve/sieve-smtp.h
index 099ea56efca25732f228ca5f4ccbd780d5cd4589..2763ed8b7a6de4cf6a3b0ab860a287e9200bc884 100644
--- a/src/lib-sieve/sieve-smtp.h
+++ b/src/lib-sieve/sieve-smtp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SMTP_H
diff --git a/src/lib-sieve/sieve-stringlist.c b/src/lib-sieve/sieve-stringlist.c
index fba377dc0e8a2c5941fc5d72b73c7178baa9f2f6..0fc34b85ed5d51ce38309e40c1583f599e00aeb4 100644
--- a/src/lib-sieve/sieve-stringlist.c
+++ b/src/lib-sieve/sieve-stringlist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-stringlist.h b/src/lib-sieve/sieve-stringlist.h
index f6ea15a777d98e05f35edde2762c7039948f3a81..30f8ef6827aa13bbe8f663afe13936f924d943a5 100644
--- a/src/lib-sieve/sieve-stringlist.h
+++ b/src/lib-sieve/sieve-stringlist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STRINGLIST_H
diff --git a/src/lib-sieve/sieve-types.h b/src/lib-sieve/sieve-types.h
index 3ed8d5bb947539ed9d38b8570d102bea3770fe55..459b17fc65d0dd27340857db5f6e78b153400624 100644
--- a/src/lib-sieve/sieve-types.h
+++ b/src/lib-sieve/sieve-types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_TYPES_H
diff --git a/src/lib-sieve/sieve-validator.c b/src/lib-sieve/sieve-validator.c
index 642e34e1b0aaa8cfe57a22c9e0037ef6410ed36c..ba9842b947c6f881e0bbf67b6cca6e2965ee85e1 100644
--- a/src/lib-sieve/sieve-validator.c
+++ b/src/lib-sieve/sieve-validator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-validator.h b/src/lib-sieve/sieve-validator.h
index a1cf1fc8a718c4dd059806557bba75c21717d21d..ae96c13f2468e059d90425e1be0049842cfd9798 100644
--- a/src/lib-sieve/sieve-validator.h
+++ b/src/lib-sieve/sieve-validator.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_VALIDATOR_H
diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index bf70ef8e05e2d3009978a4573e01efe066f67eed..fd1e98a9c63daefe48b92b8185eb46fde7083ad6 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve.h b/src/lib-sieve/sieve.h
index 8f3b4dc2f26e8078f238ea85571e0caae3c9957a..0ecaa736e81d1ec65b7d31623b4c7b7697848c42 100644
--- a/src/lib-sieve/sieve.h
+++ b/src/lib-sieve/sieve.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_H
diff --git a/src/lib-sieve/tst-address.c b/src/lib-sieve/tst-address.c
index ec2fee9c70d911a0f276f14bf94028a72088a175..f7cba7d7943fc32c0d1bd840e6f2115b9dad5802 100644
--- a/src/lib-sieve/tst-address.c
+++ b/src/lib-sieve/tst-address.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-allof.c b/src/lib-sieve/tst-allof.c
index 5e3eb2feaaab66b741b184b8aa3100ba4728ff6a..4109019bf4f901116fe57243bec9921245aa9db2 100644
--- a/src/lib-sieve/tst-allof.c
+++ b/src/lib-sieve/tst-allof.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-anyof.c b/src/lib-sieve/tst-anyof.c
index 55fcd5ba5ccc3c2f45075f6776a10a353c40d528..3c437b74a7e1511750fa0782831ec5c6ce3bedba 100644
--- a/src/lib-sieve/tst-anyof.c
+++ b/src/lib-sieve/tst-anyof.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-exists.c b/src/lib-sieve/tst-exists.c
index c35e2eac1cfc8b17ae9f1854a0684119a8495cc8..9a650dc050dd132346cada2f03ece7a70283f81f 100644
--- a/src/lib-sieve/tst-exists.c
+++ b/src/lib-sieve/tst-exists.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-header.c b/src/lib-sieve/tst-header.c
index 7e2fedfcf899d5222ba4b9b8e560b6f2f1a7184e..fd066a866341f77631f5e9d9f1175282ca608e40 100644
--- a/src/lib-sieve/tst-header.c
+++ b/src/lib-sieve/tst-header.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-not.c b/src/lib-sieve/tst-not.c
index 1afc28dc6708f056cb5c60f73fa13280e7dbfb0f..ad8f34b7a7cb1bbe2ca183b2f56b74ba98640bec 100644
--- a/src/lib-sieve/tst-not.c
+++ b/src/lib-sieve/tst-not.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-size.c b/src/lib-sieve/tst-size.c
index 53602545548b2bd56894d68001a9c35d7856e3b8..c4759decf4d6a53799a23e9c4f38c8e0dd6a88ac 100644
--- a/src/lib-sieve/tst-size.c
+++ b/src/lib-sieve/tst-size.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-truefalse.c b/src/lib-sieve/tst-truefalse.c
index d64bd7b083428c641d4dbac65333f9bd7884144b..1711a3e4f170780bbac82e1bb66500c835a59397 100644
--- a/src/lib-sieve/tst-truefalse.c
+++ b/src/lib-sieve/tst-truefalse.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-ast.h"
diff --git a/src/lib-sievestorage/sieve-storage-list.c b/src/lib-sievestorage/sieve-storage-list.c
index 6efc630b19d9276b338c953224a5a5dfeb7e89da..1b90aca24fea9eaa3012a98db80feb923ab4d3d3 100644
--- a/src/lib-sievestorage/sieve-storage-list.c
+++ b/src/lib-sievestorage/sieve-storage-list.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sievestorage/sieve-storage-list.h b/src/lib-sievestorage/sieve-storage-list.h
index 1494bfd060dbb0badc8b347d5d0dbf10d945ccbf..e8511a54312e482a6f152c2fb4fce371229c2676 100644
--- a/src/lib-sievestorage/sieve-storage-list.h
+++ b/src/lib-sievestorage/sieve-storage-list.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STORAGE_LIST_H
diff --git a/src/lib-sievestorage/sieve-storage-private.h b/src/lib-sievestorage/sieve-storage-private.h
index fe12d55aef2010cd6b55599821ebdaa4bcb0d8b7..6aeb8968a80fa23e562837870257256eb20291c0 100644
--- a/src/lib-sievestorage/sieve-storage-private.h
+++ b/src/lib-sievestorage/sieve-storage-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STORAGE_PRIVATE_H
diff --git a/src/lib-sievestorage/sieve-storage-quota.c b/src/lib-sievestorage/sieve-storage-quota.c
index ccd9aa1be7c1c5c571201350b0dfffb6d7744696..80f4ffcc12dfbcdb0e916fdda15b8efa92775ecb 100644
--- a/src/lib-sievestorage/sieve-storage-quota.c
+++ b/src/lib-sievestorage/sieve-storage-quota.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sievestorage/sieve-storage-quota.h b/src/lib-sievestorage/sieve-storage-quota.h
index b4321770c68edc26bb7f95fd029ed6e94c6b2e33..d958de41ddf09df8c10f72be6d51b2b6b5b1e5d9 100644
--- a/src/lib-sievestorage/sieve-storage-quota.h
+++ b/src/lib-sievestorage/sieve-storage-quota.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STORAGE_QUOTA_H
diff --git a/src/lib-sievestorage/sieve-storage-save.c b/src/lib-sievestorage/sieve-storage-save.c
index 1476f6609926900854f35994a877a93bf5b747b9..fb786dc440f551c7dd72a6d48f565ed81049a8d6 100644
--- a/src/lib-sievestorage/sieve-storage-save.c
+++ b/src/lib-sievestorage/sieve-storage-save.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sievestorage/sieve-storage-save.h b/src/lib-sievestorage/sieve-storage-save.h
index 6e80b1f18b213e49c3632af23476476e344c3719..494c3bcf5f76b6c6c18eca26b6e57926166c1a02 100644
--- a/src/lib-sievestorage/sieve-storage-save.h
+++ b/src/lib-sievestorage/sieve-storage-save.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SAVE_H
diff --git a/src/lib-sievestorage/sieve-storage-script.c b/src/lib-sievestorage/sieve-storage-script.c
index 7ce41d90281f0a35329e960c4f97efd44ca80903..23e70041c504fafdf5f5d2918f0c7e69fb7bf5c7 100644
--- a/src/lib-sievestorage/sieve-storage-script.c
+++ b/src/lib-sievestorage/sieve-storage-script.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sievestorage/sieve-storage-script.h b/src/lib-sievestorage/sieve-storage-script.h
index ea7c4445141d2d0c215e67705f706bc686cf320c..bdbb66173c90692304b877e342f23eba04af66ef 100644
--- a/src/lib-sievestorage/sieve-storage-script.h
+++ b/src/lib-sievestorage/sieve-storage-script.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STORAGE_SCRIPT_H
diff --git a/src/lib-sievestorage/sieve-storage.c b/src/lib-sievestorage/sieve-storage.c
index a8e73ea340b0a71484683bd4bbd5f7429d9fa3ee..2e0a1c791bfe6e5629c4de2d7b2d9d6beb29b82e 100644
--- a/src/lib-sievestorage/sieve-storage.c
+++ b/src/lib-sievestorage/sieve-storage.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sievestorage/sieve-storage.h b/src/lib-sievestorage/sieve-storage.h
index 0e245d666faae5673a9a45a41719bbafe4cdf725..865f18b8eab795c0e3fb1f8b03b57bab51e01d23 100644
--- a/src/lib-sievestorage/sieve-storage.h
+++ b/src/lib-sievestorage/sieve-storage.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_STORAGE_H
diff --git a/src/managesieve-login/client-authenticate.c b/src/managesieve-login/client-authenticate.c
index a81afe416f24701d83ba9f46b1910e78b46fb53f..091cdbdf1040c38bbcb2ae713061f309ec9db208 100644
--- a/src/managesieve-login/client-authenticate.c
+++ b/src/managesieve-login/client-authenticate.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "login-common.h"
diff --git a/src/managesieve-login/client-authenticate.h b/src/managesieve-login/client-authenticate.h
index 39427a284c367669d79aba6fdc6b02407c739c3d..808881864f679ce70e0c22f527d3af7ca8c05801 100644
--- a/src/managesieve-login/client-authenticate.h
+++ b/src/managesieve-login/client-authenticate.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __CLIENT_AUTHENTICATE_H
diff --git a/src/managesieve-login/client.c b/src/managesieve-login/client.c
index 515e6a90a0dd7fc66ea7f2973b1df2905a4f2e57..c905fb87a4603f8e69c8d5def43b9ec07ee460ee 100644
--- a/src/managesieve-login/client.c
+++ b/src/managesieve-login/client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "login-common.h"
diff --git a/src/managesieve-login/client.h b/src/managesieve-login/client.h
index 4d79e0351881464a252fd81272a11bebbde899fb..d049fcb3ed25e7a86ab916099ab10ce1e30a45da 100644
--- a/src/managesieve-login/client.h
+++ b/src/managesieve-login/client.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __CLIENT_H
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.c b/src/managesieve-login/managesieve-login-settings-plugin.c
index 3f59a2351f86541e8d4495980e7d260452c0eae1..c4a6849916e301e82cc495f4be2a51a698114b52 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.c
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.h b/src/managesieve-login/managesieve-login-settings-plugin.h
index be152ce0ecdb5e442f6d0d478b9e33a3f7a39721..ebfe02554e2f28603ae0d381738a9aac4fa2f8a4 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.h
+++ b/src/managesieve-login/managesieve-login-settings-plugin.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H
diff --git a/src/managesieve-login/managesieve-login-settings.c b/src/managesieve-login/managesieve-login-settings.c
index a6a0c316f4198955d650e8705a97c092b733cb18..03b95aa863aab2c6d5dd0cdcce9084541c206dad 100644
--- a/src/managesieve-login/managesieve-login-settings.c
+++ b/src/managesieve-login/managesieve-login-settings.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve-login/managesieve-login-settings.h b/src/managesieve-login/managesieve-login-settings.h
index 5395ba9154854c4465088803d910cf82dbabcd0e..9c73713d09f4e4c1e3ea91959eca25f9ddd1ccd9 100644
--- a/src/managesieve-login/managesieve-login-settings.h
+++ b/src/managesieve-login/managesieve-login-settings.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_LOGIN_SETTINGS_H
diff --git a/src/managesieve-login/managesieve-proxy.c b/src/managesieve-login/managesieve-proxy.c
index 54e22187b0d95df596a09ad033d175070bc997ee..395ca3eef7048e71fd4cd6d2f19fc6170bf3aa6d 100644
--- a/src/managesieve-login/managesieve-proxy.c
+++ b/src/managesieve-login/managesieve-proxy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include <string.h>
diff --git a/src/managesieve-login/managesieve-proxy.h b/src/managesieve-login/managesieve-proxy.h
index 2ac0e7be4148d330b022949409f0f7a52cbb6a80..b83746b156a77975ad06db2e58ed4238db0db9d2 100644
--- a/src/managesieve-login/managesieve-proxy.h
+++ b/src/managesieve-login/managesieve-proxy.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_PROXY_H
diff --git a/src/managesieve/cmd-capability.c b/src/managesieve/cmd-capability.c
index b52786c6f960794860cb71cc8d98b939ab9171fc..38761610cfb1b9a319532a566a64e72f0648d0e8 100644
--- a/src/managesieve/cmd-capability.c
+++ b/src/managesieve/cmd-capability.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-deletescript.c b/src/managesieve/cmd-deletescript.c
index 54c3d8a9aeb196d6528f90c7ccb15ca81eb7bd76..60b3fec6083e51f812c1dfc7fbeaa475829c75a4 100644
--- a/src/managesieve/cmd-deletescript.c
+++ b/src/managesieve/cmd-deletescript.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-getscript.c b/src/managesieve/cmd-getscript.c
index 746089ad88b5d1e40ba6cc04b3626c37a14e00dc..570032c573edf050cedd0bcf93dafe8fcfa19870 100644
--- a/src/managesieve/cmd-getscript.c
+++ b/src/managesieve/cmd-getscript.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-havespace.c b/src/managesieve/cmd-havespace.c
index 920199752f609611445f96325af705f9dd9cf2c6..0a51260b33d495732b48b9e2baefb00e6ec33590 100644
--- a/src/managesieve/cmd-havespace.c
+++ b/src/managesieve/cmd-havespace.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-listscripts.c b/src/managesieve/cmd-listscripts.c
index d265f22fed38106fc4207541c23c0da9deddbeea..7737bfdb5b84ded6c69fc1fdd403a3343df91cef 100644
--- a/src/managesieve/cmd-listscripts.c
+++ b/src/managesieve/cmd-listscripts.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-logout.c b/src/managesieve/cmd-logout.c
index c86d5bb3a37b080b5f5c5cc05bb4b0786c238cc2..996ea799790ca34a22bff4ff35088b8182009cd5 100644
--- a/src/managesieve/cmd-logout.c
+++ b/src/managesieve/cmd-logout.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-noop.c b/src/managesieve/cmd-noop.c
index c344963d37167943daf9ae20899b95d00eba527d..5cc34a3888d140e961bb35705a984b359974d086 100644
--- a/src/managesieve/cmd-noop.c
+++ b/src/managesieve/cmd-noop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-putscript.c b/src/managesieve/cmd-putscript.c
index 724b57040f08cd1d037c8eb47648c480a1062ba1..85c7ce70a9f443a305f4898a7c7743013f1975d2 100644
--- a/src/managesieve/cmd-putscript.c
+++ b/src/managesieve/cmd-putscript.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* NOTE: this file also contains the checkscript command due to its obvious
diff --git a/src/managesieve/cmd-renamescript.c b/src/managesieve/cmd-renamescript.c
index 32a05379682af5193bc4ea0a3a97229829827c03..5ebc378bcb16c8a7eea4e5f11a5c10302429bbc3 100644
--- a/src/managesieve/cmd-renamescript.c
+++ b/src/managesieve/cmd-renamescript.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/cmd-setactive.c b/src/managesieve/cmd-setactive.c
index 319b628906f1189cc51bf9f98efa20450d1877f9..288d99d2a550ac66f0f5f1adab83ca92fb3c49b9 100644
--- a/src/managesieve/cmd-setactive.c
+++ b/src/managesieve/cmd-setactive.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index c60be623ca4f56c04769316ad2c021f7448c36e8..d1b6d6916fc61bd9d6487bf22b9fcf3ec8e6cb1a 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-capabilities.c b/src/managesieve/managesieve-capabilities.c
index a9c825e86274d598322d2561fbdb6b65932d4cef..d4801e30ad8de0ecf603898d9fc17a3e949d00ba 100644
--- a/src/managesieve/managesieve-capabilities.c
+++ b/src/managesieve/managesieve-capabilities.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-capabilities.h b/src/managesieve/managesieve-capabilities.h
index a00ce731e2d20b11c8b3f24c98455dbcc3aa82cd..35cb90a921dfde4ca3630817d4d1303b38a98688 100644
--- a/src/managesieve/managesieve-capabilities.h
+++ b/src/managesieve/managesieve-capabilities.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_CAPABILITIES_H
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index c6479e2ffc5d28193ade08403c2c3005a214f904..e505f8750245f32cf766e302d70e25dec177c8a6 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-client.h b/src/managesieve/managesieve-client.h
index 9e0f13a0a156c9ee02066f898b3d188a6881c998..32db5e02eb060853ec50cc30b9622ac6e4eb2e2d 100644
--- a/src/managesieve/managesieve-client.h
+++ b/src/managesieve/managesieve-client.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_CLIENT_H
diff --git a/src/managesieve/managesieve-commands.c b/src/managesieve/managesieve-commands.c
index 585f899a17a3eaaf67f1edaf5631fe854de51d20..a531a8c837289865be23c6933b6a9531a85b5a05 100644
--- a/src/managesieve/managesieve-commands.c
+++ b/src/managesieve/managesieve-commands.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-commands.h b/src/managesieve/managesieve-commands.h
index 34b0fc774c2f9730297e19df236fcb18f345ea94..5bb246880863b94d78464e77d00146637e99af1f 100644
--- a/src/managesieve/managesieve-commands.h
+++ b/src/managesieve/managesieve-commands.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_COMMANDS_H
diff --git a/src/managesieve/managesieve-common.h b/src/managesieve/managesieve-common.h
index c10d04a3954e3c48a98cb76bfabeddea08ce2ed6..2f9f5ec757796b322c3c2ce748d93d610a0cc296 100644
--- a/src/managesieve/managesieve-common.h
+++ b/src/managesieve/managesieve-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_COMMON_H
diff --git a/src/managesieve/managesieve-quota.c b/src/managesieve/managesieve-quota.c
index ac130eff7ddc4f2e626a25d484af503b4f6c19bb..27cee65b49c9756522af4cd41f0e787099c8154e 100644
--- a/src/managesieve/managesieve-quota.c
+++ b/src/managesieve/managesieve-quota.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-quota.h b/src/managesieve/managesieve-quota.h
index a21e9194d668818d06255045b6921633467507ec..51210c07bc92c99d8293fc6da6489fc59d3373a0 100644
--- a/src/managesieve/managesieve-quota.h
+++ b/src/managesieve/managesieve-quota.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_QUOTA_H
diff --git a/src/managesieve/managesieve-settings.c b/src/managesieve/managesieve-settings.c
index ca5b917a06a50e697e8e2f8d8fdeec0e7ffd5bc4..26561ba4ddc6124f4ccfbb8f70394acc8536b088 100644
--- a/src/managesieve/managesieve-settings.c
+++ b/src/managesieve/managesieve-settings.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/managesieve/managesieve-settings.h b/src/managesieve/managesieve-settings.h
index d6a7b548ef3d376c643f992eba605711de896d76..6f1649a0291f9dfd773c54818c91f5a9550e3dfa 100644
--- a/src/managesieve/managesieve-settings.h
+++ b/src/managesieve/managesieve-settings.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __MANAGESIEVE_SETTINGS_H
diff --git a/src/plugins/lda-sieve/lda-sieve-log.c b/src/plugins/lda-sieve/lda-sieve-log.c
index c4265c01c0d8ef5e02cb458873b050e097e045dd..4d9d545c5b291b8c3e002eb9d37ff9ff0a531096 100644
--- a/src/plugins/lda-sieve/lda-sieve-log.c
+++ b/src/plugins/lda-sieve/lda-sieve-log.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/plugins/lda-sieve/lda-sieve-log.h b/src/plugins/lda-sieve/lda-sieve-log.h
index fda17cd0e390ea005f04b5144594917476ca8a47..1c549ac8309302b7b13eb7be2d0148eaed2fde8c 100644
--- a/src/plugins/lda-sieve/lda-sieve-log.h
+++ b/src/plugins/lda-sieve/lda-sieve-log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __LDA_SIEVE_LOG
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
index d0b4a6857a57a7c44f279ee4fa7050383ec253a6..44ea0f9ae5d8c64dc07a4c4ed0b802b969364533 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.h b/src/plugins/lda-sieve/lda-sieve-plugin.h
index e315c2af21daea8afcde45acdbc3d6a570251938..abf647bab1e34d5341ae35919990c92a501ddcbf 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.h
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __LDA_SIEVE_PLUGIN_H
diff --git a/src/sieve-tools/debug/cmd-debug-print.c b/src/sieve-tools/debug/cmd-debug-print.c
index 04f464e82e9e28611707c1d74e1b35e39018c060..375b4c868bc79101e80369b56360a7ff49e118ff 100644
--- a/src/sieve-tools/debug/cmd-debug-print.c
+++ b/src/sieve-tools/debug/cmd-debug-print.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #include "sieve-extensions.h"
diff --git a/src/sieve-tools/debug/ext-debug-common.h b/src/sieve-tools/debug/ext-debug-common.h
index d8a9a8fce0d467c9cfb692c381f1bde68e8e8a38..6e90ae8da2db04ec61da1957e949c5e9c72c95bf 100644
--- a/src/sieve-tools/debug/ext-debug-common.h
+++ b/src/sieve-tools/debug/ext-debug-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __EXT_DEBUG_COMMON_H
diff --git a/src/sieve-tools/debug/ext-debug.c b/src/sieve-tools/debug/ext-debug.c
index 67097bd7934d64691586c9bd9bc62954f26fdd03..d39dc95f9e0a7bed85c3d5986b769396d263ad04 100644
--- a/src/sieve-tools/debug/ext-debug.c
+++ b/src/sieve-tools/debug/ext-debug.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension debug
diff --git a/src/sieve-tools/debug/sieve-ext-debug.h b/src/sieve-tools/debug/sieve-ext-debug.h
index ef23a3101b535a1e9a86ed00080d9ac75c6fd27f..8998b1e811c8954fa14f4a6a06b01b40f2934f42 100644
--- a/src/sieve-tools/debug/sieve-ext-debug.h
+++ b/src/sieve-tools/debug/sieve-ext-debug.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_EXT_DEBUG_H
diff --git a/src/sieve-tools/sieve-filter.c b/src/sieve-tools/sieve-filter.c
index fd4479233d3880be32f879dfd4e8a89b8aa5d48c..972ca0ad739fb16055ef5f7f6b91160de88f5ca1 100644
--- a/src/sieve-tools/sieve-filter.c
+++ b/src/sieve-tools/sieve-filter.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index 3c596c10fc8cf1b073c46615fc4dee86b01a3100..87739e0adcfec45bcbb3ee65cafcc4aef226f120 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sievec.c b/src/sieve-tools/sievec.c
index 4ad5811a65ab5f21ce344920d322707fe1399263..40c97e27ee31104121f2d399f61f63bd607447d9 100644
--- a/src/sieve-tools/sievec.c
+++ b/src/sieve-tools/sievec.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sieved.c b/src/sieve-tools/sieved.c
index b48a8f611d59b28468c2a3a985acd252afd3b835..495faaf643dd67465ba591124b90191446577dc1 100644
--- a/src/sieve-tools/sieved.c
+++ b/src/sieve-tools/sieved.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/cmd-test-binary.c b/src/testsuite/cmd-test-binary.c
index 0b8b6619f358ff517fdc4022867573b3c697221d..7c58e76179dcf9514e78a65286df20a4c7de6406 100644
--- a/src/testsuite/cmd-test-binary.c
+++ b/src/testsuite/cmd-test-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-config.c b/src/testsuite/cmd-test-config.c
index 92cc7630dd29714947c0cff54260d3ca4033288e..8aa47eb7396ccbf42ee42c88ea67a19864af61db 100644
--- a/src/testsuite/cmd-test-config.c
+++ b/src/testsuite/cmd-test-config.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-fail.c b/src/testsuite/cmd-test-fail.c
index b504de77d60760fe82e27d7570093881cc24980b..e3dadd5be475d26ed696d7e5c8bb330381fbb662 100644
--- a/src/testsuite/cmd-test-fail.c
+++ b/src/testsuite/cmd-test-fail.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-mailbox.c b/src/testsuite/cmd-test-mailbox.c
index 7a508b54525c8e490035347a9b21193329e5e5b7..51241be231663c233fcda26a1c8fa35cacf83808 100644
--- a/src/testsuite/cmd-test-mailbox.c
+++ b/src/testsuite/cmd-test-mailbox.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-message.c b/src/testsuite/cmd-test-message.c
index 7c5d2c911568373b61ab8f8f1dbd79489f342411..29d48f5cb7a77eaafee0987e6c780d97b1eddbb9 100644
--- a/src/testsuite/cmd-test-message.c
+++ b/src/testsuite/cmd-test-message.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-result-print.c b/src/testsuite/cmd-test-result-print.c
index 6858cc0889288ea1c7b3a7361c68a79367c2f8c5..b5da572085404f659585a467246f0c14f549feeb 100644
--- a/src/testsuite/cmd-test-result-print.c
+++ b/src/testsuite/cmd-test-result-print.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-result-reset.c b/src/testsuite/cmd-test-result-reset.c
index df2f46c80e993be96b31c1739d431a74022f254c..467e8a417c784d6ee5e27b7244b32530d8b4eb5a 100644
--- a/src/testsuite/cmd-test-result-reset.c
+++ b/src/testsuite/cmd-test-result-reset.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-set.c b/src/testsuite/cmd-test-set.c
index 527bc0d21e89b5437975719e097aa6c38c929cb4..0a18350ed29a3aa1917e548449810e1449222bd3 100644
--- a/src/testsuite/cmd-test-set.c
+++ b/src/testsuite/cmd-test-set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/cmd-test.c b/src/testsuite/cmd-test.c
index 123be9ee169495c98a922090314042d6713e53bc..d2318571e70710f33c646aa0c978ad878dde4d31 100644
--- a/src/testsuite/cmd-test.c
+++ b/src/testsuite/cmd-test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/ext-testsuite.c b/src/testsuite/ext-testsuite.c
index 3797900471e7035a0e38fa1be6c0fb31dcfe2ee2..40efa59f71254486ff867dcd4c604fd64fb1658c 100644
--- a/src/testsuite/ext-testsuite.c
+++ b/src/testsuite/ext-testsuite.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* Extension testsuite
diff --git a/src/testsuite/testsuite-arguments.c b/src/testsuite/testsuite-arguments.c
index 500a89914cc32664f984784c27e03448ef58bb84..f605dbf346a9efa58c25c86efa9c1ed3cdf81fe8 100644
--- a/src/testsuite/testsuite-arguments.c
+++ b/src/testsuite/testsuite-arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-arguments.h b/src/testsuite/testsuite-arguments.h
index 50637d013194f5c8c171764f208f51a3b3c3ab75..57fb37850b2bd59339b4044682e47a89bae2f59e 100644
--- a/src/testsuite/testsuite-arguments.h
+++ b/src/testsuite/testsuite-arguments.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_ARGUMENTS_H
diff --git a/src/testsuite/testsuite-binary.c b/src/testsuite/testsuite-binary.c
index c573704b3a0a6b72f9f529d81772501b01ce1463..bce3cccb6ce34e80b47eb463e571e3ca57b9811f 100644
--- a/src/testsuite/testsuite-binary.c
+++ b/src/testsuite/testsuite-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-binary.h b/src/testsuite/testsuite-binary.h
index c846a907c07dbf63aee96eb7135a76a2d884ed43..0522811afd57fa8d87c577ca82ab7a244a1703ed 100644
--- a/src/testsuite/testsuite-binary.h
+++ b/src/testsuite/testsuite-binary.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_BINARY_H
diff --git a/src/testsuite/testsuite-common.c b/src/testsuite/testsuite-common.c
index 657b764bdbf74f05892cea8beeb65a57abc59ee6..af06e2d9d848b28c1e2c1449284e11594f4d10d2 100644
--- a/src/testsuite/testsuite-common.c
+++ b/src/testsuite/testsuite-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-common.h b/src/testsuite/testsuite-common.h
index 72b43f8a3c188c7a7ada3e704e2b84f4512c0dcb..47d44a9c1485035685155761d3b0f550f92fd6fe 100644
--- a/src/testsuite/testsuite-common.h
+++ b/src/testsuite/testsuite-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_COMMON_H
diff --git a/src/testsuite/testsuite-log.c b/src/testsuite/testsuite-log.c
index 039d9d934a908dfbda1112d650fd224986ee46c0..b43a30de9c277d46ed5a03f98252ceac8e1661b6 100644
--- a/src/testsuite/testsuite-log.c
+++ b/src/testsuite/testsuite-log.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-log.h b/src/testsuite/testsuite-log.h
index f909301cb033506954319c7f7cc427f10f269224..5f414ac76efc2a745e15a8d9cb14f83a34647c2a 100644
--- a/src/testsuite/testsuite-log.h
+++ b/src/testsuite/testsuite-log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_LOG_H
diff --git a/src/testsuite/testsuite-mailstore.c b/src/testsuite/testsuite-mailstore.c
index c95a844260cd9b3114fdbd222e41cac006badf8c..c298d0f5e02700b979d37093e513720e88e1d9a0 100644
--- a/src/testsuite/testsuite-mailstore.c
+++ b/src/testsuite/testsuite-mailstore.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-mailstore.h b/src/testsuite/testsuite-mailstore.h
index a4b3b7a1c5d1c6009620f2f8fdc99d44c5db1354..f99689b737650a19b251a09acaa128f899b4c87a 100644
--- a/src/testsuite/testsuite-mailstore.h
+++ b/src/testsuite/testsuite-mailstore.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_MAILSTORE_H
diff --git a/src/testsuite/testsuite-message.c b/src/testsuite/testsuite-message.c
index e505aed9a3ae5f76c3f2d6f0a37c391f852c200a..a87cbbb94375335c7345c7ee7aeac3f76d3cb0d3 100644
--- a/src/testsuite/testsuite-message.c
+++ b/src/testsuite/testsuite-message.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-message.h b/src/testsuite/testsuite-message.h
index 0cad24a142b13ef86dc70057a76ffb26d772649e..871bcae48e6e4b7db173c62b9e06190b7ebbde7f 100644
--- a/src/testsuite/testsuite-message.h
+++ b/src/testsuite/testsuite-message.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_MESSAGE_H
diff --git a/src/testsuite/testsuite-objects.c b/src/testsuite/testsuite-objects.c
index c02626403e75414537ff312ccf7d5ff986cf0eaa..4a3c1c864997f81761f5afcd6137cb50186f7839 100644
--- a/src/testsuite/testsuite-objects.c
+++ b/src/testsuite/testsuite-objects.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-objects.h b/src/testsuite/testsuite-objects.h
index 812376a30d9944251efa58de5996198e61b93555..f109dbb3354a06989673b37bb19342b83c9fe5fd 100644
--- a/src/testsuite/testsuite-objects.h
+++ b/src/testsuite/testsuite-objects.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_OBJECTS_H
diff --git a/src/testsuite/testsuite-result.c b/src/testsuite/testsuite-result.c
index f7340397b64fcfe4432ee02f48678ed44a9d3dab..3581d101dc4fea52a40a883a9fe0a39fd15a9dfc 100644
--- a/src/testsuite/testsuite-result.c
+++ b/src/testsuite/testsuite-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-result.h b/src/testsuite/testsuite-result.h
index a74397d8206888ac58659b657c203392a6098f9f..fb1d00cfb083022a48c321d31bdc5b4fe98ea56a 100644
--- a/src/testsuite/testsuite-result.h
+++ b/src/testsuite/testsuite-result.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_RESULT_H
diff --git a/src/testsuite/testsuite-script.c b/src/testsuite/testsuite-script.c
index c7a7d1577d81baf8069acd25273055cf22f9ec11..2186c486286fc1dfdf9ed6e7dfcc6fda49600748 100644
--- a/src/testsuite/testsuite-script.c
+++ b/src/testsuite/testsuite-script.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-script.h b/src/testsuite/testsuite-script.h
index 9e6ce19c23053d10c82254b745b003a0fe632d79..86950776bf3d2e102fd3a0e95ec6c0d7006929b6 100644
--- a/src/testsuite/testsuite-script.h
+++ b/src/testsuite/testsuite-script.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_SCRIPT_H
diff --git a/src/testsuite/testsuite-settings.c b/src/testsuite/testsuite-settings.c
index 5ac622db4dd891fc5fb63ffdf4601de21c14e4fa..4ecb667a4b60c70a1d0f41a0d2b03b461785e294 100644
--- a/src/testsuite/testsuite-settings.c
+++ b/src/testsuite/testsuite-settings.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-settings.h b/src/testsuite/testsuite-settings.h
index c10a95305b4996d5721050afc8ca7ea08704f7e2..e915e55395a4cb5dda652009abfdac806aabff5e 100644
--- a/src/testsuite/testsuite-settings.h
+++ b/src/testsuite/testsuite-settings.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_SETTINGS_H
diff --git a/src/testsuite/testsuite-smtp.c b/src/testsuite/testsuite-smtp.c
index 4353a5327f6f28f1cd981b584c9923811ee70dee..8f0687058d366fa045070be8d208f8e126e64694 100644
--- a/src/testsuite/testsuite-smtp.c
+++ b/src/testsuite/testsuite-smtp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-smtp.h b/src/testsuite/testsuite-smtp.h
index cb95240de84fdef316cc517710b39defdda7fbe9..fbd08d521a4e6c6e2071c5d3d21227b832ba5862 100644
--- a/src/testsuite/testsuite-smtp.h
+++ b/src/testsuite/testsuite-smtp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
  
 #ifndef __TESTSUITE_SMTP_H
diff --git a/src/testsuite/testsuite-substitutions.c b/src/testsuite/testsuite-substitutions.c
index d36f3e9a313c1242e34623a0a2adb13e48122af7..365adb3ea7727a53a9c7a15b62c591aca5c439af 100644
--- a/src/testsuite/testsuite-substitutions.c
+++ b/src/testsuite/testsuite-substitutions.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-substitutions.h b/src/testsuite/testsuite-substitutions.h
index 899fe7834a1664a4d9e1fdd64c55daf629501c07..c04256849ca7a8fae042d8955bb06c1bb8f20768 100644
--- a/src/testsuite/testsuite-substitutions.h
+++ b/src/testsuite/testsuite-substitutions.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_SUBSTITUTIONS_H
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 089a18cef947e24e6cc65513bb535eaec1fe7748..2ff4d3a2956b305e2bbac9d11b9bc47177944ce0 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/tst-test-error.c b/src/testsuite/tst-test-error.c
index 925ae552540559f712e86d2f77cba971d1a1d128..4fe21192cdefc3d383afb3350f8c5ed5d3566904 100644
--- a/src/testsuite/tst-test-error.c
+++ b/src/testsuite/tst-test-error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-multiscript.c b/src/testsuite/tst-test-multiscript.c
index fab25e3f04f29af72b072d7842bd030896a21d24..289de6af64b5934d9233bb8c7c7a9f930940177c 100644
--- a/src/testsuite/tst-test-multiscript.c
+++ b/src/testsuite/tst-test-multiscript.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-result-execute.c b/src/testsuite/tst-test-result-execute.c
index 515a9aeba3c8aee79633e80fe4b1ca0db0e9feaf..19fe0f8d0c9969f88a3b1637db2219c6ce694bdf 100644
--- a/src/testsuite/tst-test-result-execute.c
+++ b/src/testsuite/tst-test-result-execute.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-result.c b/src/testsuite/tst-test-result.c
index 178a8648c7f058219ec76cfc00fdbdab6c8a273e..0bba25f23d45cc959d5a0ea68f2c402dfa72f9d4 100644
--- a/src/testsuite/tst-test-result.c
+++ b/src/testsuite/tst-test-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 /* FIXME: this file is very similar to tst-test-error.c. Maybe it is best to 
diff --git a/src/testsuite/tst-test-script-compile.c b/src/testsuite/tst-test-script-compile.c
index 4d476011869de63d4625f8ff2c9409e2cb9289b5..d5db70be013cab0a24a104b931858947c74b6cbc 100644
--- a/src/testsuite/tst-test-script-compile.c
+++ b/src/testsuite/tst-test-script-compile.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-script-run.c b/src/testsuite/tst-test-script-run.c
index aaf9d471e685b4622654f8ecdd8b940ebe9c7709..1823ccafb8682cfb60764cbcd881e989c4f4a070 100644
--- a/src/testsuite/tst-test-script-run.c
+++ b/src/testsuite/tst-test-script-run.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2010 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2010 Pigeonhole authors, see the included COPYING file
  */
 
 #include "sieve-common.h"