diff --git a/gpMgmt/bin/gpactivatestandby b/gpMgmt/bin/gpactivatestandby
index e304a07ab3b..949905f4155 100755
--- a/gpMgmt/bin/gpactivatestandby
+++ b/gpMgmt/bin/gpactivatestandby
@@ -4,7 +4,7 @@
 # Invalid name  - pylint: disable=C0103
 #
 # Copyright (c) EMC 2011
-# Copyright (c) Cloudberry Inc 2010
+# Copyright (c) Greenplum Inc 2010
 # All Rights Reserved. 
 #
 """
diff --git a/gpMgmt/bin/gpconfig b/gpMgmt/bin/gpconfig
index 2a817634fc8..d6e8defbaf3 100755
--- a/gpMgmt/bin/gpconfig
+++ b/gpMgmt/bin/gpconfig
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 # gpconfig will guarantee that all segments have valid conf files if gpconfig runs successfully, but we do not handle
 # sequence races. To be specific, suppose there are two simultaneous callers of gpconfig, U1 and U2, that modify
diff --git a/gpMgmt/bin/gpdeletesystem b/gpMgmt/bin/gpdeletesystem
index 5d367111cbb..8299d86d820 100755
--- a/gpMgmt/bin/gpdeletesystem
+++ b/gpMgmt/bin/gpdeletesystem
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 
 # System imports
diff --git a/gpMgmt/bin/gpexpand b/gpMgmt/bin/gpexpand
index fac488416c9..072fa4421d7 100755
--- a/gpMgmt/bin/gpexpand
+++ b/gpMgmt/bin/gpexpand
@@ -2,7 +2,7 @@
 # Line too long            - pylint: disable=C0301
 # Invalid name             - pylint: disable=C0103
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 from gppylib.mainUtils import getProgramName
 
diff --git a/gpMgmt/bin/gpinitstandby b/gpMgmt/bin/gpinitstandby
index 552332b502a..b92d532f23c 100755
--- a/gpMgmt/bin/gpinitstandby
+++ b/gpMgmt/bin/gpinitstandby
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved. 
 #
 import os
 import sys
diff --git a/gpMgmt/bin/gplogfilter b/gpMgmt/bin/gplogfilter
index 9cbac9aa8f0..693fb7c2f05 100755
--- a/gpMgmt/bin/gplogfilter
+++ b/gpMgmt/bin/gplogfilter
@@ -3,7 +3,7 @@
 #
 # gplogfilter [options] [inputfile]...
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 
 # import Python standard library modules
diff --git a/gpMgmt/bin/gppkg b/gpMgmt/bin/gppkg
index 887c8a38478..87f82400196 100755
--- a/gpMgmt/bin/gppkg
+++ b/gpMgmt/bin/gppkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 # import mainUtils FIRST to get python version check
 # THIS IMPORT SHOULD COME FIRST
diff --git a/gpMgmt/bin/gppylib/commands/base.py b/gpMgmt/bin/gppylib/commands/base.py
index 3d8d9d66eb0..951d24f68a9 100755
--- a/gpMgmt/bin/gppylib/commands/base.py
+++ b/gpMgmt/bin/gppylib/commands/base.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 """
 base.py
diff --git a/gpMgmt/bin/gppylib/commands/dca.py b/gpMgmt/bin/gppylib/commands/dca.py
index 91f1c7fc4e6..1fce198020f 100644
--- a/gpMgmt/bin/gppylib/commands/dca.py
+++ b/gpMgmt/bin/gppylib/commands/dca.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2011. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2011. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/commands/gp.py b/gpMgmt/bin/gppylib/commands/gp.py
index f9f48c5948a..4685e4bef32 100644
--- a/gpMgmt/bin/gppylib/commands/gp.py
+++ b/gpMgmt/bin/gppylib/commands/gp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/commands/pg.py b/gpMgmt/bin/gppylib/commands/pg.py
index 5361ce9d87f..23aba4660de 100644
--- a/gpMgmt/bin/gppylib/commands/pg.py
+++ b/gpMgmt/bin/gppylib/commands/pg.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 import os
diff --git a/gpMgmt/bin/gppylib/commands/test/regress/test_regress_pg.py b/gpMgmt/bin/gppylib/commands/test/regress/test_regress_pg.py
index 26df9e24644..f2b49c35da7 100755
--- a/gpMgmt/bin/gppylib/commands/test/regress/test_regress_pg.py
+++ b/gpMgmt/bin/gppylib/commands/test/regress/test_regress_pg.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 # Unit Testing of pg commands
 #
diff --git a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
index 5f83bc61b73..ec3b99b8431 100644
--- a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
+++ b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2012. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2012. All Rights Reserved.
 #
 
 import unittest
diff --git a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_gp.py b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_gp.py
index c56c8e32c8e..4ac75c69685 100644
--- a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_gp.py
+++ b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_gp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2012. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2012. All Rights Reserved. 
 #
 
 from gppylib.commands.base import CommandResult
diff --git a/gpMgmt/bin/gppylib/commands/unix.py b/gpMgmt/bin/gppylib/commands/unix.py
index fdd526b0543..361bac0f69b 100644
--- a/gpMgmt/bin/gppylib/commands/unix.py
+++ b/gpMgmt/bin/gppylib/commands/unix.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 """
 Set of Classes for executing unix commands.
diff --git a/gpMgmt/bin/gppylib/db/catalog.py b/gpMgmt/bin/gppylib/db/catalog.py
index 996695a4c8d..6214b805c29 100644
--- a/gpMgmt/bin/gppylib/db/catalog.py
+++ b/gpMgmt/bin/gppylib/db/catalog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 """ Provides Access Utilities for Examining and Modifying the GP Catalog.
 
diff --git a/gpMgmt/bin/gppylib/db/dbconn.py b/gpMgmt/bin/gppylib/db/dbconn.py
index 5fb81ee5af5..47a7e91bfd2 100644
--- a/gpMgmt/bin/gppylib/db/dbconn.py
+++ b/gpMgmt/bin/gppylib/db/dbconn.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 """
 TODO: module docs
diff --git a/gpMgmt/bin/gppylib/db/test/regress/test_regress_catalog.py b/gpMgmt/bin/gppylib/db/test/regress/test_regress_catalog.py
index 182cdc2f9c3..1ce8227e40e 100644
--- a/gpMgmt/bin/gppylib/db/test/regress/test_regress_catalog.py
+++ b/gpMgmt/bin/gppylib/db/test/regress/test_regress_catalog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 # Unit Testing of catalog module.
 #
diff --git a/gpMgmt/bin/gppylib/db/test/test_catalog.py b/gpMgmt/bin/gppylib/db/test/test_catalog.py
index 182cdc2f9c3..1ce8227e40e 100644
--- a/gpMgmt/bin/gppylib/db/test/test_catalog.py
+++ b/gpMgmt/bin/gppylib/db/test/test_catalog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 # Unit Testing of catalog module.
 #
diff --git a/gpMgmt/bin/gppylib/db/test/test_dbconn.py b/gpMgmt/bin/gppylib/db/test/test_dbconn.py
index d412f7fd0c1..3627930800b 100755
--- a/gpMgmt/bin/gppylib/db/test/test_dbconn.py
+++ b/gpMgmt/bin/gppylib/db/test/test_dbconn.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 """ Unittesting for dbconn module
diff --git a/gpMgmt/bin/gppylib/db/test/unit/test_unit_dbconn.py b/gpMgmt/bin/gppylib/db/test/unit/test_unit_dbconn.py
index 70bd3e60265..7d762487c55 100755
--- a/gpMgmt/bin/gppylib/db/test/unit/test_unit_dbconn.py
+++ b/gpMgmt/bin/gppylib/db/test/unit/test_unit_dbconn.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 """ Unittesting for dbconn module
diff --git a/gpMgmt/bin/gppylib/gp_era.py b/gpMgmt/bin/gppylib/gp_era.py
index 0ccce8e02b5..26391a2daa6 100644
--- a/gpMgmt/bin/gppylib/gp_era.py
+++ b/gpMgmt/bin/gppylib/gp_era.py
@@ -4,7 +4,7 @@
 
 """
   gp_era.py, based on gp_dbid.py
-  Copyright (c) EMC/Cloudberry Inc 2011. All Rights Reserved. 
+  Copyright (c) EMC/Greenplum Inc 2011. All Rights Reserved. 
 """
 
 import sys, os, stat, re
diff --git a/gpMgmt/bin/gppylib/gparray.py b/gpMgmt/bin/gppylib/gparray.py
index cad82f9c472..55f6a0a1a05 100755
--- a/gpMgmt/bin/gppylib/gparray.py
+++ b/gpMgmt/bin/gppylib/gparray.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 """
   gparray.py:
diff --git a/gpMgmt/bin/gppylib/gplog.py b/gpMgmt/bin/gppylib/gplog.py
index 91f4afa96ce..4a94412cec7 100644
--- a/gpMgmt/bin/gppylib/gplog.py
+++ b/gpMgmt/bin/gppylib/gplog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 """
 Cloudberry logging facilities.
diff --git a/gpMgmt/bin/gppylib/gpparseopts.py b/gpMgmt/bin/gppylib/gpparseopts.py
index 1c5a326bdcc..94d91fc2f81 100644
--- a/gpMgmt/bin/gppylib/gpparseopts.py
+++ b/gpMgmt/bin/gppylib/gpparseopts.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 """
 Standard set of helper functions for gp utilities for parsing command line options.
diff --git a/gpMgmt/bin/gppylib/gpsubprocess.py b/gpMgmt/bin/gppylib/gpsubprocess.py
index 826323686d4..0e1c062e675 100644
--- a/gpMgmt/bin/gppylib/gpsubprocess.py
+++ b/gpMgmt/bin/gppylib/gpsubprocess.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/gpversion.py b/gpMgmt/bin/gppylib/gpversion.py
index 8f12f353071..dad05c898ee 100644
--- a/gpMgmt/bin/gppylib/gpversion.py
+++ b/gpMgmt/bin/gppylib/gpversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 """
   gpversion.py:
diff --git a/gpMgmt/bin/gppylib/operations/package.py b/gpMgmt/bin/gppylib/operations/package.py
index 9479ea87562..7ba8d34affa 100644
--- a/gpMgmt/bin/gppylib/operations/package.py
+++ b/gpMgmt/bin/gppylib/operations/package.py
@@ -1,5 +1,5 @@
 # Line too long - pylint: disable=C0301
-# Copyright (c) Cloudberry Inc 2011. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2011. All Rights Reserved.
 
 from contextlib import closing
 import os
diff --git a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_buildMirrorSegments.py b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_buildMirrorSegments.py
index 8686e5c1d5b..87b2a7699b0 100644
--- a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_buildMirrorSegments.py
+++ b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_buildMirrorSegments.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 import io
 import logging
diff --git a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_update_pg_hba_on_segments.py b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_update_pg_hba_on_segments.py
index 0a3c1570c20..c0a65c48c9c 100644
--- a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_update_pg_hba_on_segments.py
+++ b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_update_pg_hba_on_segments.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 from mock import call, patch, MagicMock, Mock
 import os
diff --git a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_utils.py b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_utils.py
index 250f80609f6..38fcd327dee 100755
--- a/gpMgmt/bin/gppylib/operations/test/unit/test_unit_utils.py
+++ b/gpMgmt/bin/gppylib/operations/test/unit/test_unit_utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 import sys
 
diff --git a/gpMgmt/bin/gppylib/parseutils.py b/gpMgmt/bin/gppylib/parseutils.py
index 2a9a91abaac..5ad7c44f22f 100644
--- a/gpMgmt/bin/gppylib/parseutils.py
+++ b/gpMgmt/bin/gppylib/parseutils.py
@@ -8,7 +8,7 @@
   Routines to parse "flexible" configuration files for tools like 
     gpaddmirrors, gprecoverseg, gpexpand, etc.
 
-  Copyright (c) EMC/Cloudberry Inc 2011. All Rights Reserved. 
+  Copyright (c) EMC/Greenplum Inc 2011. All Rights Reserved. 
 """
 
 import re
diff --git a/gpMgmt/bin/gppylib/programs/clsAddMirrors.py b/gpMgmt/bin/gppylib/programs/clsAddMirrors.py
index b45275624f5..8fa831387b7 100644
--- a/gpMgmt/bin/gppylib/programs/clsAddMirrors.py
+++ b/gpMgmt/bin/gppylib/programs/clsAddMirrors.py
@@ -2,7 +2,7 @@
 # Line too long            - pylint: disable=C0301
 # Invalid name             - pylint: disable=C0103
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 # import mainUtils FIRST to get python version check
 # THIS IMPORT SHOULD COME FIRST
diff --git a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
index 141cfb09b7a..82339a35ab5 100644
--- a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
+++ b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
@@ -2,7 +2,7 @@
 # Line too long            - pylint: disable=C0301
 # Invalid name             - pylint: disable=C0103
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 # Note: the option to recover to a new host is not very good if we have a multi-home configuration
 #
diff --git a/gpMgmt/bin/gppylib/programs/clsSystemState.py b/gpMgmt/bin/gppylib/programs/clsSystemState.py
index ba155291117..c1b3bca58e5 100644
--- a/gpMgmt/bin/gppylib/programs/clsSystemState.py
+++ b/gpMgmt/bin/gppylib/programs/clsSystemState.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 # import mainUtils FIRST to get python version check
 # THIS IMPORT SHOULD COME FIRST
diff --git a/gpMgmt/bin/gppylib/programs/gppkg.py b/gpMgmt/bin/gppylib/programs/gppkg.py
index 35b3c214f32..f784386ea5f 100755
--- a/gpMgmt/bin/gppylib/programs/gppkg.py
+++ b/gpMgmt/bin/gppylib/programs/gppkg.py
@@ -1,5 +1,5 @@
 # Line too long - pylint: disable=C0301
-# Copyright (c) Cloudberry Inc 2011. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2011. All Rights Reserved.
 
 from optparse import OptionGroup
 import os
diff --git a/gpMgmt/bin/gppylib/programs/programIoUtils.py b/gpMgmt/bin/gppylib/programs/programIoUtils.py
index bda398cbd36..51628315ea9 100644
--- a/gpMgmt/bin/gppylib/programs/programIoUtils.py
+++ b/gpMgmt/bin/gppylib/programs/programIoUtils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 from gppylib import gparray, gplog, pgconf, userinput
 
diff --git a/gpMgmt/bin/gppylib/system/ComputeCatalogUpdate.py b/gpMgmt/bin/gppylib/system/ComputeCatalogUpdate.py
index 319d9227144..1315138d338 100755
--- a/gpMgmt/bin/gppylib/system/ComputeCatalogUpdate.py
+++ b/gpMgmt/bin/gppylib/system/ComputeCatalogUpdate.py
@@ -4,7 +4,7 @@
 
 """
   ComputeCatalogUpdate.py
-  Copyright (c) EMC/Cloudberry Inc 2011. All Rights Reserved. 
+  Copyright (c) EMC/Greenplum Inc 2011. All Rights Reserved. 
 
   Used by updateSystemConfig() to compare the db state and 
   goal state of a gpArray containing the Cloudberry segment 
diff --git a/gpMgmt/bin/gppylib/system/configurationImplGpdb.py b/gpMgmt/bin/gppylib/system/configurationImplGpdb.py
index 156df6bdf1b..624b9df5cf2 100644
--- a/gpMgmt/bin/gppylib/system/configurationImplGpdb.py
+++ b/gpMgmt/bin/gppylib/system/configurationImplGpdb.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
-# Copyright (c) EMC/Cloudberry Inc 2011. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
+# Copyright (c) EMC/Greenplum Inc 2011. All Rights Reserved.
 #
 """
 This file defines the interface that can be used to fetch and update system
diff --git a/gpMgmt/bin/gppylib/system/configurationInterface.py b/gpMgmt/bin/gppylib/system/configurationInterface.py
index 35306097ac1..f3babb90cb7 100644
--- a/gpMgmt/bin/gppylib/system/configurationInterface.py
+++ b/gpMgmt/bin/gppylib/system/configurationInterface.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/environment.py b/gpMgmt/bin/gppylib/system/environment.py
index 08bafaf11d8..23cbd5d8363 100644
--- a/gpMgmt/bin/gppylib/system/environment.py
+++ b/gpMgmt/bin/gppylib/system/environment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 from gppylib import gplog, pgconf
 from gppylib.commands import gp
diff --git a/gpMgmt/bin/gppylib/system/faultProberImplGpdb.py b/gpMgmt/bin/gppylib/system/faultProberImplGpdb.py
index 4a6e69b9cc0..341c3b33872 100644
--- a/gpMgmt/bin/gppylib/system/faultProberImplGpdb.py
+++ b/gpMgmt/bin/gppylib/system/faultProberImplGpdb.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/faultProberInterface.py b/gpMgmt/bin/gppylib/system/faultProberInterface.py
index 1da9e4e2f48..e83d7e8fe86 100644
--- a/gpMgmt/bin/gppylib/system/faultProberInterface.py
+++ b/gpMgmt/bin/gppylib/system/faultProberInterface.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/fileSystemImplOs.py b/gpMgmt/bin/gppylib/system/fileSystemImplOs.py
index 735ca513d33..51462b17af0 100644
--- a/gpMgmt/bin/gppylib/system/fileSystemImplOs.py
+++ b/gpMgmt/bin/gppylib/system/fileSystemImplOs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/fileSystemImplTest.py b/gpMgmt/bin/gppylib/system/fileSystemImplTest.py
index d25df5a1e0c..135dd9f9b38 100644
--- a/gpMgmt/bin/gppylib/system/fileSystemImplTest.py
+++ b/gpMgmt/bin/gppylib/system/fileSystemImplTest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/fileSystemInterface.py b/gpMgmt/bin/gppylib/system/fileSystemInterface.py
index bafb50edaec..1f2a46b2da6 100644
--- a/gpMgmt/bin/gppylib/system/fileSystemInterface.py
+++ b/gpMgmt/bin/gppylib/system/fileSystemInterface.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/osImplNative.py b/gpMgmt/bin/gppylib/system/osImplNative.py
index 6fce5494f6e..b1f70678a47 100644
--- a/gpMgmt/bin/gppylib/system/osImplNative.py
+++ b/gpMgmt/bin/gppylib/system/osImplNative.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/system/osInterface.py b/gpMgmt/bin/gppylib/system/osInterface.py
index 584696ddd9e..65949e2d63e 100644
--- a/gpMgmt/bin/gppylib/system/osInterface.py
+++ b/gpMgmt/bin/gppylib/system/osInterface.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 
 """
diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py
index cb753921f8d..d7d92ec036c 100755
--- a/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py
+++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # Line too long - pylint: disable=C0301
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 """ Unittesting for gplog module
diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gpload.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gpload.py
index 4164972da28..fe88fcb7445 100755
--- a/gpMgmt/bin/gppylib/test/unit/test_unit_gpload.py
+++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gpload.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2013. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2013. All Rights Reserved. 
 #
 """ 
 Unit testing for gpload module
diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gplog.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gplog.py
index f6333381942..63f4cfd2855 100755
--- a/gpMgmt/bin/gppylib/test/unit/test_unit_gplog.py
+++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gplog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 import logging
 
diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py
index b756332d1d1..df5245a8a42 100755
--- a/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py
+++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved. 
 #
 """ 
 Unit testing for gpversion module
diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_seg_update_pg_hba.py b/gpMgmt/bin/gppylib/test/unit/test_unit_seg_update_pg_hba.py
index 95ca4861157..5ac6aee9249 100644
--- a/gpMgmt/bin/gppylib/test/unit/test_unit_seg_update_pg_hba.py
+++ b/gpMgmt/bin/gppylib/test/unit/test_unit_seg_update_pg_hba.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 from mock import call, patch, MagicMock, Mock
 import os
diff --git a/gpMgmt/bin/gppylib/userinput.py b/gpMgmt/bin/gppylib/userinput.py
index 19da4c84f22..7dd09375f82 100644
--- a/gpMgmt/bin/gppylib/userinput.py
+++ b/gpMgmt/bin/gppylib/userinput.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved. 
 #
 
 import getpass
diff --git a/gpMgmt/bin/gppylib/util/gp_utils.py b/gpMgmt/bin/gppylib/util/gp_utils.py
index 9c30bb960f3..07fe4f43278 100644
--- a/gpMgmt/bin/gppylib/util/gp_utils.py
+++ b/gpMgmt/bin/gppylib/util/gp_utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 # Cloudberry DB related utility functions
 
