diff --git a/src/backend/access/bitmap/bitmappages.c b/src/backend/access/bitmap/bitmappages.c
index 9f485f1e6aebac584ebb0fa94f04de601569bc67..23b17cc685b173f23279d95469023b2ff25c9403 100644
--- a/src/backend/access/bitmap/bitmappages.c
+++ b/src/backend/access/bitmap/bitmappages.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * bitmappage.c
+ * bitmappages.c
  *	  Bitmap index page management code for the bitmap index.
  *
  * Copyright (c) 2006-2008, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL$
+ *	  src/backend/access/bitmap/bitmappages.c
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
diff --git a/src/backend/cdb/motion/ic_udpifc.c b/src/backend/cdb/motion/ic_udpifc.c
index 1f18a6524564687fdd4a52871f1294afd76f0c27..ef6b995e4c76f634cbce9bb5fc7095d4c791f95f 100644
--- a/src/backend/cdb/motion/ic_udpifc.c
+++ b/src/backend/cdb/motion/ic_udpifc.c
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------------
- * ic_udp.c
+ * ic_udpifc.c
  *	   Interconnect code specific to UDP transport.
  *
  * Copyright (c) 2005-2011, Greenplum Inc.
diff --git a/src/backend/executor/execWorkfile.c b/src/backend/executor/execWorkfile.c
index 3c9dca6c4526a7d7e4aba067dd136a04b7c51400..de5ed004dd6213ec0cced4c807f6cb10ca37da98 100644
--- a/src/backend/executor/execWorkfile.c
+++ b/src/backend/executor/execWorkfile.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * execworkfile.c
+ * execWorkfile.c
  *    Management of temporary work files used by the executor nodes.
  *
  * Copyright (c) 2010. Greenplum Inc.
diff --git a/src/backend/fts/ftssan.c b/src/backend/fts/ftssan.c
index d033295b27f2f0463ecbd1ea4cecf6357ba86e62..6fb533437fd78d09b8562cfef1faf2ff2a1dfba1 100644
--- a/src/backend/fts/ftssan.c
+++ b/src/backend/fts/ftssan.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * ftsfilerep.c
+ * ftssan.c
  *	  Implementation of interface for FireRep-specific segment state machine
  *	  and transitions
  *
diff --git a/src/backend/nodes/readfast.c b/src/backend/nodes/readfast.c
index c2d3950a354e7bddb43f4292a195558520966726..9e037406a5594ac04e25ddef21227d053c565883 100644
--- a/src/backend/nodes/readfast.c
+++ b/src/backend/nodes/readfast.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * readfuncs.c
+ * readfast.c
  *	  Binary Reader functions for Postgres tree nodes.
  *
  * Portions Copyright (c) 2005-2010, Greenplum inc
diff --git a/src/backend/parser/parse_partition.c b/src/backend/parser/parse_partition.c
index 887f00998b120de24b964ec94c3d04e80bc0528d..57a9f3f6dffc66a1d3137d975668cccc08cc8644 100644
--- a/src/backend/parser/parse_partition.c
+++ b/src/backend/parser/parse_partition.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * parse_node.c
+ * parse_partition.c
  *	  handle partition clauses in parser
  *
  * Portions Copyright (c) 2005-2010, Greenplum inc
diff --git a/src/backend/postmaster/perfmon_segmentinfo.c b/src/backend/postmaster/perfmon_segmentinfo.c
index d85490fff7cc290c402911fbbb2985ec6522010f..bb652b1d232c333c1e80347314092257365c8194 100644
--- a/src/backend/postmaster/perfmon_segmentinfo.c
+++ b/src/backend/postmaster/perfmon_segmentinfo.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * segmentinfo.c
+ * perfmon_segmentinfo.c
  *    Send segment information to perfmon
  *
  * Copyright (c) 2010, Greenplum inc.
diff --git a/src/bin/pg_dump/cdb/cdb_backup_archiver.c b/src/bin/pg_dump/cdb/cdb_backup_archiver.c
index 1e0ccf3cbef8577ee85154f936e5b8f074164005..4af672a98be829ffb01633935ae4c287d4332079 100644
--- a/src/bin/pg_dump/cdb/cdb_backup_archiver.c
+++ b/src/bin/pg_dump/cdb/cdb_backup_archiver.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * pg_backup_archiver.c
+ * cdb_backup_archiver.c
  *
  *	Private implementation of the archiver routines.
  *
diff --git a/src/bin/pg_dump/cdb/cdb_ddboost_util.c b/src/bin/pg_dump/cdb/cdb_ddboost_util.c
index aa87a06e63d99c26107f5b05b3e5c7bc38a3caef..adedd032d24a311ca41d65d3b976ed3de04dc322 100644
--- a/src/bin/pg_dump/cdb/cdb_ddboost_util.c
+++ b/src/bin/pg_dump/cdb/cdb_ddboost_util.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * gpddboost.c
+ * cdb_ddboost_util.c
  *	  gpddboost is a utility for accessing Data Domain's ddboost
  *		  interfaces.
  *
diff --git a/src/bin/pg_dump/cdb/cdb_dump_agent.c b/src/bin/pg_dump/cdb/cdb_dump_agent.c
index 5a0fb1dbdb1c88d85a16387c173bf51e5d678ab0..c58899c52f9e879bdceeab773f9f1213f8059dcd 100644
--- a/src/bin/pg_dump/cdb/cdb_dump_agent.c
+++ b/src/bin/pg_dump/cdb/cdb_dump_agent.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * pg_dump.c
+ * cdb_dump_agent.c
  *	  pg_dump is a utility for dumping out a postgres database
  *	  into a script file.
  *
diff --git a/src/bin/pg_dump/cdb/cdb_dumpall_agent.c b/src/bin/pg_dump/cdb/cdb_dumpall_agent.c
index dc45edc67e84461aed744497df42022926ffd3e2..87b77c259ce7acadbf6aef52f5a51434b913e013 100644
--- a/src/bin/pg_dump/cdb/cdb_dumpall_agent.c
+++ b/src/bin/pg_dump/cdb/cdb_dumpall_agent.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * pg_dumpall.c
+ * cdb_dumpall_agent.c
  *
  * Copyright (c) 2006-2010, Greenplum inc.
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
diff --git a/src/bin/pg_dump/cdb/cdb_restore_agent.c b/src/bin/pg_dump/cdb/cdb_restore_agent.c
index 9056ca929cefe597177c052c8f6058d479f2f01c..e1c8a79c5e6aac53c6af93c3603bb9c4295d1342 100644
--- a/src/bin/pg_dump/cdb/cdb_restore_agent.c
+++ b/src/bin/pg_dump/cdb/cdb_restore_agent.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * pg_restore.c
+ * cdb_restore_agent.c
  *	pg_restore is an utility extracting postgres database definitions
  *	from a backup archive created by pg_dump using the archiver
  *	interface.
diff --git a/src/include/access/appendonlytid.h b/src/include/access/appendonlytid.h
index 91d155ffb466b6233c16fc9be5357500fad0279f..04fec49ac9d94364b11dbae4c5e6786a3d03e633 100755
--- a/src/include/access/appendonlytid.h
+++ b/src/include/access/appendonlytid.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * appendonlystoragetid.h
+ * appendonlytid.h
  *
  * Copyright (c) 2007-2009, Greenplum inc
  *
diff --git a/src/include/cdb/cdbappendonlystorage_int.h b/src/include/cdb/cdbappendonlystorage_int.h
index f849b86f5afbc68ac2575e35db06e69fcaba0817..24277cacd2f28e39e2c2772da7825e9f1778a7a6 100644
--- a/src/include/cdb/cdbappendonlystorage_int.h
+++ b/src/include/cdb/cdbappendonlystorage_int.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * cdbappendonlystorage.h
+ * cdbappendonlystorage_int.h
  *
  * Copyright (c) 2007-2009, Greenplum inc
  *
