diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q10.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q10.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q10.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q10.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q19.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q19.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q19.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q19.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q27.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q27.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q27.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q27.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q3.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q3.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q3.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q3.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q34.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q34.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q34.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q34.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q42.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q42.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q42.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q42.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q43.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q43.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q43.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q43.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q46.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q46.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q46.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q46.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q52.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q52.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q52.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q52.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q53.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q53.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q53.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q53.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q55.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q55.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q55.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q55.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q59.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q59.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q59.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q59.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q63.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q63.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q63.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q63.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q65.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q65.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q65.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q65.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q68.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q68.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q68.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q68.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q7.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q7.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q7.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q7.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q73.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q73.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q73.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q73.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q79.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q79.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q79.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q79.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q89.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q89.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q89.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q89.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q98.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/q98.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/q98.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/q98.sql
diff --git a/sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/ss_max.sql b/sql/core/src/test/resources/tpcds-modifiedQueries/ss_max.sql
similarity index 100%
rename from sql/core/src/test/resources/tpcds-modifiedTPCDSQueries/ss_max.sql
rename to sql/core/src/test/resources/tpcds-modifiedQueries/ss_max.sql