diff --git a/OpenChange/MAPIApplication.h b/OpenChange/MAPIApplication.h
index 886503de7..83e02fe6b 100644
--- a/OpenChange/MAPIApplication.h
+++ b/OpenChange/MAPIApplication.h
@@ -1,6 +1,6 @@
-/* MAPIApplication.h - this file is part of $PROJECT_NAME_HERE$
+/* MAPIApplication.h - this file is part of SOGo
  *
- * Copyright (C) 2010 Inverse inc. 
+ * Copyright (C) 2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/OpenChange/MAPIStoreAuthenticator.h b/OpenChange/MAPIStoreAuthenticator.h
index 4053a4dfc..663d6d8ec 100644
--- a/OpenChange/MAPIStoreAuthenticator.h
+++ b/OpenChange/MAPIStoreAuthenticator.h
@@ -1,4 +1,4 @@
-/* MAPIStoreAuthenticator.h - this file is part of $PROJECT_NAME_HERE$
+/* MAPIStoreAuthenticator.h - this file is part of SOGo
  *
  * Copyright (C) 2010 Inverse inc.
  *
diff --git a/OpenChange/MAPIStoreSpoolerContext.h b/OpenChange/MAPIStoreSpoolerContext.h
index 40521850f..b01009ddf 100644
--- a/OpenChange/MAPIStoreSpoolerContext.h
+++ b/OpenChange/MAPIStoreSpoolerContext.h
@@ -1,12 +1,12 @@
 /* MAPIStoreSpoolerContext.h - this file is part of SOGo
  *
- * Copyright (C) 2010 Wolfgang Sourdeau
+ * Copyright (C) 2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
diff --git a/OpenChange/MAPIStoreSpoolerContext.m b/OpenChange/MAPIStoreSpoolerContext.m
index 99b9fb8fb..75a44e2e6 100644
--- a/OpenChange/MAPIStoreSpoolerContext.m
+++ b/OpenChange/MAPIStoreSpoolerContext.m
@@ -1,12 +1,12 @@
-/* MAPIStoreSpoolerContext.m - this file is part of $PROJECT_NAME_HERE$
+/* MAPIStoreSpoolerContext.m - this file is part of SOGo
  *
- * Copyright (C) 2010 Wolfgang Sourdeau
+ * Copyright (C) 2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
diff --git a/OpenChange/SOGoDraftObject+MAPIStore.h b/OpenChange/SOGoDraftObject+MAPIStore.h
index 49285b25a..ac4bec51c 100644
--- a/OpenChange/SOGoDraftObject+MAPIStore.h
+++ b/OpenChange/SOGoDraftObject+MAPIStore.h
@@ -1,12 +1,12 @@
 /* SOGoDraftObject+MAPIStore.h - this file is part of SOGo
  *
- * Copyright (C) 2010 Wolfgang Sourdeau
+ * Copyright (C) 2010 Inverse inc.
  *
- * Author: Wolfgang Sourdeau <root@inverse.ca>
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,