diff --git a/src/common/backend/utils/adt/xml.cpp b/src/common/backend/utils/adt/xml.cpp
index c398840a9..ed5dfcd13 100755
--- a/src/common/backend/utils/adt/xml.cpp
+++ b/src/common/backend/utils/adt/xml.cpp
@@ -1862,12 +1862,12 @@ char* map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings)
                 if (TIMESTAMP_NOT_FINITE(time_stamp)) {
                     ereport(ERROR,
                         (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                            errmsg("time_stamp out of range"),
-                            errdetail("XML does not support infinite time_stamp values.")));
+                            errmsg("timestamp out of range"),
+                            errdetail("XML does not support infinite timestamp values.")));
                 } else if (timestamp2tm(time_stamp, NULL, &tm, &fsec, NULL, NULL) == 0) {
                     EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf);
                 } else {
-                    ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("time_stamp out of range")));
+                    ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range")));
                 }
                 return pstrdup(buf);
             }
@@ -1885,12 +1885,12 @@ char* map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings)
                 if (TIMESTAMP_NOT_FINITE(time_stamp)) {
                     ereport(ERROR,
                         (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                            errmsg("time_stamp out of range"),
-                            errdetail("XML does not support infinite time_stamp values.")));
+                            errmsg("timestamp out of range"),
+                            errdetail("XML does not support infinite timestamp values.")));
                 } else if (timestamp2tm(time_stamp, &tz, &tm, &fsec, &tzn, NULL) == 0) {
                     EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf);
                 } else {
-                    ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("time_stamp out of range")));
+                    ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range")));
                 }
                 return pstrdup(buf);
             }
diff --git a/src/test/regress/expected/single_node_xml.out b/src/test/regress/expected/single_node_xml.out
index 31cb6296d..d3d3f7c8d 100644
--- a/src/test/regress/expected/single_node_xml.out
+++ b/src/test/regress/expected/single_node_xml.out
@@ -178,7 +178,7 @@ SELECT xmlelement(name foo, xmlattributes('2009-04-09 00:24:37'::timestamp as ba
 (1 row)
 
 SELECT xmlelement(name foo, xmlattributes('infinity'::timestamp as bar));
-ERROR:  time_stamp out of range
+ERROR:  timestamp out of range
 SELECT xmlelement(name foo, xmlattributes('<>&"''' as funny, xml 'b<a/>r' as funnier));
                          xmlelement                         
 ------------------------------------------------------------