diff --git a/gpMgmt/bin/gppylib/util/ssh_utils.py b/gpMgmt/bin/gppylib/util/ssh_utils.py
index ddc58e6f4f6..f194d8b2d02 100644
--- a/gpMgmt/bin/gppylib/util/ssh_utils.py
+++ b/gpMgmt/bin/gppylib/util/ssh_utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 # This file contains ssh Session class and support functions/classes.
 
diff --git a/gpMgmt/bin/gpstart b/gpMgmt/bin/gpstart
index 48baa8296a3..933d41fe1f2 100755
--- a/gpMgmt/bin/gpstart
+++ b/gpMgmt/bin/gpstart
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 #
 # THIS IMPORT MUST COME FIRST
diff --git a/gpMgmt/bin/gpstop b/gpMgmt/bin/gpstop
index b428f9aaae9..48c0a193388 100755
--- a/gpMgmt/bin/gpstop
+++ b/gpMgmt/bin/gpstop
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 #
 # THIS IMPORT MUST COME FIRST
diff --git a/gpMgmt/bin/lib/gpcreateseg.sh b/gpMgmt/bin/lib/gpcreateseg.sh
index da7ae2a4bd7..e3a916b7423 100755
--- a/gpMgmt/bin/lib/gpcreateseg.sh
+++ b/gpMgmt/bin/lib/gpcreateseg.sh
@@ -8,7 +8,7 @@
 #	Release date:-		Dec 2006
 #	Release stat:-		Released
 #                               Copyright (c) Metapa 2005. All Rights Reserved.
-#                               Copyright (c) 2007 Cloudberry Inc
+#                               Copyright (c) 2007 Greenplum Inc
 #******************************************************************************
 # Update History
 #******************************************************************************
diff --git a/gpMgmt/sbin/gpcleansegmentdir.py b/gpMgmt/sbin/gpcleansegmentdir.py
index 024b5ad25a8..10c04444bcc 100755
--- a/gpMgmt/sbin/gpcleansegmentdir.py
+++ b/gpMgmt/sbin/gpcleansegmentdir.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved.
 #
 #
 # THIS IMPORT MUST COME FIRST
diff --git a/gpMgmt/sbin/gpconfig_helper.py b/gpMgmt/sbin/gpconfig_helper.py
index 27e1d06a63f..3191957c651 100755
--- a/gpMgmt/sbin/gpconfig_helper.py
+++ b/gpMgmt/sbin/gpconfig_helper.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2009. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2009. All Rights Reserved.
 #
 #
 # NOTE: The file semantics here are subtle.  In this file, we are reading or writing to filename, which is
diff --git a/gpMgmt/sbin/gpgetstatususingtransition.py b/gpMgmt/sbin/gpgetstatususingtransition.py
index 7fe41ae6238..d472fa6f480 100755
--- a/gpMgmt/sbin/gpgetstatususingtransition.py
+++ b/gpMgmt/sbin/gpgetstatususingtransition.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2010. All Rights Reserved. 
+# Copyright (c) Greenplum Inc 2010. All Rights Reserved. 
 #
 #
 # THIS IMPORT MUST COME FIRST
diff --git a/gpMgmt/sbin/gpsegstart.py b/gpMgmt/sbin/gpsegstart.py
index 6397eec29b5..fb58091a4de 100755
--- a/gpMgmt/sbin/gpsegstart.py
+++ b/gpMgmt/sbin/gpsegstart.py
@@ -2,8 +2,8 @@
 # Line too long - pylint: disable=C0301
 # Invalid name  - pylint: disable=C0103
 #
