diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 125bb5b479d..67a0850c181 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -216,8 +216,8 @@ DATA(insert ( 3527	n 0 enum_smaller	-				enum_smaller		-	-	-				-				-				f f r
 DATA(insert ( 3565	n 0 network_smaller -				network_smaller		-	-	-				-				-				f f r r 1203	869		0	0		0	_null_ _null_ ));
 
 /* count */
-DATA(insert ( 2147	n 0 int8inc_any		-				int8pl	-	-	int8inc_any		int8dec_any		-				f f r r 0		20		0	20		0	"0" "0" ));
-DATA(insert ( 2803	n 0 int8inc			-				int8pl	-	-	int8inc			int8dec			-				f f r r 0		20		0	20		0	"0" "0" ));
+DATA(insert ( 2147	n 0 int8inc_any		-				int8pl	-	-	int8inc_any		int8dec_any		-				f f r r 0		20		0	20		0	0 0 ));
+DATA(insert ( 2803	n 0 int8inc			-				int8pl	-	-	int8inc			int8dec			-				f f r r 0		20		0	20		0	0 0 ));
 
 /* var_pop */
 DATA(insert ( 2718	n 0 int8_accum		numeric_var_pop			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_pop			f f r r 0	2281	128 2281	128 _null_ _null_ ));
@@ -268,7 +268,7 @@ DATA(insert ( 2158	n 0 float8_accum	float8_stddev_samp			float8_combine			-
 DATA(insert ( 2159	n 0 numeric_accum	numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_stddev_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* SQL2003 binary regression aggregates */
-DATA(insert ( 2818	n 0 int8inc_float8_float8	-					int8pl				-	-	-				-				-			f f r r 0	20		0	0		0	"0" _null_ ));
+DATA(insert ( 2818	n 0 int8inc_float8_float8	-					int8pl				-	-	-				-				-			f f r r 0	20		0	0		0	0 _null_ ));
 DATA(insert ( 2819	n 0 float8_regr_accum	float8_regr_sxx			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
 DATA(insert ( 2820	n 0 float8_regr_accum	float8_regr_syy			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
 DATA(insert ( 2821	n 0 float8_regr_accum	float8_regr_sxy			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index 00c84a33b5e..8e98513530b 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -100,21 +100,21 @@ typedef FormData_pg_authid *Form_pg_authid;
  */
 DATA(insert OID = 10 ( "POSTGRES" t t t t t t t -1 _null_ _null_));
 #define BOOTSTRAP_SUPERUSERID			10
-DATA(insert OID = 3373 ( "pg_monitor" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 3373 ( pg_monitor f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_MONITOR		3373
-DATA(insert OID = 3374 ( "pg_read_all_settings" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 3374 ( pg_read_all_settings f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_READ_ALL_SETTINGS	3374
-DATA(insert OID = 3375 ( "pg_read_all_stats" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 3375 ( pg_read_all_stats f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_READ_ALL_STATS 3375
-DATA(insert OID = 3377 ( "pg_stat_scan_tables" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 3377 ( pg_stat_scan_tables f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_STAT_SCAN_TABLES	3377
-DATA(insert OID = 4569 ( "pg_read_server_files" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 4569 ( pg_read_server_files f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_READ_SERVER_FILES	4569
-DATA(insert OID = 4570 ( "pg_write_server_files" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 4570 ( pg_write_server_files f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_WRITE_SERVER_FILES	4570
-DATA(insert OID = 4571 ( "pg_execute_server_program" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 4571 ( pg_execute_server_program f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_EXECUTE_SERVER_PROGRAM	4571
-DATA(insert OID = 4200 ( "pg_signal_backend" f t f f f f f -1 _null_ _null_));
+DATA(insert OID = 4200 ( pg_signal_backend f t f f f f f -1 _null_ _null_));
 #define DEFAULT_ROLE_SIGNAL_BACKENDID	4200
 
 #endif							/* PG_AUTHID_H */
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index 8a3aa74b949..8ef804c73b3 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -73,10 +73,10 @@ typedef FormData_pg_collation *Form_pg_collation;
 DATA(insert OID = 100 ( default		PGNSP PGUID d -1 "" "" _null_ ));
 DESCR("database's default collation");
 #define DEFAULT_COLLATION_OID	100
-DATA(insert OID = 950 ( C			PGNSP PGUID c -1 "C" "C" _null_ ));
+DATA(insert OID = 950 ( C			PGNSP PGUID c -1 C C _null_ ));
 DESCR("standard C collation");
 #define C_COLLATION_OID			950
-DATA(insert OID = 951 ( POSIX		PGNSP PGUID c -1 "POSIX" "POSIX" _null_ ));
+DATA(insert OID = 951 ( POSIX		PGNSP PGUID c -1 POSIX POSIX _null_ ));
 DESCR("standard POSIX collation");
 #define POSIX_COLLATION_OID		951
 
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 8ae78a0898b..6b373f96d56 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -69,13 +69,13 @@ typedef FormData_pg_language *Form_pg_language;
  * ----------------
  */
 
-DATA(insert OID = 12 ( "internal"	PGUID f f 0 0 2246 _null_ ));
+DATA(insert OID = 12 ( internal	PGUID f f 0 0 2246 _null_ ));
 DESCR("built-in functions");
 #define INTERNALlanguageId 12
-DATA(insert OID = 13 ( "c"			PGUID f f 0 0 2247 _null_ ));
+DATA(insert OID = 13 ( c			PGUID f f 0 0 2247 _null_ ));
 DESCR("dynamically-loaded C functions");
 #define ClanguageId 13
-DATA(insert OID = 14 ( "sql"		PGUID f t 0 0 2248 _null_ ));
+DATA(insert OID = 14 ( sql		PGUID f t 0 0 2248 _null_ ));
 DESCR("SQL-language functions");
 #define SQLlanguageId 14
 
diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h
index ac22d8918e2..dbb9f6626fc 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -66,13 +66,13 @@ typedef FormData_pg_namespace *Form_pg_namespace;
  * ---------------
  */
 
-DATA(insert OID = 11 ( "pg_catalog" PGUID _null_ ));
+DATA(insert OID = 11 ( pg_catalog PGUID _null_ ));
 DESCR("system catalog schema");
 #define PG_CATALOG_NAMESPACE 11
-DATA(insert OID = 99 ( "pg_toast" PGUID _null_ ));
+DATA(insert OID = 99 ( pg_toast PGUID _null_ ));
 DESCR("reserved schema for TOAST tables");
 #define PG_TOAST_NAMESPACE 99
-DATA(insert OID = 2200 ( "public" PGUID _null_ ));
+DATA(insert OID = 2200 ( public PGUID _null_ ));
 DESCR("standard public schema");
 #define PG_PUBLIC_NAMESPACE 2200
 
diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h
index d89f2db9e6c..d28d1883f65 100644
--- a/src/include/catalog/pg_pltemplate.h
+++ b/src/include/catalog/pg_pltemplate.h
@@ -71,13 +71,13 @@ typedef FormData_pg_pltemplate *Form_pg_pltemplate;
  * ----------------
  */
 
-DATA(insert ( "plpgsql"		t t "plpgsql_call_handler" "plpgsql_inline_handler" "plpgsql_validator" "$libdir/plpgsql" _null_ ));
-DATA(insert ( "pltcl"		t t "pltcl_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
-DATA(insert ( "pltclu"		f f "pltclu_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
-DATA(insert ( "plperl"		t t "plperl_call_handler" "plperl_inline_handler" "plperl_validator" "$libdir/plperl" _null_ ));
-DATA(insert ( "plperlu"		f f "plperlu_call_handler" "plperlu_inline_handler" "plperlu_validator" "$libdir/plperl" _null_ ));
-DATA(insert ( "plpythonu"	f f "plpython_call_handler" "plpython_inline_handler" "plpython_validator" "$libdir/plpython2" _null_ ));
-DATA(insert ( "plpython2u"	f f "plpython2_call_handler" "plpython2_inline_handler" "plpython2_validator" "$libdir/plpython2" _null_ ));
-DATA(insert ( "plpython3u"	f f "plpython3_call_handler" "plpython3_inline_handler" "plpython3_validator" "$libdir/plpython3" _null_ ));
+DATA(insert ( plpgsql		t t plpgsql_call_handler plpgsql_inline_handler plpgsql_validator "$libdir/plpgsql" _null_ ));
+DATA(insert ( pltcl		t t pltcl_call_handler _null_ _null_ "$libdir/pltcl" _null_ ));
+DATA(insert ( pltclu		f f pltclu_call_handler _null_ _null_ "$libdir/pltcl" _null_ ));
+DATA(insert ( plperl		t t plperl_call_handler plperl_inline_handler plperl_validator "$libdir/plperl" _null_ ));
+DATA(insert ( plperlu		f f plperlu_call_handler plperlu_inline_handler plperlu_validator "$libdir/plperl" _null_ ));
+DATA(insert ( plpythonu	f f plpython_call_handler plpython_inline_handler plpython_validator "$libdir/plpython2" _null_ ));
+DATA(insert ( plpython2u	f f plpython2_call_handler plpython2_inline_handler plpython2_validator "$libdir/plpython2" _null_ ));
+DATA(insert ( plpython3u	f f plpython3_call_handler plpython3_inline_handler plpython3_validator "$libdir/plpython3" _null_ ));
 
 #endif							/* PG_PLTEMPLATE_H */
diff --git a/src/include/catalog/pg_ts_config.h b/src/include/catalog/pg_ts_config.h
index 51b535ee4f9..26d0843f90c 100644
--- a/src/include/catalog/pg_ts_config.h
+++ b/src/include/catalog/pg_ts_config.h
@@ -54,7 +54,7 @@ typedef FormData_pg_ts_config *Form_pg_ts_config;
  *		initial contents of pg_ts_config
  * ----------------
  */
-DATA(insert OID = 3748 ( "simple" PGNSP PGUID 3722 ));
+DATA(insert OID = 3748 ( simple PGNSP PGUID 3722 ));
 DESCR("simple configuration");
 
 #endif							/* PG_TS_CONFIG_H */
diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h
index 9d9c06a982c..1e9d10cbd4a 100644
--- a/src/include/catalog/pg_ts_dict.h
+++ b/src/include/catalog/pg_ts_dict.h
@@ -60,7 +60,7 @@ typedef FormData_pg_ts_dict *Form_pg_ts_dict;
  * ----------------
  */
 
-DATA(insert OID = 3765 ( "simple" PGNSP PGUID 3727 _null_));
+DATA(insert OID = 3765 ( simple PGNSP PGUID 3727 _null_));
 DESCR("simple dictionary: just lower case and check for stopword");
 
 #endif							/* PG_TS_DICT_H */
diff --git a/src/include/catalog/pg_ts_parser.h b/src/include/catalog/pg_ts_parser.h
index 96ffd818d7b..7199916d367 100644
--- a/src/include/catalog/pg_ts_parser.h
+++ b/src/include/catalog/pg_ts_parser.h
@@ -61,7 +61,7 @@ typedef FormData_pg_ts_parser *Form_pg_ts_parser;
  * ----------------
  */
 
-DATA(insert OID = 3722 ( "default" PGNSP prsd_start prsd_nexttoken prsd_end prsd_headline prsd_lextype ));
+DATA(insert OID = 3722 ( default PGNSP prsd_start prsd_nexttoken prsd_end prsd_headline prsd_lextype ));
 DESCR("default word parser");
 
 #endif							/* PG_TS_PARSER_H */
diff --git a/src/include/catalog/pg_ts_template.h b/src/include/catalog/pg_ts_template.h
index 8a7203f0a7e..a23c04e9363 100644
--- a/src/include/catalog/pg_ts_template.h
+++ b/src/include/catalog/pg_ts_template.h
@@ -55,13 +55,13 @@ typedef FormData_pg_ts_template *Form_pg_ts_template;
  * ----------------
  */
 
-DATA(insert OID = 3727 ( "simple" PGNSP dsimple_init dsimple_lexize ));
+DATA(insert OID = 3727 ( simple PGNSP dsimple_init dsimple_lexize ));
 DESCR("simple dictionary: just lower case and check for stopword");
-DATA(insert OID = 3730 ( "synonym" PGNSP dsynonym_init dsynonym_lexize ));
+DATA(insert OID = 3730 ( synonym PGNSP dsynonym_init dsynonym_lexize ));
 DESCR("synonym dictionary: replace word by its synonym");
-DATA(insert OID = 3733 ( "ispell" PGNSP dispell_init dispell_lexize ));
+DATA(insert OID = 3733 ( ispell PGNSP dispell_init dispell_lexize ));
 DESCR("ispell dictionary");
-DATA(insert OID = 3742 ( "thesaurus" PGNSP thesaurus_init thesaurus_lexize ));
+DATA(insert OID = 3742 ( thesaurus PGNSP thesaurus_init thesaurus_lexize ));
 DESCR("thesaurus dictionary: phrase by phrase substitution");
 
 #endif							/* PG_TS_TEMPLATE_H */