diff --git a/app/client/cypress/e2e/GSheet/Misc_Spec.ts b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
similarity index 100%
rename from app/client/cypress/e2e/GSheet/Misc_Spec.ts
rename to app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Autocomplete_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Autocomplete_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/menubutton_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/menubutton_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select2_spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts
rename to app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js
similarity index 100%
rename from app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js
rename to app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js