8 files changed, 10 insertions, 10 deletions
diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ
index bdbdbec5e1..82c7cf5419 100644
--- a/LICENSE-MPL-RabbitMQ
+++ b/LICENSE-MPL-RabbitMQ
@@ -446,7 +446,7 @@ EXHIBIT A -Mozilla Public License.
 
      The Original Code is RabbitMQ.
 
-     The Initial Developer of the Original Code is GoPivotal, Inc.
+     The Initial Developer of the Original Code is Pivotal Software, Inc.
      Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.''
 
      [NOTE: The text of this Exhibit A may differ slightly from the text of
diff --git a/check_xref b/check_xref
index d9a483b85b..78f932dc89 100755
--- a/check_xref
+++ b/check_xref
@@ -14,7 +14,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
 %% Copyright (c) 2010-2015 Pivotal Software, Inc.  All rights reserved.
 %%
 
diff --git a/codegen.py b/codegen.py
index 9f16b32425..fbc6f61f8a 100644
--- a/codegen.py
+++ b/codegen.py
@@ -10,7 +10,7 @@
 ##
 ##  The Original Code is RabbitMQ.
 ##
-##  The Initial Developer of the Original Code is GoPivotal, Inc.
+##  The Initial Developer of the Original Code is Pivotal Software, Inc.
 ##  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 ##
 
@@ -105,7 +105,7 @@ def printFileHeader():
 %%
 %%  The Original Code is RabbitMQ.
 %%
-%%  The Initial Developer of the Original Code is GoPivotal, Inc.
+%%  The Initial Developer of the Original Code is Pivotal Software, Inc.
 %%  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 %%"""
 
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl
index 5a98e7059b..bc20b4415d 100644
--- a/include/gm_specs.hrl
+++ b/include/gm_specs.hrl
@@ -10,7 +10,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
 %% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 %%
 
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 8da29d4e65..5b90956122 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -10,7 +10,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
 %% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 %%
 
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl
index 1bffc9a604..737bb4ea3d 100644
--- a/include/rabbit_cli.hrl
+++ b/include/rabbit_cli.hrl
@@ -10,7 +10,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
 %% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 %%
 
diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl
index 803ed6b7ce..8bcf2ce629 100644
--- a/include/rabbit_msg_store.hrl
+++ b/include/rabbit_msg_store.hrl
@@ -10,7 +10,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
 %% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 %%
 
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index fd5fc2330c..153ff0ef93 100644
--- a/packaging/windows-exe/rabbitmq_nsi.in
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -35,7 +35,7 @@ VIProductVersion "%%VERSION%%.0"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "%%VERSION%%"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RabbitMQ Server"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "GoPivotal, Inc"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Pivotal Software, Inc"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "" ; TODO ?
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "RabbitMQ Server"
@@ -89,7 +89,7 @@ Section "RabbitMQ Server (required)" Rabbit
   WriteRegStr HKLM ${uninstall} "DisplayName" "RabbitMQ Server"
   WriteRegStr HKLM ${uninstall} "UninstallString" "$INSTDIR\uninstall.exe"
   WriteRegStr HKLM ${uninstall} "DisplayIcon" "$INSTDIR\uninstall.exe,0"
-  WriteRegStr HKLM ${uninstall} "Publisher" "GoPivotal, Inc."
+  WriteRegStr HKLM ${uninstall} "Publisher" "Pivotal Software, Inc."
   WriteRegStr HKLM ${uninstall} "DisplayVersion" "%%VERSION%%"
   WriteRegDWORD HKLM ${uninstall} "NoModify" 1
   WriteRegDWORD HKLM ${uninstall} "NoRepair" 1