diff --git a/src/backend/columnar/cstore.c b/src/backend/columnar/columnar.c
similarity index 100%
rename from src/backend/columnar/cstore.c
rename to src/backend/columnar/columnar.c
diff --git a/src/backend/columnar/cstore_compression.c b/src/backend/columnar/columnar_compression.c
similarity index 100%
rename from src/backend/columnar/cstore_compression.c
rename to src/backend/columnar/columnar_compression.c
diff --git a/src/backend/columnar/cstore_customscan.c b/src/backend/columnar/columnar_customscan.c
similarity index 100%
rename from src/backend/columnar/cstore_customscan.c
rename to src/backend/columnar/columnar_customscan.c
diff --git a/src/backend/columnar/cstore_debug.c b/src/backend/columnar/columnar_debug.c
similarity index 100%
rename from src/backend/columnar/cstore_debug.c
rename to src/backend/columnar/columnar_debug.c
diff --git a/src/backend/columnar/cstore_metadata_tables.c b/src/backend/columnar/columnar_metadata_tables.c
similarity index 100%
rename from src/backend/columnar/cstore_metadata_tables.c
rename to src/backend/columnar/columnar_metadata_tables.c
diff --git a/src/backend/columnar/cstore_writer.c b/src/backend/columnar/columnar_metadata_writer.c
similarity index 97%
rename from src/backend/columnar/cstore_writer.c
rename to src/backend/columnar/columnar_metadata_writer.c
index e8ae86d89..386c4781d 100644
--- a/src/backend/columnar/cstore_writer.c
+++ b/src/backend/columnar/columnar_metadata_writer.c
@@ -32,7 +32,7 @@
 #include "columnar/columnar.h"
 #include "columnar/columnar_version_compat.h"
 
