diff --git a/js/src/xpconnect/shell/xpcshellMacUtils.h b/js/src/xpconnect/shell/xpcshellMacUtils.h
index 75c451465047..d4e44fac8a42 100644
--- a/js/src/xpconnect/shell/xpcshellMacUtils.h
+++ b/js/src/xpconnect/shell/xpcshellMacUtils.h
@@ -1,7 +1,6 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -17,7 +16,7 @@
  * The Original Code is xpcshell code
  *
  * The Initial Developer of the Original Code is
- * Mozilla Messaging
+ * the Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
diff --git a/js/src/xpconnect/shell/xpcshellMacUtils.mm b/js/src/xpconnect/shell/xpcshellMacUtils.mm
index ea4656e1b897..ab16584e0681 100644
--- a/js/src/xpconnect/shell/xpcshellMacUtils.mm
+++ b/js/src/xpconnect/shell/xpcshellMacUtils.mm
@@ -1,7 +1,6 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -17,7 +16,7 @@
  * The Original Code is xpcshell code
  *
  * The Initial Developer of the Original Code is
- * Mozilla Messaging
+ * the Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
diff --git a/uriloader/exthandler/tests/unit/test_punycodeURIs.js b/uriloader/exthandler/tests/unit/test_punycodeURIs.js
index e78827659aca..e125b16f36cf 100644
--- a/uriloader/exthandler/tests/unit/test_punycodeURIs.js
+++ b/uriloader/exthandler/tests/unit/test_punycodeURIs.js
@@ -14,7 +14,7 @@
  * The Original Code is Mozilla code.
  *
  * The Initial Developer of the Original Code is
- * Mozilla Messaging
+ * the Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *