diff --git a/src/test/java/org/tests/compositekeys/db/Item.java b/src/test/java/org/tests/compositekeys/db/Item.java
index 4780e06ca..1b0aa526b 100644
--- a/src/test/java/org/tests/compositekeys/db/Item.java
+++ b/src/test/java/org/tests/compositekeys/db/Item.java
@@ -23,10 +23,10 @@ public class Item {
   private int region;
 
   @Embedded
-  @AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED"))
-  @AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED"))
-  @AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY"))
-  @AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
+  @AttributeOverride(name = "lastUpdated", column = @Column(name = "date_modified"))
+  @AttributeOverride(name = "created", column = @Column(name = "date_created"))
+  @AttributeOverride(name = "updatedBy", column = @Column(name = "modified_by"))
+  @AttributeOverride(name = "createdBy", column = @Column(name = "created_by"))
   private AuditInfo auditInfo = new AuditInfo();
 
   @Version
diff --git a/src/test/java/org/tests/compositekeys/db/Parcel.java b/src/test/java/org/tests/compositekeys/db/Parcel.java
index cb18bf8e5..bf1324de9 100644
--- a/src/test/java/org/tests/compositekeys/db/Parcel.java
+++ b/src/test/java/org/tests/compositekeys/db/Parcel.java
@@ -7,7 +7,7 @@ import javax.persistence.Id;
 @Entity
 public class Parcel {
   @Id
-  @Column(name = "parcelId")
+  @Column(name = "parcelid")
   private Long parcelId;
 
   private String description;
diff --git a/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
index 4008006b0..b9822b807 100644
--- a/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
+++ b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
@@ -9,13 +9,13 @@ import javax.persistence.OneToOne;
 @Entity
 public class ParcelLocation {
   @Id
-  @Column(name = "parcelLocId")
+  @Column(name = "parcellocid")
   private Long parcelLocId;
 
   private String location;
 
   @OneToOne
-  @JoinColumn(name = "parcelId", referencedColumnName = "parcelId")
+  @JoinColumn(name = "parcelid", referencedColumnName = "parcelid")
   private Parcel parcel;
 
   public Long getParcelLocId() {
diff --git a/src/test/java/org/tests/model/basic/Phone.java b/src/test/java/org/tests/model/basic/Phone.java
index f20d1106b..94b45624d 100644
--- a/src/test/java/org/tests/model/basic/Phone.java
+++ b/src/test/java/org/tests/model/basic/Phone.java
@@ -27,7 +27,7 @@ public class Phone implements Serializable {
 
   @Id
   @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-  @Column(name = "ID", unique = true, nullable = false)
+  @Column(name = "id", unique = true, nullable = false)
   public Long getId() {
     return id;
   }
@@ -36,7 +36,7 @@ public class Phone implements Serializable {
     this.id = id;
   }
 
-  @Column(name = "PHONE_NUMBER", nullable = false, unique = true, columnDefinition = "varchar(7)")
+  @Column(name = "phone_number", nullable = false, unique = true, columnDefinition = "varchar(7)")
   public String getPhoneNumber() {
     return phoneNumber;
   }
@@ -47,7 +47,7 @@ public class Phone implements Serializable {
 
   @NotNull
   @ManyToOne(targetEntity = Person.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "PERSON_ID", nullable = false)
+  @JoinColumn(name = "person_id", nullable = false)
   public Person getPerson() {
     return person;
   }
diff --git a/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/src/test/java/org/tests/model/carwheeltruck/TTruck.java
index 3c1bd7a83..86529a19c 100644
--- a/src/test/java/org/tests/model/carwheeltruck/TTruck.java
+++ b/src/test/java/org/tests/model/carwheeltruck/TTruck.java
@@ -13,7 +13,7 @@ import javax.persistence.InheritanceType;
 @DiscriminatorValue("truck")
 public class TTruck extends TCar {
 
-  @Column(name = "truckLoad")
+  @Column(name = "truckload")
   Long load;
 
   public Long getLoad() {
diff --git a/src/test/java/org/tests/model/composite/ROrder.java b/src/test/java/org/tests/model/composite/ROrder.java
index 14fd2d9c9..0b543321a 100644
--- a/src/test/java/org/tests/model/composite/ROrder.java
+++ b/src/test/java/org/tests/model/composite/ROrder.java
@@ -24,11 +24,11 @@ public class ROrder {
   @ManyToOne(cascade = CascadeType.PERSIST)
   @JoinColumns({
     @JoinColumn(name = "company", referencedColumnName = "company", insertable = false, updatable = false),
-    @JoinColumn(name = "customerName", referencedColumnName = "name", insertable = false, updatable = false)
+    @JoinColumn(name = "customername", referencedColumnName = "name", insertable = false, updatable = false)
   })
   private RCustomer customer;
 
-  @Column(name = "customerName")
+  @Column(name = "customername")
   @Size(max=127)
   private String customerName;
 
diff --git a/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
index 5d5ff5c90..71116ea0d 100644
--- a/src/test/java/org/tests/model/nofk/EFile2NoFk.java
+++ b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
@@ -20,12 +20,12 @@ public class EFile2NoFk {
 
   // owner without softdelete property - will throw bean has been deleted
   @ManyToOne
-  @Formula(select = "${ta}.Owner_Id")
+  @Formula(select = "${ta}.owner_id")
   EUserNoFk owner;
 
   // owner with softdelete property - will set the property to true
   @ManyToOne
-  @Formula(select = "${ta}.Owner_id")
+  @Formula(select = "${ta}.owner_id")
   EUserNoFkSoftDel ownerSoftDel;
 
 
diff --git a/src/test/java/org/tests/model/selfref/ResourceFile.java b/src/test/java/org/tests/model/selfref/ResourceFile.java
index b7696eeaf..b8e9b964f 100644
--- a/src/test/java/org/tests/model/selfref/ResourceFile.java
+++ b/src/test/java/org/tests/model/selfref/ResourceFile.java
@@ -20,7 +20,7 @@ public class ResourceFile extends BaseResourceFile {
   private static final long serialVersionUID = 1L;
 
   @ManyToOne(fetch = FetchType.LAZY, optional = true)
-  @JoinColumn(name = "parentResourceFileId", nullable = true)
+  @JoinColumn(name = "parentresourcefileid", nullable = true)
   private ResourceFile parent;
 
   @OneToMany(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY, mappedBy = "parent")
diff --git a/src/test/java/org/tests/model/survey/Category.java b/src/test/java/org/tests/model/survey/Category.java
index c40114a4f..c31b63550 100644
--- a/src/test/java/org/tests/model/survey/Category.java
+++ b/src/test/java/org/tests/model/survey/Category.java
@@ -21,7 +21,7 @@ public class Category {
   }
 
   @ManyToOne
-  @JoinColumn(name = "surveyObjectId")
+  @JoinColumn(name = "surveyobjectid")
   private Survey survey;
 
   @OneToMany(mappedBy = "category", cascade = {CascadeType.PERSIST, CascadeType.MERGE})
diff --git a/src/test/java/org/tests/model/survey/Group.java b/src/test/java/org/tests/model/survey/Group.java
index df4846938..dcbc3fe83 100644
--- a/src/test/java/org/tests/model/survey/Group.java
+++ b/src/test/java/org/tests/model/survey/Group.java
@@ -24,7 +24,7 @@ public class Group {
   }
 
   @ManyToOne
-  @JoinColumn(name = "categoryObjectId")
+  @JoinColumn(name = "categoryobjectid")
   private Category category;
 
   @OneToMany(mappedBy = "group", cascade = {CascadeType.PERSIST, CascadeType.MERGE})
diff --git a/src/test/java/org/tests/model/survey/Question.java b/src/test/java/org/tests/model/survey/Question.java
index 49038c9a4..1f5c9d081 100644
--- a/src/test/java/org/tests/model/survey/Question.java
+++ b/src/test/java/org/tests/model/survey/Question.java
@@ -17,7 +17,7 @@ public class Question {
   }
 
   @ManyToOne
-  @JoinColumn(name = "groupObjectId")
+  @JoinColumn(name = "groupobjectid")
   private Group group;
 
   private int sequenceNumber;
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index cabde9917..306ef26ac 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -105,7 +105,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
   }
 
   @Test
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   public void test_upperCaseSql() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
index 394180d2b..51aafc413 100644
--- a/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
+++ b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
@@ -20,7 +20,7 @@ public class PalletLocation {
   private Integer id;
 
   @ManyToOne(fetch = FetchType.LAZY, optional = false)
-  @JoinColumn(name = "ZONE_SID")
+  @JoinColumn(name = "zone_sid")
   private Zone zone;
 
   public Integer getId() {
diff --git a/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
index 6116615d4..58b935c49 100644
--- a/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
+++ b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
@@ -19,13 +19,13 @@ public class Warehouse {
   private Integer id;
 
   @ManyToOne//(optional = false) //todo: should this be nullable with assertions made?
-  @JoinColumn(name = "officeZoneId")
+  @JoinColumn(name = "officezoneid")
   private ZoneInternal officeZone;
 
   @ManyToMany(cascade = CascadeType.PERSIST)
   @JoinTable(name = "warehousesshippingzones",
-    joinColumns = {@JoinColumn(name = "warehouseId", referencedColumnName = "ID")},
-    inverseJoinColumns = {@JoinColumn(name = "shippingZoneId", referencedColumnName = "ID")}
+    joinColumns = {@JoinColumn(name = "warehouseid", referencedColumnName = "id")},
+    inverseJoinColumns = {@JoinColumn(name = "shippingzoneid", referencedColumnName = "id")}
   )
   private Set<ZoneExternal> shippingZones;
 
diff --git a/src/test/resources/assert/changeset-apply.txt b/src/test/resources/assert/changeset-apply.txt
index 16d68bacc..4343a231e 100644
--- a/src/test/resources/assert/changeset-apply.txt
+++ b/src/test/resources/assert/changeset-apply.txt
@@ -877,10 +877,10 @@ create table item (
   units                         varchar(255),
   type                          integer,
   region                        integer,
-  DATE_MODIFIED                 timestamp,
-  DATE_CREATED                  timestamp,
-  MODIFIED_BY                   varchar(255),
-  CREATED_BY                    varchar(255),
+  date_modified                 timestamp,
+  date_created                  timestamp,
+  modified_by                   varchar(255),
+  created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemNumber)
 );
diff --git a/src/test/resources/assert/changeset-pg-apply.sql b/src/test/resources/assert/changeset-pg-apply.sql
index c995e7c84..5493619f1 100644
--- a/src/test/resources/assert/changeset-pg-apply.sql
+++ b/src/test/resources/assert/changeset-pg-apply.sql
@@ -777,10 +777,10 @@ create table item (
   units                         varchar(255),
   type                          integer,
   region                        integer,
-  DATE_MODIFIED                 timestamp,
-  DATE_CREATED                  timestamp,
-  MODIFIED_BY                   varchar(255),
-  CREATED_BY                    varchar(255),
+  date_modified                 timestamp,
+  date_created                  timestamp,
+  modified_by                   varchar(255),
+  created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemNumber)
 );