diff --git a/src/test/regress/expected/isolation_concurrent_dml.out b/src/test/regress/expected/isolation_concurrent_dml.out
index a5e6a1737..f7f8fc9ee 100644
--- a/src/test/regress/expected/isolation_concurrent_dml.out
+++ b/src/test/regress/expected/isolation_concurrent_dml.out
@@ -8,10 +8,10 @@ step s1-begin:
     BEGIN;
 
 step s1-insert: 
-    INSERT INTO test_table VALUES(1);
+    INSERT INTO test_concurrent_dml VALUES(1);
 
 step s2-update: 
-    UPDATE test_table SET data = 'blarg' WHERE test_id = 1;
+    UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1;
  <waiting ...>
 step s1-commit: 
     COMMIT;
@@ -23,8 +23,8 @@ master_create_worker_shards
 
                
 step s1-insert: 
-    INSERT INTO test_table VALUES(1);
+    INSERT INTO test_concurrent_dml VALUES(1);
 
 step s2-update: 
-    UPDATE test_table SET data = 'blarg' WHERE test_id = 1;
+    UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1;
 
diff --git a/src/test/regress/expected/isolation_copy_placement_vs_modification.out b/src/test/regress/expected/isolation_copy_placement_vs_modification.out
index 6a6fbfd83..523f87f80 100644
--- a/src/test/regress/expected/isolation_copy_placement_vs_modification.out
+++ b/src/test/regress/expected/isolation_copy_placement_vs_modification.out
@@ -2,16 +2,16 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1-load-cache s1-insert s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-update s2-commit s1-commit s2-print-content
 step s1-load-cache: 
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -29,7 +29,7 @@ master_copy_shard_placement
 
                
 step s1-update: 
-	UPDATE test_table SET y = 5 WHERE x = 5;
+	UPDATE test_copy_placement_vs_modification SET y = 5 WHERE x = 5;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -42,7 +42,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -55,16 +55,16 @@ nodeport       success        result
 
 starting permutation: s1-load-cache s1-insert s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-delete s2-commit s1-commit s2-print-content
 step s1-load-cache: 
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -82,7 +82,7 @@ master_copy_shard_placement
 
                
 step s1-delete: 
-	DELETE FROM test_table WHERE x = 5;
+	DELETE FROM test_copy_placement_vs_modification WHERE x = 5;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -95,7 +95,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -108,13 +108,13 @@ nodeport       success        result
 
 starting permutation: s1-load-cache s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-insert s2-commit s1-commit s2-print-content
 step s1-load-cache: 
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -132,7 +132,7 @@ master_copy_shard_placement
 
                
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -145,7 +145,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -158,13 +158,13 @@ nodeport       success        result
 
 starting permutation: s1-load-cache s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-copy s2-commit s1-commit s2-print-content
 step s1-load-cache: 
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -182,7 +182,7 @@ master_copy_shard_placement
 
                
 step s1-copy: 
-	COPY test_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
+	COPY test_copy_placement_vs_modification FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -195,7 +195,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -208,13 +208,13 @@ nodeport       success        result
 
 starting permutation: s1-load-cache s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-ddl s2-commit s1-commit s2-print-index-count
 step s1-load-cache: 
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -232,7 +232,7 @@ master_copy_shard_placement
 
                
 step s1-ddl: 
-	CREATE INDEX test_table_index ON test_table(x);
+	CREATE INDEX test_copy_placement_vs_modification_index ON test_copy_placement_vs_modification(x);
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -245,7 +245,7 @@ step s2-print-index-count:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
 	ORDER BY
 		nodeport;
 
@@ -258,13 +258,13 @@ nodeport       success        result
 
 starting permutation: s1-insert s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-update s2-commit s1-commit s2-print-content
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -282,7 +282,7 @@ master_copy_shard_placement
 
                
 step s1-update: 
-	UPDATE test_table SET y = 5 WHERE x = 5;
+	UPDATE test_copy_placement_vs_modification SET y = 5 WHERE x = 5;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -295,7 +295,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -308,13 +308,13 @@ nodeport       success        result
 
 starting permutation: s1-insert s1-begin s1-select s2-set-placement-inactive s2-begin s2-repair-placement s1-delete s2-commit s1-commit s2-print-content
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
 
 step s1-begin: 
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -332,7 +332,7 @@ master_copy_shard_placement
 
                
 step s1-delete: 