-struct TableWriteState
+struct ColumnarWriteState
 {
 	TupleDesc tupleDescriptor;
 	FmgrInfo **comparisonFunctionArray;
@@ -62,12 +62,12 @@ static StripeBuffers * CreateEmptyStripeBuffers(uint32 stripeMaxRowCount,
 static StripeSkipList * CreateEmptyStripeSkipList(uint32 stripeMaxRowCount,
 												  uint32 chunkRowCount,
 												  uint32 columnCount);
-static void FlushStripe(TableWriteState *writeState);
+static void FlushStripe(ColumnarWriteState *writeState);
 static StringInfo SerializeBoolArray(bool *boolArray, uint32 boolArrayLength);
 static void SerializeSingleDatum(StringInfo datumBuffer, Datum datum,
 								 bool datumTypeByValue, int datumTypeLength,
 								 char datumTypeAlign);
-static void SerializeChunkData(TableWriteState *writeState, uint32 chunkIndex,
+static void SerializeChunkData(ColumnarWriteState *writeState, uint32 chunkIndex,
 							   uint32 rowCount);
 static void UpdateChunkSkipNodeMinMax(ColumnChunkSkipNode *chunkSkipNode,
 									  Datum columnValue, bool columnTypeByValue,
@@ -81,7 +81,7 @@ static StringInfo CopyStringInfo(StringInfo sourceString);
  * handle. This handle should be used for adding the row values and finishing the
  * data load operation.
  */
-TableWriteState *
+ColumnarWriteState *
 ColumnarBeginWrite(RelFileNode relfilenode,
 				   ColumnarOptions options,
 				   TupleDesc tupleDescriptor)
@@ -121,7 +121,7 @@ ColumnarBeginWrite(RelFileNode relfilenode,
 	ChunkData *chunkData = CreateEmptyChunkData(columnCount, columnMaskArray,
 												options.chunkRowCount);
 
-	TableWriteState *writeState = palloc0(sizeof(TableWriteState));
+	ColumnarWriteState *writeState = palloc0(sizeof(ColumnarWriteState));
 	writeState->relfilenode = relfilenode;
 	writeState->options = options;
 	writeState->tupleDescriptor = CreateTupleDescCopy(tupleDescriptor);
@@ -148,7 +148,7 @@ ColumnarBeginWrite(RelFileNode relfilenode,
  * the stripe, and add its metadata to the table footer.
  */
 void
-ColumnarWriteRow(TableWriteState *writeState, Datum *columnValues, bool *columnNulls)
+ColumnarWriteRow(ColumnarWriteState *writeState, Datum *columnValues, bool *columnNulls)
 {
 	uint32 columnIndex = 0;
 	StripeBuffers *stripeBuffers = writeState->stripeBuffers;
@@ -240,7 +240,7 @@ ColumnarWriteRow(TableWriteState *writeState, Datum *columnValues, bool *columnN
  * stripe, we flush it.
  */
 void
-ColumnarEndWrite(TableWriteState *writeState)
+ColumnarEndWrite(ColumnarWriteState *writeState)
 {
 	ColumnarFlushPendingWrites(writeState);
 
@@ -252,7 +252,7 @@ ColumnarEndWrite(TableWriteState *writeState)
 
 
 void
-ColumnarFlushPendingWrites(TableWriteState *writeState)
+ColumnarFlushPendingWrites(ColumnarWriteState *writeState)
 {
 	StripeBuffers *stripeBuffers = writeState->stripeBuffers;
 	if (stripeBuffers != NULL)
@@ -277,7 +277,7 @@ ColumnarFlushPendingWrites(TableWriteState *writeState)
  * Return per-tuple context for columnar write operation.
  */
 MemoryContext
-ColumnarWritePerTupleContext(TableWriteState *state)
+ColumnarWritePerTupleContext(ColumnarWriteState *state)
 {
 	return state->perTupleContext;
 }
@@ -432,7 +432,7 @@ WriteToSmgr(Relation rel, uint64 logicalOffset, char *data, uint32 dataLength)
  * flushes the skip list, data, and footer buffers to the file.
  */
 static void
-FlushStripe(TableWriteState *writeState)
+FlushStripe(ColumnarWriteState *writeState)
 {
 	StripeMetadata stripeMetadata = { 0 };
 	uint32 columnIndex = 0;
@@ -630,7 +630,7 @@ SerializeSingleDatum(StringInfo datumBuffer, Datum datum, bool datumTypeByValue,
  * compression type for every column.
  */
 static void
-SerializeChunkData(TableWriteState *writeState, uint32 chunkIndex, uint32 rowCount)
+SerializeChunkData(ColumnarWriteState *writeState, uint32 chunkIndex, uint32 rowCount)
 {
 	uint32 columnIndex = 0;
 	StripeBuffers *stripeBuffers = writeState->stripeBuffers;
@@ -804,7 +804,7 @@ CopyStringInfo(StringInfo sourceString)
 
 
 bool
-ContainsPendingWrites(TableWriteState *state)
+ContainsPendingWrites(ColumnarWriteState *state)
 {
 	return state->stripeBuffers != NULL && state->stripeBuffers->rowCount != 0;
 }
diff --git a/src/backend/columnar/cstore_reader.c b/src/backend/columnar/columnar_reader.c
similarity index 99%
rename from src/backend/columnar/cstore_reader.c
rename to src/backend/columnar/columnar_reader.c
index 3ee410229..a5c85ac35 100644
--- a/src/backend/columnar/cstore_reader.c
+++ b/src/backend/columnar/columnar_reader.c
@@ -64,7 +64,7 @@ typedef struct StripeReadState
 	ChunkGroupReadState *chunkGroupReadState; /* owned */
 } StripeReadState;
 
-struct TableReadState
+struct ColumnarReadState
 {
 	List *stripeList;
 	TupleDesc tupleDescriptor;
@@ -148,7 +148,7 @@ static Datum ColumnDefaultValue(TupleConstr *tupleConstraints,
  * ColumnarBeginRead initializes a columnar read operation. This function returns a
  * read handle that's used during reading rows and finishing the read operation.
  */
-TableReadState *
+ColumnarReadState *
 ColumnarBeginRead(Relation relation, TupleDesc tupleDescriptor,
 				  List *projectedColumnList, List *whereClauseList)
 {
@@ -170,7 +170,7 @@ ColumnarBeginRead(Relation relation, TupleDesc tupleDescriptor,
 															"Stripe Read Memory Context",
 															ALLOCSET_DEFAULT_SIZES);
 
-	TableReadState *readState = palloc0(sizeof(TableReadState));
+	ColumnarReadState *readState = palloc0(sizeof(ColumnarReadState));
 	readState->relation = relation;
 	readState->stripeList = stripeList;
 	readState->projectedColumnList = projectedColumnList;
@@ -190,7 +190,7 @@ ColumnarBeginRead(Relation relation, TupleDesc tupleDescriptor,
  * the function returns false.
  */
 bool
-ColumnarReadNextRow(TableReadState *readState, Datum *columnValues, bool *columnNulls)
+ColumnarReadNextRow(ColumnarReadState *readState, Datum *columnValues, bool *columnNulls)
 {
 	while (true)
 	{
@@ -238,7 +238,7 @@ ColumnarReadNextRow(TableReadState *readState, Datum *columnValues, bool *column
  * the beginning again
  */
 void
-ColumnarRescan(TableReadState *readState)
+ColumnarRescan(ColumnarReadState *readState)
 {
 	readState->stripeReadState = NULL;
 	readState->currentStripe = 0;
@@ -250,7 +250,7 @@ ColumnarRescan(TableReadState *readState)
  * Finishes a columnar read operation.
  */
 void
-ColumnarEndRead(TableReadState *readState)
+ColumnarEndRead(ColumnarReadState *readState)
 {
 	MemoryContextDelete(readState->stripeReadContext);
 	list_free_deep(readState->stripeList);
@@ -484,7 +484,7 @@ ReadChunkGroupNextRow(ChunkGroupReadState *chunkGroupReadState, Datum *columnVal
  * Return the number of chunk groups filtered during this read operation.
  */
 int64
-ColumnarReadChunkGroupsFiltered(TableReadState *state)
+ColumnarReadChunkGroupsFiltered(ColumnarReadState *state)
 {
 	return state->chunkGroupsFiltered;
 }
diff --git a/src/backend/columnar/cstore_tableam.c b/src/backend/columnar/columnar_tableam.c
similarity index 98%
rename from src/backend/columnar/cstore_tableam.c
rename to src/backend/columnar/columnar_tableam.c
index 7f3d197fa..baf31bf9f 100644
--- a/src/backend/columnar/cstore_tableam.c
+++ b/src/backend/columnar/columnar_tableam.c
@@ -73,7 +73,7 @@
 typedef struct ColumnarScanDescData
 {
 	TableScanDescData cs_base;
-	TableReadState *cs_readState;
+	ColumnarReadState *cs_readState;
 
 	/*
 	 * We initialize cs_readState lazily in the first getnextslot() call. We
@@ -237,7 +237,7 @@ columnar_beginscan_extended(Relation relation, Snapshot snapshot,
  * init_columnar_read_state initializes a column store table read and returns the
  * state.
  */
-static TableReadState *
+static ColumnarReadState *
 init_columnar_read_state(Relation relation, TupleDesc tupdesc, Bitmapset *attr_needed,
 						 List *scanQual)
 {
@@ -256,8 +256,8 @@ init_columnar_read_state(Relation relation, TupleDesc tupdesc, Bitmapset *attr_n
 		}
 	}
 
-	TableReadState *readState = ColumnarBeginRead(relation, tupdesc, neededColumnList,
-												  scanQual);
+	ColumnarReadState *readState = ColumnarBeginRead(relation, tupdesc, neededColumnList,
+													 scanQual);
 
 	return readState;
 }
@@ -440,9 +440,9 @@ columnar_tuple_insert(Relation relation, TupleTableSlot *slot, CommandId cid,
 	 * columnar_init_write_state allocates the write state in a longer
 	 * lasting context, so no need to worry about it.
 	 */
-	TableWriteState *writeState = columnar_init_write_state(relation,
-															RelationGetDescr(relation),
-															GetCurrentSubTransactionId());
+	ColumnarWriteState *writeState = columnar_init_write_state(relation,
+															   RelationGetDescr(relation),
+															   GetCurrentSubTransactionId());
 	MemoryContext oldContext = MemoryContextSwitchTo(ColumnarWritePerTupleContext(
 														 writeState));
 
@@ -481,9 +481,9 @@ static void
 columnar_multi_insert(Relation relation, TupleTableSlot **slots, int ntuples,
 					  CommandId cid, int options, BulkInsertState bistate)
 {
-	TableWriteState *writeState = columnar_init_write_state(relation,
-															RelationGetDescr(relation),
-															GetCurrentSubTransactionId());
+	ColumnarWriteState *writeState = columnar_init_write_state(relation,
+															   RelationGetDescr(relation),
+															   GetCurrentSubTransactionId());
 
 	ColumnarCheckLogicalReplication(relation);
 
@@ -645,12 +645,13 @@ columnar_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap,
 	ColumnarOptions columnarOptions = { 0 };
 	ReadColumnarOptions(OldHeap->rd_id, &columnarOptions);
 
-	TableWriteState *writeState = ColumnarBeginWrite(NewHeap->rd_node,
-													 columnarOptions,
-													 targetDesc);
+	ColumnarWriteState *writeState = ColumnarBeginWrite(NewHeap->rd_node,
+														columnarOptions,
+														targetDesc);
 
-	TableReadState *readState = ColumnarBeginRead(OldHeap, sourceDesc,
-												  RelationColumnList(sourceDesc), NULL);
+	ColumnarReadState *readState = ColumnarBeginRead(OldHeap, sourceDesc,
+													 RelationColumnList(sourceDesc),
+													 NULL);
 
 	Datum *values = palloc0(sourceDesc->natts * sizeof(Datum));
 	bool *nulls = palloc0(sourceDesc->natts * sizeof(bool));
@@ -1163,7 +1164,7 @@ int64
 ColumnarScanChunkGroupsFiltered(TableScanDesc scanDesc)
 {
 	ColumnarScanDesc columnarScanDesc = (ColumnarScanDesc) scanDesc;
-	TableReadState *readState = columnarScanDesc->cs_readState;
+	ColumnarReadState *readState = columnarScanDesc->cs_readState;
 
 	/* readState is initialized lazily */
 	if (readState != NULL)
diff --git a/src/backend/columnar/write_state_management.c b/src/backend/columnar/write_state_management.c
index 64131504a..b3f48fc72 100644
--- a/src/backend/columnar/write_state_management.c
+++ b/src/backend/columnar/write_state_management.c
@@ -69,7 +69,7 @@ static MemoryContext WriteStateContext = NULL;
 typedef struct SubXidWriteState
 {
 	SubTransactionId subXid;
-	TableWriteState *writeState;
+	ColumnarWriteState *writeState;
 
 	struct SubXidWriteState *next;
 } SubXidWriteState;
@@ -115,7 +115,7 @@ CleanupWriteStateMap(void *arg)
 }
 
 
-TableWriteState *
+ColumnarWriteState *
 columnar_init_write_state(Relation relation, TupleDesc tupdesc,
 						  SubTransactionId currentSubXid)
 {
diff --git a/src/include/columnar/columnar.h b/src/include/columnar/columnar.h
index c5af0f5f1..0c5672cce 100644
--- a/src/include/columnar/columnar.h
+++ b/src/include/columnar/columnar.h
@@ -212,14 +212,14 @@ typedef struct StripeBuffers
 } StripeBuffers;
 
 
-/* TableReadState represents state of a columnar scan. */
-struct TableReadState;
-typedef struct TableReadState TableReadState;
+/* ColumnarReadState represents state of a columnar scan. */
+struct ColumnarReadState;
+typedef struct ColumnarReadState ColumnarReadState;
 
 
-/* TableWriteState represents state of a columnar write operation. */
-struct TableWriteState;
-typedef struct TableWriteState TableWriteState;
+/* ColumnarWriteState represents state of a columnar write operation. */
+struct ColumnarWriteState;
+typedef struct ColumnarWriteState ColumnarWriteState;
 
 extern int columnar_compression;
 extern int columnar_stripe_row_limit;
@@ -231,26 +231,26 @@ extern void columnar_init_gucs(void);
 extern CompressionType ParseCompressionType(const char *compressionTypeString);
 
 /* Function declarations for writing to a columnar table */
-extern TableWriteState * ColumnarBeginWrite(RelFileNode relfilenode,
-											ColumnarOptions options,
-											TupleDesc tupleDescriptor);
-extern void ColumnarWriteRow(TableWriteState *state, Datum *columnValues,
+extern ColumnarWriteState * ColumnarBeginWrite(RelFileNode relfilenode,
+											   ColumnarOptions options,
+											   TupleDesc tupleDescriptor);
+extern void ColumnarWriteRow(ColumnarWriteState *state, Datum *columnValues,
 							 bool *columnNulls);
-extern void ColumnarFlushPendingWrites(TableWriteState *state);
-extern void ColumnarEndWrite(TableWriteState *state);
-extern bool ContainsPendingWrites(TableWriteState *state);
-extern MemoryContext ColumnarWritePerTupleContext(TableWriteState *state);
+extern void ColumnarFlushPendingWrites(ColumnarWriteState *state);
+extern void ColumnarEndWrite(ColumnarWriteState *state);
+extern bool ContainsPendingWrites(ColumnarWriteState *state);
+extern MemoryContext ColumnarWritePerTupleContext(ColumnarWriteState *state);
 
 /* Function declarations for reading from columnar table */
-extern TableReadState * ColumnarBeginRead(Relation relation,
-										  TupleDesc tupleDescriptor,
-										  List *projectedColumnList,
-										  List *qualConditions);
-extern bool ColumnarReadNextRow(TableReadState *state, Datum *columnValues,
+extern ColumnarReadState * ColumnarBeginRead(Relation relation,
+											 TupleDesc tupleDescriptor,
+											 List *projectedColumnList,
+											 List *qualConditions);
+extern bool ColumnarReadNextRow(ColumnarReadState *state, Datum *columnValues,
 								bool *columnNulls);
-extern void ColumnarRescan(TableReadState *readState);
-extern void ColumnarEndRead(TableReadState *state);
-extern int64 ColumnarReadChunkGroupsFiltered(TableReadState *state);
+extern void ColumnarRescan(ColumnarReadState *readState);
+extern void ColumnarEndRead(ColumnarReadState *state);
+extern int64 ColumnarReadChunkGroupsFiltered(ColumnarReadState *state);
 
 /* Function declarations for common functions */
 extern FmgrInfo * GetFunctionInfoOrNull(Oid typeId, Oid accessMethodId,
@@ -296,9 +296,9 @@ extern Datum columnar_relation_storageid(PG_FUNCTION_ARGS);
 
 
 /* write_state_management.c */
-extern TableWriteState * columnar_init_write_state(Relation relation, TupleDesc
-												   tupdesc,
-												   SubTransactionId currentSubXid);
+extern ColumnarWriteState * columnar_init_write_state(Relation relation, TupleDesc
+													  tupdesc,
+													  SubTransactionId currentSubXid);
 extern void FlushWriteStateForRelfilenode(Oid relfilenode, SubTransactionId
 										  currentSubXid);
 extern void FlushWriteStateForAllRels(SubTransactionId currentSubXid, SubTransactionId
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index d259da950..25a8d64be 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -167,11 +167,11 @@ check-operations: all
 
 check-columnar:
 	$(pg_regress_multi_check) --load-extension=citus \
-	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_am_schedule $(EXTRA_TESTS)
+	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)
 
 check-columnar-isolation: all  $(isolation_test_files)
 	$(pg_regress_multi_check) --load-extension=citus --isolationtester \
-	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/columnar_am_isolation_schedule $(EXTRA_TESTS)
+	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/columnar_isolation_schedule $(EXTRA_TESTS)
 
 check-failure: all
 	$(pg_regress_multi_check) --load-extension=citus --mitmproxy \
diff --git a/src/test/regress/columnar_am_isolation_schedule b/src/test/regress/columnar_am_isolation_schedule
deleted file mode 100644
index dab6e0acc..000000000
--- a/src/test/regress/columnar_am_isolation_schedule
+++ /dev/null
@@ -1,2 +0,0 @@
-test: am_write_concurrency
-test: am_vacuum_vs_insert
diff --git a/src/test/regress/columnar_am_schedule b/src/test/regress/columnar_am_schedule
deleted file mode 100644
index d6829c466..000000000
--- a/src/test/regress/columnar_am_schedule
+++ /dev/null
@@ -1,36 +0,0 @@
-test: multi_cluster_management
-test: multi_test_helpers multi_test_helpers_superuser
-test: multi_test_catalog_views
-
-test: am_create
-test: am_load
-test: am_query
-test: am_analyze
-test: am_data_types
-test: am_drop
-test: am_indexes
-test: columnar_fallback_scan
-test: columnar_partitioning
-test: columnar_permissions
-test: am_empty
-test: am_insert
-test: am_update_delete
-test: columnar_cursor
-test: am_copyto
-test: am_alter
-test: am_alter_set_type
-test: am_lz4 am_zstd
-test: am_rollback
-test: am_truncate
-test: am_vacuum
-test: am_clean
-test: columnar_types_without_comparison
-test: am_chunk_filtering
-test: am_join
-test: am_trigger
-test: am_tableoptions
-test: am_recursive
-test: am_transactions
-test: am_matview
-test: am_memory
-test: columnar_citus_integration
diff --git a/src/test/regress/columnar_isolation_schedule b/src/test/regress/columnar_isolation_schedule
new file mode 100644
index 000000000..93ede5825
--- /dev/null
+++ b/src/test/regress/columnar_isolation_schedule
@@ -0,0 +1,2 @@
+test: columnar_write_concurrency
+test: columnar_vacuum_vs_insert
diff --git a/src/test/regress/columnar_schedule b/src/test/regress/columnar_schedule
new file mode 100644
index 000000000..f9ac5d822
--- /dev/null
+++ b/src/test/regress/columnar_schedule
@@ -0,0 +1,36 @@
+test: multi_cluster_management
+test: multi_test_helpers multi_test_helpers_superuser
+test: multi_test_catalog_views
+
+test: columnar_create
+test: columnar_load
+test: columnar_query
+test: columnar_analyze
+test: columnar_data_types
+test: columnar_drop
+test: columnar_indexes
+test: columnar_fallback_scan
+test: columnar_partitioning
+test: columnar_permissions
+test: columnar_empty
+test: columnar_insert
+test: columnar_update_delete
+test: columnar_cursor
+test: columnar_copyto
+test: columnar_alter
+test: columnar_alter_set_type
+test: columnar_lz4 columnar_zstd
+test: columnar_rollback
+test: columnar_truncate
+test: columnar_vacuum
+test: columnar_clean
+test: columnar_types_without_comparison
+test: columnar_chunk_filtering
+test: columnar_join
+test: columnar_trigger
+test: columnar_tableoptions
+test: columnar_recursive
+test: columnar_transactions
+test: columnar_matview
+test: columnar_memory
+test: columnar_citus_integration
diff --git a/src/test/regress/expected/am_truncate_0.out b/src/test/regress/expected/am_truncate_0.out
deleted file mode 100644
index ffe2e6825..000000000
--- a/src/test/regress/expected/am_truncate_0.out
+++ /dev/null
@@ -1,256 +0,0 @@
---
--- Test the TRUNCATE TABLE command for cstore_fdw tables.
---
--- print whether we're using version > 10 to make version-specific tests clear
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 10 AS version_above_ten;
- version_above_ten
----------------------------------------------------------------------
- f
-(1 row)
-
--- Check that files for the automatically managed table exist in the
--- cstore_fdw/{databaseoid} directory.
-SELECT count(*) FROM (
-	SELECT pg_ls_dir('cstore_fdw/' || databaseoid ) FROM (
-	SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database()
-	) AS q1) AS q2;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
--- CREATE a cstore_fdw table, fill with some data --
-CREATE FOREIGN TABLE cstore_truncate_test (a int, b int) SERVER cstore_server;
-CREATE FOREIGN TABLE cstore_truncate_test_second (a int, b int) SERVER cstore_server;
-CREATE FOREIGN TABLE cstore_truncate_test_compressed (a int, b int) SERVER cstore_server OPTIONS (compression 'pglz');
-CREATE TABLE cstore_truncate_test_regular (a int, b int);
-INSERT INTO cstore_truncate_test select a, a from generate_series(1, 10) a;
-INSERT INTO cstore_truncate_test_compressed select a, a from generate_series(1, 10) a;
-INSERT INTO cstore_truncate_test_compressed select a, a from generate_series(1, 10) a;
--- query rows
-SELECT * FROM cstore_truncate_test;
- a  | b
----------------------------------------------------------------------
-  1 |  1
-  2 |  2
-  3 |  3
-  4 |  4
-  5 |  5
-  6 |  6
-  7 |  7
-  8 |  8
-  9 |  9
- 10 | 10
-(10 rows)
-
-TRUNCATE TABLE cstore_truncate_test;
-SELECT * FROM cstore_truncate_test;
- a | b
----------------------------------------------------------------------
-(0 rows)
-
-SELECT COUNT(*) from cstore_truncate_test;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
-SELECT count(*) FROM cstore_truncate_test_compressed;
- count
----------------------------------------------------------------------
-    20
-(1 row)
-
-TRUNCATE TABLE cstore_truncate_test_compressed;
-SELECT count(*) FROM cstore_truncate_test_compressed;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
--- make sure data files still present
-SELECT count(*) FROM (
-	SELECT pg_ls_dir('cstore_fdw/' || databaseoid ) FROM (
-	SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database()
-	) AS q1) AS q2;
- count
----------------------------------------------------------------------
-     6
-(1 row)
-
-INSERT INTO cstore_truncate_test select a, a from generate_series(1, 10) a;
-INSERT INTO cstore_truncate_test_regular select a, a from generate_series(10, 20) a;
-INSERT INTO cstore_truncate_test_second select a, a from generate_series(20, 30) a;
-SELECT * from cstore_truncate_test;
- a  | b
----------------------------------------------------------------------
-  1 |  1
-  2 |  2
-  3 |  3
-  4 |  4
-  5 |  5
-  6 |  6
-  7 |  7
-  8 |  8
-  9 |  9
- 10 | 10
-(10 rows)
-
-SELECT * from cstore_truncate_test_second;
- a  | b
----------------------------------------------------------------------
- 20 | 20
- 21 | 21
- 22 | 22
- 23 | 23
- 24 | 24
- 25 | 25
- 26 | 26
- 27 | 27
- 28 | 28
- 29 | 29
- 30 | 30
-(11 rows)
-
-SELECT * from cstore_truncate_test_regular;
- a  | b
----------------------------------------------------------------------
- 10 | 10
- 11 | 11
- 12 | 12
- 13 | 13
- 14 | 14
- 15 | 15
- 16 | 16
- 17 | 17
- 18 | 18
- 19 | 19
- 20 | 20
-(11 rows)
-
--- make sure multi truncate works
--- notice that the same table might be repeated
-TRUNCATE TABLE cstore_truncate_test,
-			   cstore_truncate_test_regular,
-			   cstore_truncate_test_second,
-   			   cstore_truncate_test;
-SELECT * from cstore_truncate_test;
- a | b
----------------------------------------------------------------------
-(0 rows)
-
-SELECT * from cstore_truncate_test_second;
- a | b
----------------------------------------------------------------------
-(0 rows)
-
-SELECT * from cstore_truncate_test_regular;
- a | b
----------------------------------------------------------------------
-(0 rows)
-
--- test if truncate on empty table works
-TRUNCATE TABLE cstore_truncate_test;
-SELECT * from cstore_truncate_test;
- a | b
----------------------------------------------------------------------
-(0 rows)
-
--- test if a cached truncate from a pl/pgsql function works
-CREATE FUNCTION cstore_truncate_test_regular_func() RETURNS void AS $$
-BEGIN
-	INSERT INTO cstore_truncate_test_regular select a, a from generate_series(1, 10) a;
-	TRUNCATE TABLE cstore_truncate_test_regular;
-END;$$
-LANGUAGE plpgsql;
-SELECT cstore_truncate_test_regular_func();
- cstore_truncate_test_regular_func
----------------------------------------------------------------------
-
-(1 row)
-
--- the cached plans are used stating from the second call
-SELECT cstore_truncate_test_regular_func();
- cstore_truncate_test_regular_func
----------------------------------------------------------------------
-
-(1 row)
-
-DROP FUNCTION cstore_truncate_test_regular_func();
-DROP FOREIGN TABLE cstore_truncate_test, cstore_truncate_test_second;
-DROP TABLE cstore_truncate_test_regular;
-DROP FOREIGN TABLE cstore_truncate_test_compressed;
--- test truncate with schema
-CREATE SCHEMA truncate_schema;
-CREATE FOREIGN TABLE truncate_schema.truncate_tbl (id int) SERVER cstore_server OPTIONS(compression 'pglz');
-INSERT INTO truncate_schema.truncate_tbl SELECT generate_series(1, 100);
-SELECT COUNT(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-   100
-(1 row)
-
-TRUNCATE TABLE truncate_schema.truncate_tbl;
-SELECT COUNT(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
-INSERT INTO truncate_schema.truncate_tbl SELECT generate_series(1, 100);
--- create a user that can not truncate
-CREATE USER truncate_user;
-GRANT USAGE ON SCHEMA truncate_schema TO truncate_user;
-GRANT SELECT ON TABLE truncate_schema.truncate_tbl TO truncate_user;
-REVOKE TRUNCATE ON TABLE truncate_schema.truncate_tbl FROM truncate_user;
-SELECT current_user \gset
-\c - truncate_user
--- verify truncate command fails and check number of rows
-SELECT count(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-   100
-(1 row)
-
-TRUNCATE TABLE truncate_schema.truncate_tbl;
-ERROR:  permission denied for relation truncate_tbl
-SELECT count(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-   100
-(1 row)
-
--- switch to super user, grant truncate to truncate_user
-\c - :current_user
-GRANT TRUNCATE ON TABLE truncate_schema.truncate_tbl TO truncate_user;
--- verify truncate_user can truncate now
-\c - truncate_user
-SELECT count(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-   100
-(1 row)
-
-TRUNCATE TABLE truncate_schema.truncate_tbl;
-SELECT count(*) FROM truncate_schema.truncate_tbl;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
-\c - :current_user
--- cleanup
-DROP SCHEMA truncate_schema CASCADE;
-NOTICE:  drop cascades to foreign table truncate_schema.truncate_tbl
-DROP USER truncate_user;
--- verify files are removed
-SELECT count(*) FROM (
-	SELECT pg_ls_dir('cstore_fdw/' || databaseoid ) FROM (
-	SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database()
-	) AS q1) AS q2;
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
diff --git a/src/test/regress/expected/am_alter.out b/src/test/regress/expected/columnar_alter.out
similarity index 100%
rename from src/test/regress/expected/am_alter.out
rename to src/test/regress/expected/columnar_alter.out
diff --git a/src/test/regress/expected/am_alter_set_type.out b/src/test/regress/expected/columnar_alter_set_type.out
similarity index 100%
rename from src/test/regress/expected/am_alter_set_type.out
rename to src/test/regress/expected/columnar_alter_set_type.out
diff --git a/src/test/regress/expected/am_analyze.out b/src/test/regress/expected/columnar_analyze.out
similarity index 94%
rename from src/test/regress/expected/am_analyze.out
rename to src/test/regress/expected/columnar_analyze.out
index e3dcae038..1daea244f 100644
--- a/src/test/regress/expected/am_analyze.out
+++ b/src/test/regress/expected/columnar_analyze.out
@@ -1,5 +1,5 @@
 --
--- Test the ANALYZE command for cstore_fdw tables.
+-- Test the ANALYZE command for columnar tables.
 --
 -- ANALYZE uncompressed table
 ANALYZE contestant;
diff --git a/src/test/regress/expected/am_clean.out b/src/test/regress/expected/columnar_clean.out
similarity index 100%
rename from src/test/regress/expected/am_clean.out
rename to src/test/regress/expected/columnar_clean.out
diff --git a/src/test/regress/expected/am_create.out b/src/test/regress/expected/columnar_create.out
similarity index 100%
rename from src/test/regress/expected/am_create.out
rename to src/test/regress/expected/columnar_create.out
diff --git a/src/test/regress/expected/am_drop.out b/src/test/regress/expected/columnar_drop.out
similarity index 100%
rename from src/test/regress/expected/am_drop.out
rename to src/test/regress/expected/columnar_drop.out
diff --git a/src/test/regress/expected/am_empty.out b/src/test/regress/expected/columnar_empty.out
similarity index 100%
rename from src/test/regress/expected/am_empty.out
rename to src/test/regress/expected/columnar_empty.out
diff --git a/src/test/regress/expected/am_indexes.out b/src/test/regress/expected/columnar_indexes.out
similarity index 100%
rename from src/test/regress/expected/am_indexes.out
rename to src/test/regress/expected/columnar_indexes.out
diff --git a/src/test/regress/expected/am_insert.out b/src/test/regress/expected/columnar_insert.out
similarity index 95%
rename from src/test/regress/expected/am_insert.out
rename to src/test/regress/expected/columnar_insert.out
index 2a02c8370..d7cb90e1a 100644
--- a/src/test/regress/expected/am_insert.out
+++ b/src/test/regress/expected/columnar_insert.out
@@ -1,5 +1,5 @@
 --
--- Testing insert on cstore_fdw tables.
+-- Testing insert on columnar tables.
 --
 CREATE TABLE test_insert_command (a int) USING columnar;
 -- test single row inserts fail
@@ -63,10 +63,10 @@ GROUP BY a ORDER BY a;
 CREATE TABLE test_long_text_hash AS
 SELECT int_val, md5(text_val) AS hash
 FROM test_long_text;
-CREATE TABLE test_cstore_long_text(int_val int, text_val text)
+CREATE TABLE test_columnar_long_text(int_val int, text_val text)
 USING columnar;
--- store long text in cstore table
-INSERT INTO test_cstore_long_text SELECT * FROM test_long_text;
+-- store long text in columnar table
+INSERT INTO test_columnar_long_text SELECT * FROM test_long_text;
 SELECT * FROM chunk_group_consistency;
  consistent
 ---------------------------------------------------------------------
@@ -75,10 +75,10 @@ SELECT * FROM chunk_group_consistency;
 
 -- drop source table to remove original text from toast
 DROP TABLE test_long_text;
--- check if text data is still available in cstore table
+-- check if text data is still available in columnar table
 -- by comparing previously stored hash.
 SELECT a.int_val
-FROM  test_long_text_hash a, test_cstore_long_text c
+FROM  test_long_text_hash a, test_columnar_long_text c
 WHERE a.int_val = c.int_val AND a.hash = md5(c.text_val);
  int_val
 ---------------------------------------------------------------------
@@ -95,7 +95,7 @@ WHERE a.int_val = c.int_val AND a.hash = md5(c.text_val);
 (10 rows)
 
 DROP TABLE test_long_text_hash;
-DROP TABLE test_cstore_long_text;
+DROP TABLE test_columnar_long_text;
 CREATE TABLE test_logical_replication(i int) USING columnar;
 -- should succeed
 INSERT INTO test_logical_replication VALUES (1);
diff --git a/src/test/regress/expected/am_join.out b/src/test/regress/expected/columnar_join.out
similarity index 91%
rename from src/test/regress/expected/am_join.out
rename to src/test/regress/expected/columnar_join.out
index dfd079551..011424a61 100644
--- a/src/test/regress/expected/am_join.out
+++ b/src/test/regress/expected/columnar_join.out
@@ -1,5 +1,5 @@
-CREATE SCHEMA am_cstore_join;
-SET search_path TO am_cstore_join;
+CREATE SCHEMA am_columnar_join;
+SET search_path TO am_columnar_join;
 CREATE TABLE users (id int, name text) USING columnar;
 INSERT INTO users SELECT a, 'name' || a FROM generate_series(0,30-1) AS a;
 CREATE TABLE things (id int, user_id int, name text) USING columnar;
@@ -34,4 +34,4 @@ WHERE things.id > 299990;
 (6 rows)
 
 SET client_min_messages TO warning;
-DROP SCHEMA am_cstore_join CASCADE;
+DROP SCHEMA am_columnar_join CASCADE;
diff --git a/src/test/regress/expected/am_lz4.out b/src/test/regress/expected/columnar_lz4.out
similarity index 100%
rename from src/test/regress/expected/am_lz4.out
rename to src/test/regress/expected/columnar_lz4.out
diff --git a/src/test/regress/expected/am_lz4_0.out b/src/test/regress/expected/columnar_lz4_0.out
similarity index 100%
rename from src/test/regress/expected/am_lz4_0.out
rename to src/test/regress/expected/columnar_lz4_0.out
diff --git a/src/test/regress/expected/am_matview.out b/src/test/regress/expected/columnar_matview.out
similarity index 100%
rename from src/test/regress/expected/am_matview.out
rename to src/test/regress/expected/columnar_matview.out
diff --git a/src/test/regress/expected/am_memory.out b/src/test/regress/expected/columnar_memory.out
similarity index 100%
rename from src/test/regress/expected/am_memory.out
rename to src/test/regress/expected/columnar_memory.out
diff --git a/src/test/regress/expected/am_query.out b/src/test/regress/expected/columnar_query.out
similarity index 100%
rename from src/test/regress/expected/am_query.out
rename to src/test/regress/expected/columnar_query.out
diff --git a/src/test/regress/expected/am_recursive.out b/src/test/regress/expected/columnar_recursive.out
similarity index 100%
rename from src/test/regress/expected/am_recursive.out
rename to src/test/regress/expected/columnar_recursive.out
diff --git a/src/test/regress/expected/am_rollback.out b/src/test/regress/expected/columnar_rollback.out
similarity index 100%
rename from src/test/regress/expected/am_rollback.out
rename to src/test/regress/expected/columnar_rollback.out
diff --git a/src/test/regress/expected/am_tableoptions.out b/src/test/regress/expected/columnar_tableoptions.out
similarity index 100%
rename from src/test/regress/expected/am_tableoptions.out
rename to src/test/regress/expected/columnar_tableoptions.out
diff --git a/src/test/regress/expected/am_transactions.out b/src/test/regress/expected/columnar_transactions.out
similarity index 100%
rename from src/test/regress/expected/am_transactions.out
rename to src/test/regress/expected/columnar_transactions.out
diff --git a/src/test/regress/expected/am_trigger.out b/src/test/regress/expected/columnar_trigger.out
similarity index 99%
rename from src/test/regress/expected/am_trigger.out
rename to src/test/regress/expected/columnar_trigger.out
index 048084d8e..a515b2375 100644
--- a/src/test/regress/expected/am_trigger.out
+++ b/src/test/regress/expected/columnar_trigger.out
@@ -155,9 +155,6 @@ SELECT * FROM test_tr ORDER BY i;
 (1 row)
 
 drop table test_tr;
---
--- https://github.com/citusdata/cstore2/issues/32
---
 create table events(
   user_id bigint,
   event_id bigint,
diff --git a/src/test/regress/expected/am_truncate.out b/src/test/regress/expected/columnar_truncate.out
similarity index 100%
rename from src/test/regress/expected/am_truncate.out
rename to src/test/regress/expected/columnar_truncate.out
diff --git a/src/test/regress/expected/am_update_delete.out b/src/test/regress/expected/columnar_update_delete.out
similarity index 100%
rename from src/test/regress/expected/am_update_delete.out
rename to src/test/regress/expected/columnar_update_delete.out
diff --git a/src/test/regress/expected/am_vacuum.out b/src/test/regress/expected/columnar_vacuum.out
similarity index 100%
rename from src/test/regress/expected/am_vacuum.out
rename to src/test/regress/expected/columnar_vacuum.out
diff --git a/src/test/regress/expected/am_vacuum_vs_insert.out b/src/test/regress/expected/columnar_vacuum_vs_insert.out
similarity index 100%
rename from src/test/regress/expected/am_vacuum_vs_insert.out
rename to src/test/regress/expected/columnar_vacuum_vs_insert.out
diff --git a/src/test/regress/expected/am_write_concurrency.out b/src/test/regress/expected/columnar_write_concurrency.out
similarity index 100%
rename from src/test/regress/expected/am_write_concurrency.out
rename to src/test/regress/expected/columnar_write_concurrency.out
diff --git a/src/test/regress/expected/am_zstd.out b/src/test/regress/expected/columnar_zstd.out
similarity index 100%
rename from src/test/regress/expected/am_zstd.out
rename to src/test/regress/expected/columnar_zstd.out
diff --git a/src/test/regress/expected/am_zstd_0.out b/src/test/regress/expected/columnar_zstd_0.out
similarity index 100%
rename from src/test/regress/expected/am_zstd_0.out
rename to src/test/regress/expected/columnar_zstd_0.out
diff --git a/src/test/regress/input/am_chunk_filtering.source b/src/test/regress/input/columnar_chunk_filtering.source
similarity index 100%
rename from src/test/regress/input/am_chunk_filtering.source
rename to src/test/regress/input/columnar_chunk_filtering.source
diff --git a/src/test/regress/input/am_copyto.source b/src/test/regress/input/columnar_copyto.source
similarity index 91%
rename from src/test/regress/input/am_copyto.source
rename to src/test/regress/input/columnar_copyto.source
index 622fb9efa..f397ba530 100644
--- a/src/test/regress/input/am_copyto.source
+++ b/src/test/regress/input/columnar_copyto.source
@@ -1,5 +1,5 @@
 --
--- Test copying data from cstore_fdw tables.
+-- Test copying data from columnar tables.
 --
 CREATE TABLE test_contestant(handle TEXT, birthdate DATE, rating INT,
         percentile FLOAT, country CHAR(3), achievements TEXT[])
diff --git a/src/test/regress/input/am_data_types.source b/src/test/regress/input/columnar_data_types.source
similarity index 96%
rename from src/test/regress/input/am_data_types.source
rename to src/test/regress/input/columnar_data_types.source
index 2b8dbbeee..f2c034d98 100644
--- a/src/test/regress/input/am_data_types.source
+++ b/src/test/regress/input/columnar_data_types.source
@@ -1,5 +1,5 @@
 --
--- Test loading and reading different data types to/from cstore_fdw foreign tables.
+-- Test loading and reading different data types to/from columnar foreign tables.
 --
 
 
diff --git a/src/test/regress/input/am_load.source b/src/test/regress/input/columnar_load.source
similarity index 100%
rename from src/test/regress/input/am_load.source
rename to src/test/regress/input/columnar_load.source
diff --git a/src/test/regress/output/am_chunk_filtering.source b/src/test/regress/output/columnar_chunk_filtering.source
similarity index 100%
rename from src/test/regress/output/am_chunk_filtering.source
rename to src/test/regress/output/columnar_chunk_filtering.source
diff --git a/src/test/regress/output/am_copyto.source b/src/test/regress/output/columnar_copyto.source
similarity index 94%
rename from src/test/regress/output/am_copyto.source
rename to src/test/regress/output/columnar_copyto.source
index 48c43ca0a..2e4df7d38 100644
--- a/src/test/regress/output/am_copyto.source
+++ b/src/test/regress/output/columnar_copyto.source
@@ -1,5 +1,5 @@
 --
--- Test copying data from cstore_fdw tables.
+-- Test copying data from columnar tables.
 --
 CREATE TABLE test_contestant(handle TEXT, birthdate DATE, rating INT,
         percentile FLOAT, country CHAR(3), achievements TEXT[])
diff --git a/src/test/regress/output/am_data_types.source b/src/test/regress/output/columnar_data_types.source
similarity index 97%
rename from src/test/regress/output/am_data_types.source
rename to src/test/regress/output/columnar_data_types.source
index 45778f0a3..122146160 100644
--- a/src/test/regress/output/am_data_types.source
+++ b/src/test/regress/output/columnar_data_types.source
@@ -1,5 +1,5 @@
 --
--- Test loading and reading different data types to/from cstore_fdw foreign tables.
+-- Test loading and reading different data types to/from columnar foreign tables.
 --
 -- Settings to make the result deterministic
 SET datestyle = "ISO, YMD";
diff --git a/src/test/regress/output/am_load.source b/src/test/regress/output/columnar_load.source
similarity index 100%
rename from src/test/regress/output/am_load.source
rename to src/test/regress/output/columnar_load.source
diff --git a/src/test/regress/spec/am_vacuum_vs_insert.spec b/src/test/regress/spec/columnar_vacuum_vs_insert.spec
similarity index 100%
rename from src/test/regress/spec/am_vacuum_vs_insert.spec
rename to src/test/regress/spec/columnar_vacuum_vs_insert.spec
diff --git a/src/test/regress/spec/am_write_concurrency.spec b/src/test/regress/spec/columnar_write_concurrency.spec
similarity index 100%
rename from src/test/regress/spec/am_write_concurrency.spec
rename to src/test/regress/spec/columnar_write_concurrency.spec
diff --git a/src/test/regress/sql/am_alter.sql b/src/test/regress/sql/columnar_alter.sql
similarity index 100%
rename from src/test/regress/sql/am_alter.sql
rename to src/test/regress/sql/columnar_alter.sql
diff --git a/src/test/regress/sql/am_alter_set_type.sql b/src/test/regress/sql/columnar_alter_set_type.sql
similarity index 100%
rename from src/test/regress/sql/am_alter_set_type.sql
rename to src/test/regress/sql/columnar_alter_set_type.sql
diff --git a/src/test/regress/sql/am_analyze.sql b/src/test/regress/sql/columnar_analyze.sql
similarity index 92%
rename from src/test/regress/sql/am_analyze.sql
rename to src/test/regress/sql/columnar_analyze.sql
index 489be53b7..46084f2df 100644
--- a/src/test/regress/sql/am_analyze.sql
+++ b/src/test/regress/sql/columnar_analyze.sql
@@ -1,5 +1,5 @@
 --
--- Test the ANALYZE command for cstore_fdw tables.
+-- Test the ANALYZE command for columnar tables.
 --
 
 -- ANALYZE uncompressed table
diff --git a/src/test/regress/sql/am_clean.sql b/src/test/regress/sql/columnar_clean.sql
similarity index 100%
rename from src/test/regress/sql/am_clean.sql
rename to src/test/regress/sql/columnar_clean.sql
diff --git a/src/test/regress/sql/am_create.sql b/src/test/regress/sql/columnar_create.sql
similarity index 100%
rename from src/test/regress/sql/am_create.sql
rename to src/test/regress/sql/columnar_create.sql
diff --git a/src/test/regress/sql/am_drop.sql b/src/test/regress/sql/columnar_drop.sql
similarity index 100%
rename from src/test/regress/sql/am_drop.sql
rename to src/test/regress/sql/columnar_drop.sql
diff --git a/src/test/regress/sql/am_empty.sql b/src/test/regress/sql/columnar_empty.sql
similarity index 100%
rename from src/test/regress/sql/am_empty.sql
rename to src/test/regress/sql/columnar_empty.sql
diff --git a/src/test/regress/sql/am_indexes.sql b/src/test/regress/sql/columnar_indexes.sql
similarity index 100%
rename from src/test/regress/sql/am_indexes.sql
rename to src/test/regress/sql/columnar_indexes.sql
diff --git a/src/test/regress/sql/am_insert.sql b/src/test/regress/sql/columnar_insert.sql
similarity index 92%
rename from src/test/regress/sql/am_insert.sql
rename to src/test/regress/sql/columnar_insert.sql
index e3f3a5230..4a5c8c8e3 100644
--- a/src/test/regress/sql/am_insert.sql
+++ b/src/test/regress/sql/columnar_insert.sql
@@ -1,5 +1,5 @@
 --
--- Testing insert on cstore_fdw tables.
+-- Testing insert on columnar tables.
 --
 
 CREATE TABLE test_insert_command (a int) USING columnar;
@@ -39,25 +39,25 @@ CREATE TABLE test_long_text_hash AS
 SELECT int_val, md5(text_val) AS hash
 FROM test_long_text;
 
-CREATE TABLE test_cstore_long_text(int_val int, text_val text)
+CREATE TABLE test_columnar_long_text(int_val int, text_val text)
 USING columnar;
 
--- store long text in cstore table
-INSERT INTO test_cstore_long_text SELECT * FROM test_long_text;
+-- store long text in columnar table
+INSERT INTO test_columnar_long_text SELECT * FROM test_long_text;
 
 SELECT * FROM chunk_group_consistency;
 
 -- drop source table to remove original text from toast
 DROP TABLE test_long_text;
 
--- check if text data is still available in cstore table
+-- check if text data is still available in columnar table
 -- by comparing previously stored hash.
 SELECT a.int_val
-FROM  test_long_text_hash a, test_cstore_long_text c
+FROM  test_long_text_hash a, test_columnar_long_text c
 WHERE a.int_val = c.int_val AND a.hash = md5(c.text_val);
 
 DROP TABLE test_long_text_hash;
-DROP TABLE test_cstore_long_text;
+DROP TABLE test_columnar_long_text;
 
 CREATE TABLE test_logical_replication(i int) USING columnar;
 -- should succeed
diff --git a/src/test/regress/sql/am_join.sql b/src/test/regress/sql/columnar_join.sql
similarity index 87%
rename from src/test/regress/sql/am_join.sql
rename to src/test/regress/sql/columnar_join.sql
index 2b7cc7388..54417623b 100644
--- a/src/test/regress/sql/am_join.sql
+++ b/src/test/regress/sql/columnar_join.sql
@@ -1,5 +1,5 @@
-CREATE SCHEMA am_cstore_join;
-SET search_path TO am_cstore_join;
+CREATE SCHEMA am_columnar_join;
+SET search_path TO am_columnar_join;
 
 CREATE TABLE users (id int, name text) USING columnar;
 INSERT INTO users SELECT a, 'name' || a FROM generate_series(0,30-1) AS a;
@@ -25,4 +25,4 @@ JOIN things ON (users.id = things.user_id)
 WHERE things.id > 299990;
 
 SET client_min_messages TO warning;
-DROP SCHEMA am_cstore_join CASCADE;
+DROP SCHEMA am_columnar_join CASCADE;
diff --git a/src/test/regress/sql/am_lz4.sql b/src/test/regress/sql/columnar_lz4.sql
similarity index 100%
rename from src/test/regress/sql/am_lz4.sql
rename to src/test/regress/sql/columnar_lz4.sql
diff --git a/src/test/regress/sql/am_matview.sql b/src/test/regress/sql/columnar_matview.sql
similarity index 100%
rename from src/test/regress/sql/am_matview.sql
rename to src/test/regress/sql/columnar_matview.sql
diff --git a/src/test/regress/sql/am_memory.sql b/src/test/regress/sql/columnar_memory.sql
similarity index 100%
rename from src/test/regress/sql/am_memory.sql
rename to src/test/regress/sql/columnar_memory.sql
diff --git a/src/test/regress/sql/am_query.sql b/src/test/regress/sql/columnar_query.sql
similarity index 100%
rename from src/test/regress/sql/am_query.sql
rename to src/test/regress/sql/columnar_query.sql
diff --git a/src/test/regress/sql/am_recursive.sql b/src/test/regress/sql/columnar_recursive.sql
similarity index 100%
rename from src/test/regress/sql/am_recursive.sql
rename to src/test/regress/sql/columnar_recursive.sql
diff --git a/src/test/regress/sql/am_rollback.sql b/src/test/regress/sql/columnar_rollback.sql
similarity index 100%
rename from src/test/regress/sql/am_rollback.sql
rename to src/test/regress/sql/columnar_rollback.sql
diff --git a/src/test/regress/sql/am_tableoptions.sql b/src/test/regress/sql/columnar_tableoptions.sql
similarity index 100%
rename from src/test/regress/sql/am_tableoptions.sql
rename to src/test/regress/sql/columnar_tableoptions.sql
diff --git a/src/test/regress/sql/am_transactions.sql b/src/test/regress/sql/columnar_transactions.sql
similarity index 100%
rename from src/test/regress/sql/am_transactions.sql
rename to src/test/regress/sql/columnar_transactions.sql
diff --git a/src/test/regress/sql/am_trigger.sql b/src/test/regress/sql/columnar_trigger.sql
similarity index 98%
rename from src/test/regress/sql/am_trigger.sql
rename to src/test/regress/sql/columnar_trigger.sql
index d8489fe4c..675143ef8 100644
--- a/src/test/regress/sql/am_trigger.sql
+++ b/src/test/regress/sql/columnar_trigger.sql
@@ -125,9 +125,6 @@ SELECT * FROM test_tr ORDER BY i;
 
 drop table test_tr;
 
---
--- https://github.com/citusdata/cstore2/issues/32
---
 create table events(
   user_id bigint,
   event_id bigint,
diff --git a/src/test/regress/sql/am_truncate.sql b/src/test/regress/sql/columnar_truncate.sql
similarity index 100%
rename from src/test/regress/sql/am_truncate.sql
rename to src/test/regress/sql/columnar_truncate.sql
diff --git a/src/test/regress/sql/am_update_delete.sql b/src/test/regress/sql/columnar_update_delete.sql
similarity index 100%
rename from src/test/regress/sql/am_update_delete.sql
rename to src/test/regress/sql/columnar_update_delete.sql
diff --git a/src/test/regress/sql/am_vacuum.sql b/src/test/regress/sql/columnar_vacuum.sql
similarity index 100%
rename from src/test/regress/sql/am_vacuum.sql
rename to src/test/regress/sql/columnar_vacuum.sql
diff --git a/src/test/regress/sql/am_zstd.sql b/src/test/regress/sql/columnar_zstd.sql
similarity index 100%
rename from src/test/regress/sql/am_zstd.sql
rename to src/test/regress/sql/columnar_zstd.sql