diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index e84af67fb225cbcd0b55d9774ca724c1a86bd3c1..9885fcba89cbbc7ecb96cd0145927ce1b9408359 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -3034,18 +3034,18 @@ CREATE TABLE list_partitioned (a int not null) partition by list (a);
 ALTER TABLE list_partitioned ALTER a DROP NOT NULL;
 DROP TABLE list_partitioned;
 -- partitioned table cannot participate in regular inheritance
-CREATE TABLE foo (
+CREATE TABLE nonpartitioned (
 	a int,
 	b int
 );
-ALTER TABLE partitioned INHERIT foo;
+ALTER TABLE partitioned INHERIT nonpartitioned;
 ERROR:  cannot change inheritance of partitioned table
-ALTER TABLE foo INHERIT partitioned;
+ALTER TABLE nonpartitioned INHERIT partitioned;
 ERROR:  cannot inherit from partitioned table "partitioned"
 -- cannot add NO INHERIT constraint to partitioned tables
 ALTER TABLE partitioned ADD CONSTRAINT chk_a CHECK (a > 0) NO INHERIT;
 ERROR:  cannot add NO INHERIT constraint to partitioned table "partitioned"
-DROP TABLE partitioned, foo;
+DROP TABLE partitioned, nonpartitioned;
 --
 -- ATTACH PARTITION
 --
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index a403fd8cb4de5dde34182792384614de3c5a4294..f7b754f0beeae160f1801a0204c0d626a84640ea 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1923,17 +1923,17 @@ ALTER TABLE list_partitioned ALTER a DROP NOT NULL;
 DROP TABLE list_partitioned;
 
 -- partitioned table cannot participate in regular inheritance
-CREATE TABLE foo (
+CREATE TABLE nonpartitioned (
 	a int,
 	b int
 );
-ALTER TABLE partitioned INHERIT foo;
-ALTER TABLE foo INHERIT partitioned;
+ALTER TABLE partitioned INHERIT nonpartitioned;
+ALTER TABLE nonpartitioned INHERIT partitioned;
 
 -- cannot add NO INHERIT constraint to partitioned tables
 ALTER TABLE partitioned ADD CONSTRAINT chk_a CHECK (a > 0) NO INHERIT;
 
-DROP TABLE partitioned, foo;
+DROP TABLE partitioned, nonpartitioned;
 
 --
 -- ATTACH PARTITION