-	DELETE FROM test_table WHERE x = 5;
+	DELETE FROM test_copy_placement_vs_modification WHERE x = 5;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -345,7 +345,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -361,7 +361,7 @@ step s1-begin:
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -379,7 +379,7 @@ master_copy_shard_placement
 
                
 step s1-insert: 
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -392,7 +392,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -408,7 +408,7 @@ step s1-begin:
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -426,7 +426,7 @@ master_copy_shard_placement
 
                
 step s1-copy: 
-	COPY test_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
+	COPY test_copy_placement_vs_modification FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -439,7 +439,7 @@ step s2-print-content:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -455,7 +455,7 @@ step s1-begin:
     BEGIN;
 
 step s1-select: 
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 
 count          
 
@@ -473,7 +473,7 @@ master_copy_shard_placement
 
                
 step s1-ddl: 
-	CREATE INDEX test_table_index ON test_table(x);
+	CREATE INDEX test_copy_placement_vs_modification_index ON test_copy_placement_vs_modification(x);
  <waiting ...>
 step s2-commit: 
 	COMMIT;
@@ -486,7 +486,7 @@ step s2-print-index-count:
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
 	ORDER BY
 		nodeport;
 
diff --git a/src/test/regress/expected/isolation_dml_vs_repair.out b/src/test/regress/expected/isolation_dml_vs_repair.out
index 543929531..19c01a48d 100644
--- a/src/test/regress/expected/isolation_dml_vs_repair.out
+++ b/src/test/regress/expected/isolation_dml_vs_repair.out
@@ -5,16 +5,16 @@ master_create_worker_shards
 
                
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s1-begin: 
     BEGIN;
 
 step s1-insertone: 
-    INSERT INTO test_table VALUES(1, 1);
+    INSERT INTO test_dml_vs_repair VALUES(1, 1);
 
 step s2-repair: 
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
  <waiting ...>
 step s1-commit: 
     COMMIT;
@@ -29,19 +29,19 @@ master_create_worker_shards
 
                
 step s1-insertone: 
-    INSERT INTO test_table VALUES(1, 1);
+    INSERT INTO test_dml_vs_repair VALUES(1, 1);
 
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s1-begin: 
     BEGIN;
 
 step s1-insertall: 
-    INSERT INTO test_table SELECT test_id, data+1 FROM test_table;
+    INSERT INTO test_dml_vs_repair SELECT test_id, data+1 FROM test_dml_vs_repair;
 
 step s2-repair: 
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
  <waiting ...>
 step s1-commit: 
     COMMIT;
@@ -56,41 +56,41 @@ master_create_worker_shards
 
                
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s2-begin: 
     BEGIN;
 
 step s2-repair: 
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
 
 master_copy_shard_placement
 
                
 step s1-insertone: 
-    INSERT INTO test_table VALUES(1, 1);
+    INSERT INTO test_dml_vs_repair VALUES(1, 1);
  <waiting ...>
 step s2-commit: 
     COMMIT;
 
 step s1-insertone: <... completed>
 step s2-invalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
 1              1              
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s2-revalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
@@ -101,7 +101,7 @@ master_create_worker_shards
 
                
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s1-prepared-insertone: 
     EXECUTE insertone;
@@ -110,7 +110,7 @@ step s2-begin:
     BEGIN;
 
 step s2-repair: 
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
 
 master_copy_shard_placement
 
@@ -124,22 +124,22 @@ step s2-commit:
 step s1-prepared-insertone: <... completed>
 error in steps s2-commit s1-prepared-insertone: ERROR:  prepared modifications cannot be executed on a shard while it is being copied
 step s2-invalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
 1              1              
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s2-revalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
@@ -150,10 +150,10 @@ master_create_worker_shards
 
                
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s1-insertone: 
-    INSERT INTO test_table VALUES(1, 1);
+    INSERT INTO test_dml_vs_repair VALUES(1, 1);
 
 step s1-prepared-insertall: 
     EXECUTE insertall;
@@ -162,7 +162,7 @@ step s2-begin:
     BEGIN;
 
 step s2-repair: 
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
 
 master_copy_shard_placement
 
@@ -176,23 +176,23 @@ step s2-commit:
 step s1-prepared-insertall: <... completed>
 error in steps s2-commit s1-prepared-insertall: ERROR:  prepared modifications cannot be executed on a shard while it is being copied
 step s2-invalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
 1              1              
 1              2              
 step s2-invalidate-57637: 
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 
 step s2-revalidate-57638: 
-    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 
 step s1-display: 
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 
 test_id        data           
 
diff --git a/src/test/regress/isolation_schedule b/src/test/regress/isolation_schedule
index e373f8544..f7a665fd7 100644
--- a/src/test/regress/isolation_schedule
+++ b/src/test/regress/isolation_schedule
@@ -5,7 +5,8 @@ test: isolation_add_node_vs_reference_table_operations
 # that come later can be parallelized
 test: isolation_cluster_management
 
-test: isolation_dml_vs_repair isolation_copy_placement_vs_copy_placement isolation_cancellation
+test: isolation_dml_vs_repair
+test: isolation_copy_placement_vs_copy_placement isolation_cancellation
 test: isolation_concurrent_dml isolation_data_migration
 test: isolation_drop_shards isolation_copy_placement_vs_modification
 test: isolation_insert_vs_vacuum isolation_transaction_recovery
diff --git a/src/test/regress/specs/isolation_concurrent_dml.spec b/src/test/regress/specs/isolation_concurrent_dml.spec
index 3288d7521..74c86583f 100644
--- a/src/test/regress/specs/isolation_concurrent_dml.spec
+++ b/src/test/regress/specs/isolation_concurrent_dml.spec
@@ -1,13 +1,13 @@
 setup
 {
-    CREATE TABLE test_table (test_id integer NOT NULL, data text);
-    SELECT master_create_distributed_table('test_table', 'test_id', 'hash');
-    SELECT master_create_worker_shards('test_table', 4, 2);
+    CREATE TABLE test_concurrent_dml (test_id integer NOT NULL, data text);
+    SELECT master_create_distributed_table('test_concurrent_dml', 'test_id', 'hash');
+    SELECT master_create_worker_shards('test_concurrent_dml', 4, 2);
 }
 
 teardown
 {
-    DROP TABLE IF EXISTS test_table CASCADE;
+    DROP TABLE IF EXISTS test_concurrent_dml CASCADE;
 }
 
 session "s1"
@@ -19,7 +19,7 @@ step "s1-begin"
 
 step "s1-insert"
 {
-    INSERT INTO test_table VALUES(1);
+    INSERT INTO test_concurrent_dml VALUES(1);
 }
 
 step "s1-commit"
@@ -31,7 +31,7 @@ session "s2"
 
 step "s2-update"
 {
-    UPDATE test_table SET data = 'blarg' WHERE test_id = 1;
+    UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1;
 }
 
 # verify that an in-progress insert blocks concurrent updates
diff --git a/src/test/regress/specs/isolation_copy_placement_vs_modification.spec b/src/test/regress/specs/isolation_copy_placement_vs_modification.spec
index 201d4eca8..8ab9fe84b 100644
--- a/src/test/regress/specs/isolation_copy_placement_vs_modification.spec
+++ b/src/test/regress/specs/isolation_copy_placement_vs_modification.spec
@@ -4,15 +4,15 @@ setup
 {	
 	SET citus.shard_count TO 2;
 	SET citus.shard_replication_factor TO 2;
-	CREATE TABLE test_table (x int, y int);
-	SELECT create_distributed_table('test_table', 'x');
+	CREATE TABLE test_copy_placement_vs_modification (x int, y int);
+	SELECT create_distributed_table('test_copy_placement_vs_modification', 'x');
 	
-	SELECT get_shard_id_for_distribution_column('test_table', 5) INTO selected_shard;
+	SELECT get_shard_id_for_distribution_column('test_copy_placement_vs_modification', 5) INTO selected_shard;
 }
 
 teardown
 {
-	DROP TABLE test_table;
+	DROP TABLE test_copy_placement_vs_modification;
 	DROP TABLE selected_shard;
 }
 
@@ -23,41 +23,41 @@ step "s1-begin"
     BEGIN;
 }
 
-# since test_table has rep > 1 simple select query doesn't hit all placements
+# since test_copy_placement_vs_modification has rep > 1 simple select query doesn't hit all placements
 # hence not all placements are cached 
 step "s1-load-cache"
 {
-	TRUNCATE test_table;
+	TRUNCATE test_copy_placement_vs_modification;
 }
 
 step "s1-insert"
 {
-	INSERT INTO test_table VALUES (5, 10);
+	INSERT INTO test_copy_placement_vs_modification VALUES (5, 10);
 }
 
 step "s1-update"
 {
-	UPDATE test_table SET y = 5 WHERE x = 5;
+	UPDATE test_copy_placement_vs_modification SET y = 5 WHERE x = 5;
 }
 
 step "s1-delete"
 {
-	DELETE FROM test_table WHERE x = 5;
+	DELETE FROM test_copy_placement_vs_modification WHERE x = 5;
 }
 
 step "s1-select"
 {
-	SELECT count(*) FROM test_table WHERE x = 5;
+	SELECT count(*) FROM test_copy_placement_vs_modification WHERE x = 5;
 }
 
 step "s1-ddl"
 {
-	CREATE INDEX test_table_index ON test_table(x);
+	CREATE INDEX test_copy_placement_vs_modification_index ON test_copy_placement_vs_modification(x);
 }
 
 step "s1-copy"
 {
-	COPY test_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
+	COPY test_copy_placement_vs_modification FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
 }
 
 step "s1-commit"
