diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out
index 515e5b19a4..630855ed37 100644
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@ -52,6 +52,6 @@ ERROR:  cannot change number of columns in view
 -- should fail
 CREATE OR REPLACE VIEW viewtest AS
 	SELECT a, b::numeric FROM viewtest_tbl;
-ERROR:  cannot change datatype of view column "b"
+ERROR:  cannot change data type of view column "b"
 DROP VIEW viewtest;
 DROP TABLE viewtest_tbl;
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index 0889ea25e6..6e619cf017 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -105,7 +105,7 @@ SELECT '' AS one, p1.f1
 SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
    FROM LSEG_TBL l, POINT_TBL p;
 ERROR:  operator does not exist: lseg # point
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit typecasts.
+HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/geometry_1.out b/src/test/regress/expected/geometry_1.out
index 5c205d8bcc..70e86958b7 100644
--- a/src/test/regress/expected/geometry_1.out
+++ b/src/test/regress/expected/geometry_1.out
@@ -105,7 +105,7 @@ SELECT '' AS one, p1.f1
 SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
    FROM LSEG_TBL l, POINT_TBL p;
 ERROR:  operator does not exist: lseg # point
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit typecasts.
+HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index b0056f6cea..4ddeddaa13 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -6,7 +6,7 @@
 --
 -- conditio sine qua non
 SHOW stats_start_collector;  -- must be on
- stats_start_collector
+ stats_start_collector 
 -----------------------
  on
 (1 row)
diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out
index 5cf09b1ae2..a562c29691 100644
--- a/src/test/regress/expected/time.out
+++ b/src/test/regress/expected/time.out
@@ -70,4 +70,4 @@ SELECT f1 AS "Eight" FROM TIME_TBL WHERE f1 >= '00:00';
 -- where we do mixed-type arithmetic. - thomas 2000-12-02
 SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
 ERROR:  operator is not unique: time without time zone + time without time zone
-HINT:  Could not choose a best candidate operator. You may need to add explicit typecasts.
+HINT:  Could not choose a best candidate operator. You may need to add explicit type casts.
diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 540d5e091a..20a394a79a 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -77,4 +77,4 @@ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07';
 -- where we do mixed-type arithmetic. - thomas 2000-12-02
 SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TIMETZ_TBL;
 ERROR:  operator does not exist: time with time zone + time with time zone
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit typecasts.
+HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.