diff --git a/ddl/5.3/sql server/OMOPCDM_sql server_5.3_constraints.sql b/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/sql server/OMOPCDM_sql server_5.3_constraints.sql
rename to ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql
diff --git a/ddl/5.3/sql server/OMOPCDM_sql server_5.3_ddl.sql b/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/sql server/OMOPCDM_sql server_5.3_ddl.sql
rename to ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql
diff --git a/ddl/5.3/sql server/OMOPCDM_sql server_5.3_indices.sql b/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/sql server/OMOPCDM_sql server_5.3_indices.sql
rename to ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql
diff --git a/ddl/5.3/sql server/OMOPCDM_sql server_5.3_primary_keys.sql b/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/sql server/OMOPCDM_sql server_5.3_primary_keys.sql
rename to ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql
diff --git a/ddl/5.4/sql server/OMOPCDM_sql server_5.4_constraints.sql b/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/sql server/OMOPCDM_sql server_5.4_constraints.sql
rename to ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql
diff --git a/ddl/5.4/sql server/OMOPCDM_sql server_5.4_ddl.sql b/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/sql server/OMOPCDM_sql server_5.4_ddl.sql
rename to ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql
diff --git a/ddl/5.4/sql server/OMOPCDM_sql server_5.4_indices.sql b/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/sql server/OMOPCDM_sql server_5.4_indices.sql
rename to ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql
diff --git a/ddl/5.4/sql server/OMOPCDM_sql server_5.4_primary_keys.sql b/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/sql server/OMOPCDM_sql server_5.4_primary_keys.sql
rename to ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql
diff --git a/inst/csv/OMOP_CDMv5.3_Field_Level.csv b/inst/csv/OMOP_CDMv5.3_Field_Level.csv
index 6b7418c..80e0e9f 100644
--- a/inst/csv/OMOP_CDMv5.3_Field_Level.csv
+++ b/inst/csv/OMOP_CDMv5.3_Field_Level.csv
@@ -514,20 +514,4 @@ ATTRIBUTE_DEFINITION,attribute_name,Yes,varchar(255),,,No,No,,,,,
 ATTRIBUTE_DEFINITION,attribute_description,No,varchar(MAX),,,No,No,,,,,
 ATTRIBUTE_DEFINITION,attribute_type_concept_id,Yes,integer,,,No,Yes,CONCEPT,CONCEPT_ID,,,
 ATTRIBUTE_DEFINITION,attribute_syntax,No,varchar(MAX),,,No,No,,,,,
-=======
-1-Jan-1970.",,No,No,,,,,
-DRUG_STRENGTH,valid_end_date,Yes,date,The date when then Concept became invalid.,,No,No,,,,,
-DRUG_STRENGTH,invalid_reason,No,varchar(1),"Reason the concept was invalidated. Possible values are D (deleted), U (replaced with an update) or NULL when valid_end_date has the default value.",,No,No,,,,,
-COHORT_DEFINITION,cohort_definition_id,Yes,integer,"This is the identifier given to the cohort, usually by the ATLAS application",,No,No,,,,,
-COHORT_DEFINITION,cohort_definition_name,Yes,varchar(255),A short description of the cohort,,No,No,,,,,
-COHORT_DEFINITION,cohort_definition_description,No,varchar(MAX),A complete description of the cohort.,,No,No,,,,,
-COHORT_DEFINITION,definition_type_concept_id,Yes,integer,Type defining what kind of Cohort Definition the record represents and how the syntax may be executed.,,No,Yes,CONCEPT,CONCEPT_ID,,,
-COHORT_DEFINITION,cohort_definition_syntax,No,varchar(MAX),Syntax or code to operationalize the Cohort Definition.,,No,No,,,,,
-COHORT_DEFINITION,subject_concept_id,Yes,integer,"This field contains a Concept that represents the domain of the subjects that are members of the cohort (e.g., Person, Provider, Visit).",,No,Yes,CONCEPT,CONCEPT_ID,,,
-COHORT_DEFINITION,cohort_initiation_date,No,date,A date to indicate when the Cohort was initiated in the COHORT table.,,No,No,,,,,
-ATTRIBUTE_DEFINITION,attribute_definition_id,Yes,integer,,,No,No,,,,,
-ATTRIBUTE_DEFINITION,attribute_name,Yes,varchar(255),,,No,No,,,,,
-ATTRIBUTE_DEFINITION,attribute_description,No,varchar(MAX),,,No,No,,,,,
-ATTRIBUTE_DEFINITION,attribute_type_concept_id,Yes,integer,,,No,Yes,CONCEPT,CONCEPT_ID,,,
-ATTRIBUTE_DEFINITION,attribute_syntax,No,varchar(MAX),,,No,No,,,,,
->>>>>>> v5.4:inst/csv/OMOP_CDMv5.3.1_Field_Level.csv
+
diff --git a/inst/sql/sql_server/OMOP CDM indices v5.3.sql b/inst/sql/sql_server/OMOP_CDM_indices_v5.3.sql
similarity index 99%
rename from inst/sql/sql_server/OMOP CDM indices v5.3.sql
rename to inst/sql/sql_server/OMOP_CDM_indices_v5.3.sql
index 9e96c2b..c4a50b5 100644
--- a/inst/sql/sql_server/OMOP CDM indices v5.3.sql	
+++ b/inst/sql/sql_server/OMOP_CDM_indices_v5.3.sql
@@ -1,4 +1,4 @@
-/*@targetdialect OMOP CDM Indices
+/*@targetDialect OMOP CDM Indices
 
   There are no unique indices created because it is assumed that the primary key constraints have been run prior to
   implementing indices.
diff --git a/inst/sql/sql_server/OMOP CDM indices v5.4.sql b/inst/sql/sql_server/OMOP_CDM_indices_v5.4.sql
similarity index 99%
rename from inst/sql/sql_server/OMOP CDM indices v5.4.sql
rename to inst/sql/sql_server/OMOP_CDM_indices_v5.4.sql
index 9e96c2b..c4a50b5 100644
--- a/inst/sql/sql_server/OMOP CDM indices v5.4.sql	
+++ b/inst/sql/sql_server/OMOP_CDM_indices_v5.4.sql
@@ -1,4 +1,4 @@
-/*@targetdialect OMOP CDM Indices
+/*@targetDialect OMOP CDM Indices
 
   There are no unique indices created because it is assumed that the primary key constraints have been run prior to
   implementing indices.
diff --git a/inst/sql/sql_server/OMOP CDM indices v6.0.sql b/inst/sql/sql_server/OMOP_CDM_indices_v6.0.sql
similarity index 99%
rename from inst/sql/sql_server/OMOP CDM indices v6.0.sql
rename to inst/sql/sql_server/OMOP_CDM_indices_v6.0.sql
index ac1aabb..520320c 100644
--- a/inst/sql/sql_server/OMOP CDM indices v6.0.sql	
+++ b/inst/sql/sql_server/OMOP_CDM_indices_v6.0.sql
@@ -1,4 +1,4 @@
-/*@targetdialect OMOP CDM Indices*/
+/*@targetDialect OMOP CDM Indices*/
 
 
 /************************