-# Copyright (c) EMC/Cloudberry Inc 2011. All Rights Reserved.
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) EMC/Greenplum Inc 2011. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 """
 Internal Use Function.
diff --git a/gpMgmt/sbin/gpsegstop.py b/gpMgmt/sbin/gpsegstop.py
index 57b2fe92839..188cd2f3c1f 100755
--- a/gpMgmt/sbin/gpsegstop.py
+++ b/gpMgmt/sbin/gpsegstop.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Cloudberry Inc 2008. All Rights Reserved.
+# Copyright (c) Greenplum Inc 2008. All Rights Reserved.
 #
 #
 # Internal Use Function.
diff --git a/gpcontrib/gp_sparse_vector/gp_sfv.c b/gpcontrib/gp_sparse_vector/gp_sfv.c
index ba4f0f2a516..e66419662e0 100644
--- a/gpcontrib/gp_sparse_vector/gp_sfv.c
+++ b/gpcontrib/gp_sparse_vector/gp_sfv.c
@@ -40,7 +40,7 @@ Datum gp_extract_feature_histogram(PG_FUNCTION_ARGS);
 
 /*
  * 	gp_extract_feature_histogram
- * 	By: Luke Lonergan, November 2009, Cloudberry Inc.
+ * 	By: Luke Lonergan, November 2009, Greenplum Inc.
  * 	Credits:
  * 		This was motivated by discussions with Brian Dolan at FIM / MySpace
  *
diff --git a/src/backend/access/aocs/aocsam.c b/src/backend/access/aocs/aocsam.c
index 398e3912790..d4f19e4482e 100644
--- a/src/backend/access/aocs/aocsam.c
+++ b/src/backend/access/aocs/aocsam.c
@@ -3,7 +3,7 @@
  * aocsam.c
  *	  Append only columnar access methods
  *
- * Portions Copyright (c) 2009-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2009-2010, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/access/aocs/aocsam_handler.c b/src/backend/access/aocs/aocsam_handler.c
index 8aa65a5f6db..32870f49596 100644
--- a/src/backend/access/aocs/aocsam_handler.c
+++ b/src/backend/access/aocs/aocsam_handler.c
@@ -3,7 +3,7 @@
  * aocsam_handler.c
  *	  Append only columnar access methods handler
  *
- * Portions Copyright (c) 2009-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2009-2010, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/access/aocs/aocssegfiles.c b/src/backend/access/aocs/aocssegfiles.c
index fc712ab163b..9f389f94cd6 100644
--- a/src/backend/access/aocs/aocssegfiles.c
+++ b/src/backend/access/aocs/aocssegfiles.c
@@ -3,7 +3,7 @@
  * aocssegfiles.c
  *	  AOCS Segment files.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/access/appendonly/aomd.c b/src/backend/access/appendonly/aomd.c
index a0c08aacb6f..a47b75d3dc4 100644
--- a/src/backend/access/appendonly/aomd.c
+++ b/src/backend/access/appendonly/aomd.c
@@ -10,7 +10,7 @@
  *	  As of now we still let md.c create and unlink AO relations for us. This
  *	  may need to change if inconsistencies arise.
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/access/appendonly/aomd_filehandler.c b/src/backend/access/appendonly/aomd_filehandler.c
index 512180da34a..e7147478f96 100644
--- a/src/backend/access/appendonly/aomd_filehandler.c
+++ b/src/backend/access/appendonly/aomd_filehandler.c
@@ -4,7 +4,7 @@
  *	  Code in this file would have been in aomd.c but is needed in contrib,
  * so we separate it out here.
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/access/appendonly/aosegfiles.c b/src/backend/access/appendonly/aosegfiles.c
index 0aff8c0a701..2e651099cb8 100644
--- a/src/backend/access/appendonly/aosegfiles.c
+++ b/src/backend/access/appendonly/aosegfiles.c
@@ -4,7 +4,7 @@
  *	  routines to support manipulation of the pg_aoseg_<oid> relation
  *	  that accompanies each Append Only relation.
  *
- * Portions Copyright (c) 2008, Cloudberry Inc
+ * Portions Copyright (c) 2008, Greenplum Inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/access/appendonly/appendonlyam.c b/src/backend/access/appendonly/appendonlyam.c
index e53e75d764b..ca63e00db2a 100755
--- a/src/backend/access/appendonly/appendonlyam.c
+++ b/src/backend/access/appendonly/appendonlyam.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2008-2009, Cloudberry Inc.
+ * Portions Copyright (c) 2008-2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/access/appendonly/appendonlyam_handler.c b/src/backend/access/appendonly/appendonlyam_handler.c
index fe0c8f8d717..52bc1a418f3 100644
--- a/src/backend/access/appendonly/appendonlyam_handler.c
+++ b/src/backend/access/appendonly/appendonlyam_handler.c
@@ -3,7 +3,7 @@
  * appendonlyam_handler.c
  *	  appendonly table access method code
  *
- * Portions Copyright (c) 2008, Cloudberry Inc
+ * Portions Copyright (c) 2008, Greenplum Inc
  * Portions Copyright (c) 2020-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/access/appendonly/appendonlyblockdirectory.c b/src/backend/access/appendonly/appendonlyblockdirectory.c
index 2c5727f2b09..a97dbd71ef2 100644
--- a/src/backend/access/appendonly/appendonlyblockdirectory.c
+++ b/src/backend/access/appendonly/appendonlyblockdirectory.c
@@ -3,7 +3,7 @@
  * appendonlyblockdirectory.c
  *    maintain the block directory to blocks in append-only relation files.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/access/appendonly/appendonlywriter.c b/src/backend/access/appendonly/appendonlywriter.c
index 14453429780..64434fd8932 100644
--- a/src/backend/access/appendonly/appendonlywriter.c
+++ b/src/backend/access/appendonly/appendonlywriter.c
@@ -6,7 +6,7 @@
  *
  * Note: This is also used by AOCS tables.
  *
- * Portions Copyright (c) 2008, Cloudberry Inc
+ * Portions Copyright (c) 2008, Greenplum Inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/access/bitmap/Makefile b/src/backend/access/bitmap/Makefile
index 13ca39bfafa..ae8923b5db0 100644
--- a/src/backend/access/bitmap/Makefile
+++ b/src/backend/access/bitmap/Makefile
@@ -3,7 +3,7 @@
 # Makefile--
 #    Makefile for access/bitmap
 #
-#  Portions Copyright (c) 2007-2010 Cloudberry Inc
+#  Portions Copyright (c) 2007-2010 Greenplum Inc
 #  Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
 #  Portions Copyright (c) 2006, PostgreSQL Global Development Group
 #
diff --git a/src/backend/access/bitmap/bitmap.c b/src/backend/access/bitmap/bitmap.c
index eaba746deb1..0d098c72c8b 100644
--- a/src/backend/access/bitmap/bitmap.c
+++ b/src/backend/access/bitmap/bitmap.c
@@ -3,7 +3,7 @@
  * bitmap.c
  *	  Implementation of the Hybrid Run-Length (HRL) on-disk bitmap index.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmapattutil.c b/src/backend/access/bitmap/bitmapattutil.c
index 959f7a855ce..cf3f03ee04b 100644
--- a/src/backend/access/bitmap/bitmapattutil.c
+++ b/src/backend/access/bitmap/bitmapattutil.c
@@ -4,7 +4,7 @@
  *	  Defines the routines to maintain all distinct attribute values
  *	  which are indexed in the on-disk bitmap index.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmapinsert.c b/src/backend/access/bitmap/bitmapinsert.c
index 61ac999a63b..24e4c01bf41 100644
--- a/src/backend/access/bitmap/bitmapinsert.c
+++ b/src/backend/access/bitmap/bitmapinsert.c
@@ -3,7 +3,7 @@
  * bitmapinsert.c
  *	  Tuple insertion in the on-disk bitmap index.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmappages.c b/src/backend/access/bitmap/bitmappages.c
index ec078fe45bd..d4b9d1e3f4c 100644
--- a/src/backend/access/bitmap/bitmappages.c
+++ b/src/backend/access/bitmap/bitmappages.c
@@ -3,7 +3,7 @@
  * bitmappages.c
  *	  Bitmap index page management code for the bitmap index.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmapsearch.c b/src/backend/access/bitmap/bitmapsearch.c
index 7ba37e933d3..5fd5c472d6a 100644
--- a/src/backend/access/bitmap/bitmapsearch.c
+++ b/src/backend/access/bitmap/bitmapsearch.c
@@ -3,7 +3,7 @@
  * bitmapsearch.c
  *	  Search routines for on-disk bitmap index access method.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Porions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmaputil.c b/src/backend/access/bitmap/bitmaputil.c
index 5505de65390..82935676432 100644
--- a/src/backend/access/bitmap/bitmaputil.c
+++ b/src/backend/access/bitmap/bitmaputil.c
@@ -3,7 +3,7 @@
  * bitmaputil.c
  *	  Utility routines for on-disk bitmap index access method.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/access/bitmap/bitmapxlog.c b/src/backend/access/bitmap/bitmapxlog.c
index 7c3d89b2caf..495a74ab2fb 100644
--- a/src/backend/access/bitmap/bitmapxlog.c
+++ b/src/backend/access/bitmap/bitmapxlog.c
@@ -3,7 +3,7 @@
  * bitmapxlog.c
  *	  WAL replay logic for the bitmap index.
  *
- * Portions Copyright (c) 2007-2010 Cloudberry Inc
+ * Portions Copyright (c) 2007-2010 Greenplum Inc
  * Portions Copyright (c) 2010-2012 EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 2006-2008, PostgreSQL Global Development Group
diff --git a/src/backend/catalog/aoblkdir.c b/src/backend/catalog/aoblkdir.c
index 4e3af7eadc8..d7c8e07f46b 100644
--- a/src/backend/catalog/aoblkdir.c
+++ b/src/backend/catalog/aoblkdir.c
@@ -5,7 +5,7 @@
  *   directory tables. This file is identical in functionality to aoseg.c
  *   that exists in the same directory.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/catalog/aoseg.c b/src/backend/catalog/aoseg.c
index c09dbf0b263..6711a749d82 100644
--- a/src/backend/catalog/aoseg.c
+++ b/src/backend/catalog/aoseg.c
@@ -7,7 +7,7 @@
  *    (pg_toast_<reloid>) and the other append only segment position tables
  *    (pg_aoseg_<reloid>).
  *
- * Portions Copyright (c) 2008-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2008-2010, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/catalog/gp_fastsequence.c b/src/backend/catalog/gp_fastsequence.c
index 3c0f95c0649..eb3dcdbb0ee 100644
--- a/src/backend/catalog/gp_fastsequence.c
+++ b/src/backend/catalog/gp_fastsequence.c
@@ -3,7 +3,7 @@
  * gp_fastsequence.c
  *    routines to maintain a light-weight sequence table.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/catalog/pg_appendonly.c b/src/backend/catalog/pg_appendonly.c
index ae4c2656f5e..ef04d8755fc 100644
--- a/src/backend/catalog/pg_appendonly.c
+++ b/src/backend/catalog/pg_appendonly.c
@@ -3,7 +3,7 @@
  * pg_appendonly.c
  *	  routines to support manipulation of the pg_appendonly relation
  *
- * Portions Copyright (c) 2008, Cloudberry Inc
+ * Portions Copyright (c) 2008, Greenplum Inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/cdb/motion/ic_udpifc.c b/src/backend/cdb/motion/ic_udpifc.c
index 3dbdd5307ee..90a1e6abde7 100644
--- a/src/backend/cdb/motion/ic_udpifc.c
+++ b/src/backend/cdb/motion/ic_udpifc.c
@@ -2,7 +2,7 @@
  * ic_udpifc.c
  *	   Interconnect code specific to UDP transport.
  *
- * Portions Copyright (c) 2005-2011, Cloudberry Inc.
+ * Portions Copyright (c) 2005-2011, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Copyright (c) 2011-2012, EMC Corporation
  *
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index d6b3e54694d..811a2c17ab7 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -41,7 +41,7 @@
  * and munge the system catalogs of the new database.
  *
  *
- * Portions Copyright (c) 2005-2010 Cloudberry Inc
+ * Portions Copyright (c) 2005-2010 Greenplum Inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 9af550d26cc..f3331acd833 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -22,7 +22,7 @@
  *
  * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2008-2009, Cloudberry Inc.
+ * Portions Copyright (c) 2008-2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/fts/fts.c b/src/backend/fts/fts.c
index d10918c1d39..665f9295cd3 100644
--- a/src/backend/fts/fts.c
+++ b/src/backend/fts/fts.c
@@ -6,7 +6,7 @@
  *
  * Maintains an array in shared memory containing the state of each segment.
  *
- * Portions Copyright (c) 2005-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2005-2010, Greenplum Inc.
  * Portions Copyright (c) 2011, EMC Corp.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h b/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h
index 5136a87e4ac..26583fd8acc 100644
--- a/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h
+++ b/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008 - 2010 Cloudberry Inc.
+//	Copyright (C) 2008 - 2010 Greenplum Inc.
 //
 //	@filename:
 //		COstreamString.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h b/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h
index a7e75d7eadd..726ef0c8cf6 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h
index f107433ab2c..ff11829f02a 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h
index f735372aeb2..48d4ce5926f 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009-2010 Cloudberry Inc.
+//	Copyright (C) 2009-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h
index 92a1080d060..57fa6496bfc 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009-2010 Cloudberry Inc.
+//	Copyright (C) 2009-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h
index 0da578861fa..08c8bf3dc24 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h b/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h
index 499bf1916d8..bcfda8d9249 100644
--- a/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h
+++ b/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h b/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h
index ad37be51ec5..3bac58581e9 100644
--- a/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h
+++ b/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/src/io/COstreamString.cpp b/src/backend/gporca/libgpos/src/io/COstreamString.cpp
index e8c14529320..6cd5a660c83 100644
--- a/src/backend/gporca/libgpos/src/io/COstreamString.cpp
+++ b/src/backend/gporca/libgpos/src/io/COstreamString.cpp
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009 - 2010 Cloudberry Inc.
+//	Copyright (C) 2009 - 2010 Greenplum Inc.
 //
 //	@filename:
 //		COstreamString.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp b/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
index 23058c8a0e6..9ebe1ed51a2 100644
--- a/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
+++ b/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009-2010 Cloudberry Inc.
+//	Copyright (C) 2009-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp b/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp
index c615b8deb80..f9c756171bd 100644
--- a/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp
+++ b/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2008-2010 Cloudberry Inc.
+//	Copyright (C) 2008-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp b/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
index 3ac8c0c97fa..e284439cc93 100644
--- a/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
+++ b/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009-2010 Cloudberry Inc.
+//	Copyright (C) 2009-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
index 30c7bb77124..1b4f9839999 100644
--- a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
+++ b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------
 //	Cloudberry Database
-//	Copyright (C) 2009-2010 Cloudberry Inc.
+//	Copyright (C) 2009-2010 Greenplum Inc.
 //	Copyright (C) 2011 EMC Corp.
 //
 //	@filename:
diff --git a/src/backend/storage/file/gp_compress.c b/src/backend/storage/file/gp_compress.c
index 91fd7f9349e..4c022172159 100644
--- a/src/backend/storage/file/gp_compress.c
+++ b/src/backend/storage/file/gp_compress.c
@@ -3,7 +3,7 @@
  * gp_compress.c
  *	  Common compression utilities
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) EMC, 2011
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
diff --git a/src/backend/utils/datumstream/datumstream.c b/src/backend/utils/datumstream/datumstream.c
index 8bd34ec9d2f..eb4c18b569e 100644
--- a/src/backend/utils/datumstream/datumstream.c
+++ b/src/backend/utils/datumstream/datumstream.c
@@ -2,7 +2,7 @@
  *
  * datumstream.c
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/utils/misc/faultinjector.c b/src/backend/utils/misc/faultinjector.c
index 4e5c61e78ed..40b26e78194 100644
--- a/src/backend/utils/misc/faultinjector.c
+++ b/src/backend/utils/misc/faultinjector.c
@@ -9,7 +9,7 @@
  * suspend, skip, or even panic the process. Fault injectors are set in shared
  * memory so they are accessible to all segment processes.
  *
- * Portions Copyright (c) 2009-2010 Cloudberry Inc
+ * Portions Copyright (c) 2009-2010 Greenplum Inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/backend/utils/mmgr/memprot.c b/src/backend/utils/mmgr/memprot.c
index cbe9581b6e9..8238e152394 100644
--- a/src/backend/utils/mmgr/memprot.c
+++ b/src/backend/utils/mmgr/memprot.c
@@ -2,7 +2,7 @@
  * memprot.c
  *		Memory allocation under greenplum memory allocation.
  * 
- * Copyright(c) 2008, Cloudberry Inc.
+ * Copyright(c) 2008, Greenplum Inc.
  * 
  * We wrap up calls to malloc/realloc/free with our own accounting
  * so that we will make sure a postgres process will not go beyond
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index 521a9501d5b..29e86af3a01 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -64,7 +64,7 @@
  * It is up to the calling code to do the freezing, opening for reading, and
  * destroying the tuplestore in the right order!
  *
- * Portions Copyright (c) 2007-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2007-2010, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/bin/gpfts/fts.c b/src/bin/gpfts/fts.c
index fcebe71d346..3bac24448d9 100644
--- a/src/bin/gpfts/fts.c
+++ b/src/bin/gpfts/fts.c
@@ -6,7 +6,7 @@
  *
  * Maintains an array in shared memory containing the state of each segment.
  *
- * Portions Copyright (c) 2005-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2005-2010, Greenplum Inc.
  * Portions Copyright (c) 2011, EMC Corp.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
diff --git a/src/bin/gpfts/test/gp_fts_test.c b/src/bin/gpfts/test/gp_fts_test.c
index 9bf735b9f9e..4d6a64c353d 100644
--- a/src/bin/gpfts/test/gp_fts_test.c
+++ b/src/bin/gpfts/test/gp_fts_test.c
@@ -4,7 +4,7 @@
  *	  unit test for separated fts damone testing
  *
  *
- * Portions Copyright (c) 2022-2023, Cloudberry Inc.
+ * Portions Copyright (c) 2022-2023, Greenplum Inc.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/common/etcdutils.c b/src/common/etcdutils.c
index e64535b1efc..62e964b601a 100644
--- a/src/common/etcdutils.c
+++ b/src/common/etcdutils.c
@@ -4,7 +4,7 @@
  *	  A simple lib for etcd config file parsing
  *
  *
- * Portions Copyright (c) 2022-2023, Cloudberry Inc.
+ * Portions Copyright (c) 2022-2023, Greenplum Inc.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/aomd.h b/src/include/access/aomd.h
index bf912b1b73a..717cb70f79a 100644
--- a/src/include/access/aomd.h
+++ b/src/include/access/aomd.h
@@ -3,7 +3,7 @@
  * aomd.h
  *	  Declarations and functions for supporting aomd.c
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/access/aosegfiles.h b/src/include/access/aosegfiles.h
index d4bd4fe2d42..a492b8e8992 100644
--- a/src/include/access/aosegfiles.h
+++ b/src/include/access/aosegfiles.h
@@ -4,7 +4,7 @@
  *	  Internal specifications of the pg_aoseg_* Append Only file segment
  *	  list relation.
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/catalog/aoblkdir.h b/src/include/catalog/aoblkdir.h
index dd4927448e1..1b94ba90927 100644
--- a/src/include/catalog/aoblkdir.h
+++ b/src/include/catalog/aoblkdir.h
@@ -3,7 +3,7 @@
  * aoblkdir.h
  *   Definitions to support creation of aoblkdir tables.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/catalog/aoseg.h b/src/include/catalog/aoseg.h
index 2e8aac30fc4..269270e9814 100644
--- a/src/include/catalog/aoseg.h
+++ b/src/include/catalog/aoseg.h
@@ -3,7 +3,7 @@
  * aoseg.h
  *	  This file provides some definitions to support creation of aoseg tables
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/gp_fastsequence.h b/src/include/catalog/gp_fastsequence.h
index fda5f44085e..e8ff66e90bc 100644
--- a/src/include/catalog/gp_fastsequence.h
+++ b/src/include/catalog/gp_fastsequence.h
@@ -4,7 +4,7 @@
  *    a table maintaining a light-weight fast sequence number for a unique
  *    object.
  *
- * Portions Copyright (c) 2009-2011, Cloudberry Inc.
+ * Portions Copyright (c) 2009-2011, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/catalog/gp_segment_configuration.h b/src/include/catalog/gp_segment_configuration.h
index 52ca1433b7a..b219938409f 100644
--- a/src/include/catalog/gp_segment_configuration.h
+++ b/src/include/catalog/gp_segment_configuration.h
@@ -3,7 +3,7 @@
  * gp_segment_configuration.h
  *    a segment configuration table
  *
- * Portions Copyright (c) 2006-2011, Cloudberry Inc.
+ * Portions Copyright (c) 2006-2011, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/catalog/pg_appendonly.h b/src/include/catalog/pg_appendonly.h
index 170bc627b8b..7aa3f22a333 100644
--- a/src/include/catalog/pg_appendonly.h
+++ b/src/include/catalog/pg_appendonly.h
@@ -3,7 +3,7 @@
  * pg_appendonly.h
  *	  internal specifications of the appendonly relation storage.
  *
- * Portions Copyright (c) 2008-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2008-2010, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/catalog/pg_extprotocol.h b/src/include/catalog/pg_extprotocol.h
index d16b66ab806..cab50affd13 100644
--- a/src/include/catalog/pg_extprotocol.h
+++ b/src/include/catalog/pg_extprotocol.h
@@ -3,7 +3,7 @@
  * pg_extprotocol.h
  *    an external table custom protocol table
  *
- * Portions Copyright (c) 2011, Cloudberry Inc.
+ * Portions Copyright (c) 2011, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/cdb/cdbaocsam.h b/src/include/cdb/cdbaocsam.h
index 16785f00788..e0ab7d5f15e 100644
--- a/src/include/cdb/cdbaocsam.h
+++ b/src/include/cdb/cdbaocsam.h
@@ -3,7 +3,7 @@
  * cdbaocsam.h
  *	  append-only columnar relation access method definitions.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/cdb/cdbappendonlyam.h b/src/include/cdb/cdbappendonlyam.h
index 151ed50d54e..5643ae234c9 100644
--- a/src/include/cdb/cdbappendonlyam.h
+++ b/src/include/cdb/cdbappendonlyam.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2007, Cloudberry Inc.
+ * Portions Copyright (c) 2007, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/cdb/cdbappendonlyblockdirectory.h b/src/include/cdb/cdbappendonlyblockdirectory.h
index 615058cef81..7a314490105 100644
--- a/src/include/cdb/cdbappendonlyblockdirectory.h
+++ b/src/include/cdb/cdbappendonlyblockdirectory.h
@@ -2,7 +2,7 @@
  *
  * cdbappendonlyblockdirectory.h
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/cdb/cdbicudpfaultinjection.h b/src/include/cdb/cdbicudpfaultinjection.h
index 113fd004847..7bea414b7ef 100644
--- a/src/include/cdb/cdbicudpfaultinjection.h
+++ b/src/include/cdb/cdbicudpfaultinjection.h
@@ -3,7 +3,7 @@
  * cdbicudpfaultinjection.h
  *	   Fault injection code for UDP interconnect.
  *
- * Portions Copyright (c) 2005-2011, Cloudberry Inc.
+ * Portions Copyright (c) 2005-2011, Greenplum Inc.
  * Portions Copyright (c) 2011-2012, EMC Corporation
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
diff --git a/src/include/gppc/gppc.h b/src/include/gppc/gppc.h
index 1b145fdde51..1ed20c489b5 100755
--- a/src/include/gppc/gppc.h
+++ b/src/include/gppc/gppc.h
@@ -28,7 +28,7 @@
  * GPPC 1.1 is compatible with Cloudberry Database 4.2.2.0 and above.
  * GPPC 1.2 is compatible with Cloudberry Database 4.2.2.0 and above.
  *
- * Portions Copyright (c) 2012, Cloudberry Inc.
+ * Portions Copyright (c) 2012, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/postmaster/fts.h b/src/include/postmaster/fts.h
index 986e9491855..694bdd9e7d5 100644
--- a/src/include/postmaster/fts.h
+++ b/src/include/postmaster/fts.h
@@ -3,7 +3,7 @@
  * fts.h
  *	  Interface for fault tolerance service (FTS).
  *
- * Portions Copyright (c) 2005-2010, Cloudberry Inc.
+ * Portions Copyright (c) 2005-2010, Greenplum Inc.
  * Portions Copyright (c) 2011, EMC Corp.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
diff --git a/src/include/storage/gp_compress.h b/src/include/storage/gp_compress.h
index c76ead28868..24f7f3c8501 100644
--- a/src/include/storage/gp_compress.h
+++ b/src/include/storage/gp_compress.h
@@ -3,7 +3,7 @@
  * gp_compress.h
  *      gpdb compression utilities.
  *
- * Portions Copyright (c) 2009, Cloudberry Inc.
+ * Portions Copyright (c) 2009, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/utils/datumstream.h b/src/include/utils/datumstream.h
index 97d58eeb6de..14ba145c8d4 100644
--- a/src/include/utils/datumstream.h
+++ b/src/include/utils/datumstream.h
@@ -2,7 +2,7 @@
  *
  * datumstream.h
  *
- * Portions Copyright (c) 2008, Cloudberry Inc.
+ * Portions Copyright (c) 2008, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/include/utils/faultinjector.h b/src/include/utils/faultinjector.h
index 892e8f42440..e09d2b77c2a 100644
--- a/src/include/utils/faultinjector.h
+++ b/src/include/utils/faultinjector.h
@@ -2,7 +2,7 @@
  *  faultinjector.h
  *  
  *
- *  Copyright 2009-2010, Cloudberry Inc. All rights reserved.
+ *  Copyright 2009-2010, Greenplum Inc. All rights reserved.
  *
  */
 
diff --git a/src/include/utils/faultinjector_lists.h b/src/include/utils/faultinjector_lists.h
index 164631c1e98..02b8126b6a2 100644
--- a/src/include/utils/faultinjector_lists.h
+++ b/src/include/utils/faultinjector_lists.h
@@ -18,7 +18,7 @@
  * below.
  *
  *
- * Copyright 2009-2010, Cloudberry Inc. All rights reserved.
+ * Copyright 2009-2010, Greenplum Inc. All rights reserved.
  * Copyright (c) 2017-Present VMware, Inc. or its affiliates.
  */
 
diff --git a/src/interfaces/gppc/gppc.c b/src/interfaces/gppc/gppc.c
index ff6f356c92b..1f55205d928 100644
--- a/src/interfaces/gppc/gppc.c
+++ b/src/interfaces/gppc/gppc.c
@@ -3,7 +3,7 @@
  * gppc.c
  *	  libgppc wrapper main
  *
- * Portions Copyright (c) 2012, Cloudberry Inc.
+ * Portions Copyright (c) 2012, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/interfaces/gppc/test/gppc_demo.c b/src/interfaces/gppc/test/gppc_demo.c
index 1a4a29dfe24..7a79fafed2b 100644
--- a/src/interfaces/gppc/test/gppc_demo.c
+++ b/src/interfaces/gppc/test/gppc_demo.c
@@ -3,7 +3,7 @@
  * gppc_test.c
  *	  libgppc client program
  *
- * Portions Copyright (c) 2012, Cloudberry Inc.
+ * Portions Copyright (c) 2012, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/interfaces/gppc/test/gppc_test.c b/src/interfaces/gppc/test/gppc_test.c
index fd5d2f24cc6..c2f7239c5c3 100644
--- a/src/interfaces/gppc/test/gppc_test.c
+++ b/src/interfaces/gppc/test/gppc_test.c
@@ -3,7 +3,7 @@
  * gppc_test.c
  *	  libgppc test program
  *
- * Portions Copyright (c) 2012, Cloudberry Inc.
+ * Portions Copyright (c) 2012, Greenplum Inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
  *
  *
diff --git a/src/test/regress/dld.pl b/src/test/regress/dld.pl
index faabc4ce897..2678cb1d30c 100755
--- a/src/test/regress/dld.pl
+++ b/src/test/regress/dld.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Portions Copyright (c) 2007-2010, Cloudberry Inc
+# Portions Copyright (c) 2007-2010, Greenplum Inc
 # Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
 # Author: Jeffrey I Cohen
 #
diff --git a/src/test/regress/expected/tpch500GB.out b/src/test/regress/expected/tpch500GB.out
index 338cab3c03a..7a36575cfba 100755
--- a/src/test/regress/expected/tpch500GB.out
+++ b/src/test/regress/expected/tpch500GB.out
@@ -9,7 +9,7 @@ set gp_selectivity_damping_for_joins = off;
 set allow_system_table_mods = true;
 -- 
 -- Cloudberry Database Statistics Dump
--- Copyright (C) 2007  Cloudberry Inc.
+-- Copyright (C) 2007  Greenplum Inc.
 -- 
 -- Database: tpch500
 -- Date:     2007-10-05
diff --git a/src/test/regress/explain.pl b/src/test/regress/explain.pl
index 7b9b5c5ccea..5099f5d5bf7 100755
--- a/src/test/regress/explain.pl
+++ b/src/test/regress/explain.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Portions Copyright (c) 2006, 2007, 2008, 2009 Cloudberry Inc
+# Portions Copyright (c) 2006, 2007, 2008, 2009 Greenplum Inc
 # Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
 #
 # Author: Jeffrey I Cohen
diff --git a/src/test/regress/get_ereport.pl b/src/test/regress/get_ereport.pl
index cebd67687c0..de9664d8ae5 100755
--- a/src/test/regress/get_ereport.pl
+++ b/src/test/regress/get_ereport.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Portions Copyright (c) 2009, 2010, 2011 Cloudberry Inc
+# Portions Copyright (c) 2009, 2010, 2011 Greenplum Inc
 # Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
 #
 # Author: Jeffrey I Cohen
diff --git a/src/test/regress/sql/tpch500GB.sql b/src/test/regress/sql/tpch500GB.sql
index 868528671fd..50743f937f4 100755
--- a/src/test/regress/sql/tpch500GB.sql
+++ b/src/test/regress/sql/tpch500GB.sql
@@ -12,7 +12,7 @@ set allow_system_table_mods = true;
 
 -- 
 -- Cloudberry Database Statistics Dump
--- Copyright (C) 2007  Cloudberry Inc.
+-- Copyright (C) 2007  Greenplum Inc.
 -- 
 -- Database: tpch500
 -- Date:     2007-10-05