diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java
index a277ceba3..1737b444c 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java
@@ -53,15 +53,11 @@ public class ChangeLetterCaseNameMapping implements NameMapping {
 
     @Override
     public Optional<String> getColumnOverride(SchemaAndTable key, String column) {
-        return Optional.of(column.toUpperCase());
+        return Optional.of(targetCaseOrNull(column));
     }
 
     @Override
     public Optional<SchemaAndTable> getOverride(SchemaAndTable key) {
-        String schema = key.getSchema();
-        if (schema != null) {
-            schema = schema.toUpperCase();
-        }
         return Optional.of(new SchemaAndTable(targetCaseOrNull(key.getSchema()), targetCaseOrNull(key.getTable())));
     }