@@ -92,7 +92,7 @@ step "s2-print-content"
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select y from %s WHERE x = 5')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select y from %s WHERE x = 5')
 	WHERE
 		shardid IN (SELECT * FROM selected_shard)
 	ORDER BY
@@ -104,7 +104,7 @@ step "s2-print-index-count"
 	SELECT 
 		nodeport, success, result 
 	FROM 
-		run_command_on_placements('test_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
+		run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''')
 	ORDER BY
 		nodeport;
 }
diff --git a/src/test/regress/specs/isolation_dml_vs_repair.spec b/src/test/regress/specs/isolation_dml_vs_repair.spec
index 6da20e7d9..7a89b41df 100644
--- a/src/test/regress/specs/isolation_dml_vs_repair.spec
+++ b/src/test/regress/specs/isolation_dml_vs_repair.spec
@@ -1,13 +1,13 @@
 setup
 {
-    CREATE TABLE test_table (test_id integer NOT NULL, data int);
-    SELECT master_create_distributed_table('test_table', 'test_id', 'hash');
-    SELECT master_create_worker_shards('test_table', 1, 2);
+    CREATE TABLE test_dml_vs_repair (test_id integer NOT NULL, data int);
+    SELECT master_create_distributed_table('test_dml_vs_repair', 'test_id', 'hash');
+    SELECT master_create_worker_shards('test_dml_vs_repair', 1, 2);
 }
 
 teardown
 {
-    DROP TABLE IF EXISTS test_table CASCADE;
+    DROP TABLE IF EXISTS test_dml_vs_repair CASCADE;
 }
 
 session "s1"
@@ -15,9 +15,9 @@ session "s1"
 setup
 {
     DEALLOCATE all;
-    TRUNCATE test_table;
-    PREPARE insertone AS INSERT INTO test_table VALUES(1, 1);
-    PREPARE insertall AS INSERT INTO test_table SELECT test_id, data+1 FROM test_table;
+    TRUNCATE test_dml_vs_repair;
+    PREPARE insertone AS INSERT INTO test_dml_vs_repair VALUES(1, 1);
+    PREPARE insertall AS INSERT INTO test_dml_vs_repair SELECT test_id, data+1 FROM test_dml_vs_repair;
 }
 
 step "s1-begin"
@@ -27,7 +27,7 @@ step "s1-begin"
 
 step "s1-insertone"
 {
-    INSERT INTO test_table VALUES(1, 1);
+    INSERT INTO test_dml_vs_repair VALUES(1, 1);
 }
 
 step "s1-prepared-insertone"
@@ -37,7 +37,7 @@ step "s1-prepared-insertone"
 
 step "s1-insertall"
 {
-    INSERT INTO test_table SELECT test_id, data+1 FROM test_table;
+    INSERT INTO test_dml_vs_repair SELECT test_id, data+1 FROM test_dml_vs_repair;
 }
 
 step "s1-prepared-insertall"
@@ -47,7 +47,7 @@ step "s1-prepared-insertall"
 
 step "s1-display"
 {
-    SELECT * FROM test_table WHERE test_id = 1;
+    SELECT * FROM test_dml_vs_repair WHERE test_id = 1;
 }
 
 step "s1-commit"
@@ -65,27 +65,27 @@ step "s2-begin"
 
 step "s2-invalidate-57637"
 {
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 }
 
 step "s2-revalidate-57637"
 {
-    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57637;
+    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637;
 }
 
 step "s2-invalidate-57638"
 {
-    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 }
 
 step "s2-revalidate-57638"
 {
-    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass) AND nodeport = 57638;
+    UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638;
 }
 
 step "s2-repair"
 {
-    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_table'::regclass), 'localhost', 57638, 'localhost', 57637);
+    SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
 }
 
 step "s2-commit"