diff --git a/src/include/cdb/cdbmirroredfilesysobj.h b/src/include/cdb/cdbmirroredfilesysobj.h
index e651bb1418b3145a13245446fa5e92be51950e81..37a06bfc4b737ba836ceed4c2dbf2a4af4eae956 100755
--- a/src/include/cdb/cdbmirroredfilesysobj.h
+++ b/src/include/cdb/cdbmirroredfilesysobj.h
@@ -1,14 +1,14 @@
 /*-------------------------------------------------------------------------
  *
- * cdbmirroredfsobj.h
+ * cdbmirroredfilesysobj.h
  *	  Create and drop mirrored files and directories.
  *
  * Copyright (c) 2009-2010, Greenplum inc
  *
  *-------------------------------------------------------------------------
  */
-#ifndef CDBMIRROREDFSOBJ_H
-#define CDBMIRROREDFSOBJ_H
+#ifndef CDBMIRROREDFILESYSOBJ_H
+#define CDBMIRROREDFILESYSOBJ_H
 
 #include "storage/relfilenode.h"
 #include "storage/dbdirnode.h"
@@ -224,4 +224,4 @@ extern void MirroredFileSysObj_DropRelFile(
 
 extern MirroredObjectExistenceState mirror_existence_state(void);
 
-#endif   /* CDBMIRROREDFSOBJ_H */
+#endif	/*  CDBMIRROREDFILESYSOBJ_H */
diff --git a/src/include/cdb/cdbmutate.h b/src/include/cdb/cdbmutate.h
index 0c4162264f4d26222d05f311b23b48313f601d15..f03f5e81eaa8fb0bb1d23891e9dbd6d14417ad11 100644
--- a/src/include/cdb/cdbmutate.h
+++ b/src/include/cdb/cdbmutate.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * cdbllize.h
+ * cdbmutate.h
  *	  definitions for cdbmutate.c utilities
  *
  * Copyright (c) 2005-2008, Greenplum inc
diff --git a/src/include/executor/execWorkfile.h b/src/include/executor/execWorkfile.h
index e9d8e1f69fc2d90e257200f117f7560cc35d1ac9..1e0e7c7039fced079af240226765d6a8f4715438 100644
--- a/src/include/executor/execWorkfile.h
+++ b/src/include/executor/execWorkfile.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * execworkfile.h
+ * execWorkfile.h
  *    prototypes for execworkfiles.c
  *
  * Copyright (c) 2010, Greenplum Inc.
diff --git a/src/include/utils/memaccounting.h b/src/include/utils/memaccounting.h
index f5b0572ab50ba8645bc2589d44c7c398e7da7be6..3f0cbe598c56661cb78759e7818a19de42f7d219 100644
--- a/src/include/utils/memaccounting.h
+++ b/src/include/utils/memaccounting.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * meminstrumentation.h
+ * memaccounting.h
  *	  This file contains declarations for memory instrumentation utility
  *	  functions.
  *
diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c
index c7e96df6eb5fe74698e44e81382e32feeaa9c246..4ea88317dbf8b6c33721118ce8b502a7be5af49f 100644
--- a/src/test/thread/thread_test.c
+++ b/src/test/thread/thread_test.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * test_thread_funcs.c
+ * thread_test.c
  *		libc thread test program
  *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
diff --git a/src/test/tinc/tincrepo/mpp/gpdb/tests/package/gppc/data/gppc_test.c b/src/test/tinc/tincrepo/mpp/gpdb/tests/package/gppc/data/gppc_test.c
index ac6141a1729b4355228651f4bbe18b000e1711e4..268b8ef1dc739293ecb2b0345970a3da553a27ca 100644
--- a/src/test/tinc/tincrepo/mpp/gpdb/tests/package/gppc/data/gppc_test.c
+++ b/src/test/tinc/tincrepo/mpp/gpdb/tests/package/gppc/data/gppc_test.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * gppc_client.c
+ * gppc_test.c
  *	  libgppc client program
  *
  * Copyright (c) 2012, Greenplum Inc.