diff --git a/src/main/java/org/gcube/accounting/utility/postgresql/RecordToDBFields.java b/src/main/java/org/gcube/accounting/utility/postgresql/RecordToDBFields.java
index d3bda65..1beb84f 100644
--- a/src/main/java/org/gcube/accounting/utility/postgresql/RecordToDBFields.java
+++ b/src/main/java/org/gcube/accounting/utility/postgresql/RecordToDBFields.java
@@ -11,7 +11,7 @@ public class RecordToDBFields {
 	public static String getKey(String fieldName) {
 		StringBuffer stringBuffer = new StringBuffer();
 		int lenght = fieldName.length();
-		boolean lastLowerCase = true;
+		boolean lastLowerCase = false;
         for (int i=0; i<lenght; i++) { 
            Character ch = fieldName.charAt(i); /*traversing String one by one*/
             if (Character.isUpperCase(ch)) {
@@ -38,7 +38,7 @@ public class RecordToDBFields {
 	protected RecordToDBFields(String typeName, Class<? extends Record> clz) throws Exception {
 		this.clz = clz;
 		this.typeName = typeName;
-		this.tableName = typeName.toLowerCase();
+		this.tableName = RecordToDBFields.getKey(typeName);
 		this.tableFieldToRecordField = new HashMap<>();
 		this.recordFieldToTableField = new HashMap<>();
 		mapFields();