diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
index 2c2352377b..84350d58a2 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
@@ -111,7 +111,7 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
     private BigDecimal numCnf;
 
     @SqlField(value = "causale", nullable = false)
-    private CausaleRiga causale;
+    private Causale causale;
 
     @SqlField(value = "utente", maxLength = 40)
     private String utente;
@@ -392,11 +392,11 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
         return this;
     }
 
-    public CausaleRiga getCausale() {
+    public Causale getCausale() {
         return causale;
     }
 
-    public MtbColr setCausale(CausaleRiga causale) {
+    public MtbColr setCausale(Causale causale) {
         this.causale = causale;
         return this;
     }
@@ -606,19 +606,19 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
         return Objects.hash(getDataCollo(), getGestione(), getSerCollo(), getNumCollo(), getRiga(), getRigaOrd(), getCodMart(), getCodBarre(), getCodCol(), getCodTagl(), getPartitaMag(), getGestioneRif(), getSerColloRif(), getNote(), getDataOrd(), getDataColloRif(), getQtaCnf(), getQtaCol(), getNumOrd(), getNumEtich(), getNumColloRif(), getDatetimeRow(), getCodJcom(), getNumCnf(), getCausale(), getUtente(), getCodAnagDoc(), getCodDtipDoc(), getDataDoc(), getSerDoc(), getNumDoc(), getIdRigaDoc(), getPesoNettoKg(), getPesoLordoKg(), getInsPartitaMag(), getMtbPartitaMag_descrizione(), getDataScadPartita(), getDescrizione(), getFlagQtaCnfFissa(), getArtAPeso());
     }
 
-    public enum CausaleRiga implements IBaseEnum<CausaleRiga> {
+    public enum Causale implements IBaseEnum<Causale> {
 
         DEFAULT((short) 0), RETTIFICA((short) 1), VERSAMENTO((short) 2);
 
         private final short value;
 
-        CausaleRiga(short value) {
+        Causale(short value) {
             this.value = value;
         }
 
-        public static CausaleRiga from(Object value) {
+        public static Causale from(Object value) {
             short castValue = (short) value;
-            for (CausaleRiga b : CausaleRiga.values()) {
+            for (Causale b : Causale.values()) {
                 if (b.value == castValue)
                     return b;
             }
@@ -636,7 +636,7 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
         }
 
         @Override
-        public CausaleRiga fromInternal(Object val) {
+        public Causale fromInternal(Object val) {
             return from(val);
         }
     }
diff --git a/ems-engine/pom.xml b/ems-engine/pom.xml
index 76801711d4..d6bc22faaa 100644
--- a/ems-engine/pom.xml
+++ b/ems-engine/pom.xml
@@ -84,6 +84,10 @@
                     <outputFile>../ts/ems-engine.module.ts</outputFile>
                     <outputKind>module</outputKind>
                     <outputFileType>implementationFile</outputFileType>
+                    <customTypeNaming>
+                        <naming>it.integry.ems_model.entity.MtbColr$Causale:MtbColrCausale</naming>
+                        <naming>it.integry.ems_model.entity.MtbCols$Causale:MtbColsCausale</naming>
+                    </customTypeNaming>
                     <generateConstructors>true</generateConstructors>
                     <mapClasses>asClasses</mapClasses>
                     <mapEnum>asEnum</mapEnum>
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
index dcd43189f5..711b48e3ad 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
@@ -279,7 +279,7 @@ public class WMSAccettazioneService {
 
 
         final MtbColr targetMtbColr = new MtbColr()
-                .setCausale(MtbColr.CausaleRiga.DEFAULT)
+                .setCausale(MtbColr.Causale.DEFAULT)
                 .setPartitaMag(insertUDCRowRequestDTO.getPartitaMag())
                 .setDataScadPartita(UtilityDate.toDate(insertUDCRowRequestDTO.getDataScad()))
                 .setQtaCol(insertUDCRowRequestDTO.getQtaTot())
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
index 1c44a5618a..d3e06fb1fa 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
@@ -1231,7 +1231,7 @@ public class WMSGenericService {
                             .setNumCnf(differenceNumCnf)
                             .setQtaCnf(qtaCnf)
                             .setDatetimeRow(new Date())
-                            .setCausale(MtbColr.CausaleRiga.RETTIFICA)
+                            .setCausale(MtbColr.Causale.RETTIFICA)
                             .setPesoNettoKg(null)
                             .setPesoLordoKg(null);
 
@@ -1267,7 +1267,7 @@ public class WMSGenericService {
                             .setDataColloRif(UtilityLocalDate.localDateToDate(mtbColtOrphan.getDataCollo()))
                             .setGestioneRif(mtbColtOrphan.getGestione())
                             .setNumColloRif(mtbColtOrphan.getNumCollo())
-                            .setCausale(MtbColr.CausaleRiga.RETTIFICA)
+                            .setCausale(MtbColr.Causale.RETTIFICA)
                             .setPesoNettoKg(null)
                             .setPesoLordoKg(null)
                             .setDatetimeRow(new Date());
@@ -1301,7 +1301,7 @@ public class WMSGenericService {
                             .setQtaCol(differenceQtaCol.abs())
                             .setQtaCnf(qtaCnf)
                             .setNumCnf(differenceNumCnf.abs())
-                            .setCausale(MtbColr.CausaleRiga.RETTIFICA)
+                            .setCausale(MtbColr.Causale.RETTIFICA)
                             .setSerColloRif(sourceMtbColr.getSerCollo())
                             .setDataColloRif(UtilityLocalDate.localDateToDate(sourceMtbColr.getDataCollo()))
                             .setGestioneRif(sourceMtbColr.getGestione())
@@ -1354,7 +1354,7 @@ public class WMSGenericService {
                     .setNumCnf(differenceNumCnf)
                     .setQtaCnf(qtaCnf)
                     .setQtaCol(differenceQtaCol)
-                    .setCausale(MtbColr.CausaleRiga.RETTIFICA)
+                    .setCausale(MtbColr.Causale.RETTIFICA)
                     .setDatetimeRow(new Date())
                     .setPesoNettoKg(null)
                     .setPesoLordoKg(null)
@@ -2006,7 +2006,7 @@ public class WMSGenericService {
                             .setNumColloRif(cloneMtbColr.getNumColloRif())
                             .setSerColloRif(cloneMtbColr.getSerColloRif())
                             .setDataColloRif(cloneMtbColr.getDataColloRif())
-                            .setCausale(MtbColr.CausaleRiga.VERSAMENTO)
+                            .setCausale(MtbColr.Causale.VERSAMENTO)
                             .setUtente(requestDataDTO.getUsername())
 
                             .setQtaCol(stornoSourceMtbColr.getQtaCol().multiply(new BigDecimal(-1)))
@@ -2033,7 +2033,7 @@ public class WMSGenericService {
                         .setNumCollo(null)
                         .setDataCollo(null)
                         .setRiga(null)
-                        .setCausale(MtbColr.CausaleRiga.VERSAMENTO)
+                        .setCausale(MtbColr.Causale.VERSAMENTO)
                         .setUtente(requestDataDTO.getUsername());
 
                 mtbColrDestObservableField.add(cloneMtbColr);
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
index b4f8619a01..bb73b213e3 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
@@ -283,7 +283,7 @@ public class WMSLavorazioneService {
         }
 
         final MtbColr targetMtbColr = new MtbColr()
-                .setCausale(MtbColr.CausaleRiga.DEFAULT)
+                .setCausale(MtbColr.Causale.DEFAULT)
                 .setCodMart(mtbAart.getCodMart())
                 .setPartitaMag(insertUDSRowRequestDTO.getPartitaMag())
                 .setDataScadPartita(insertUDSRowRequestDTO.getDataScad())
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
index 58ebe01574..6c7f1072f7 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
@@ -294,7 +294,7 @@ public class WMSSpedizioneService {
 
 
         final MtbColr targetMtbColr = new MtbColr()
-                .setCausale(MtbColr.CausaleRiga.DEFAULT)
+                .setCausale(MtbColr.Causale.DEFAULT)
                 .setCodMart(mtbAart.getCodMart())
                 .setPartitaMag(insertUDSRowRequestDTO.getPartitaMag())
                 .setDataScadPartita(insertUDSRowRequestDTO.getDataScad())