diff --git a/src/puntocassa/FrmMeteoNew.form b/src/puntocassa/FrmMeteo.form
similarity index 100%
rename from src/puntocassa/FrmMeteoNew.form
rename to src/puntocassa/FrmMeteo.form
diff --git a/src/puntocassa/FrmMeteoNew.java b/src/puntocassa/FrmMeteo.java
similarity index 95%
rename from src/puntocassa/FrmMeteoNew.java
rename to src/puntocassa/FrmMeteo.java
index c7a0543..e95b005 100644
--- a/src/puntocassa/FrmMeteoNew.java
+++ b/src/puntocassa/FrmMeteo.java
@@ -29,7 +29,7 @@ import puntocassa.utils.Utils;
  *
  * @author Marco
  */
-public class FrmMeteoNew extends javax.swing.JFrame {
+public class FrmMeteo extends javax.swing.JFrame {
 
    private PuntoCassa frmPuntoCassa;
    private Long idPuntoCassa=0L;
@@ -42,7 +42,7 @@ public class FrmMeteoNew extends javax.swing.JFrame {
     /**
      * Creates new form frm
      */
-    public FrmMeteoNew(PuntoCassa frm, Long id_Punto_Cassa,Boolean Nuovo) {
+    public FrmMeteo(PuntoCassa frm, Long id_Punto_Cassa,Boolean Nuovo) {
 
         frmPuntoCassa=frm;
         frmPuntoCassa.setEnabled(false);
@@ -352,23 +352,27 @@ public class FrmMeteoNew extends javax.swing.JFrame {
                 }
             }
         } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         }
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
 
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
-                new FrmMeteoNew(null,0L,true).setVisible(true);
+                new FrmMeteo(null,0L,true).setVisible(true);
             }
         });
     }
diff --git a/src/puntocassa/FrmMovimentiNew.form b/src/puntocassa/FrmMovimenti.form
similarity index 100%
rename from src/puntocassa/FrmMovimentiNew.form
rename to src/puntocassa/FrmMovimenti.form
diff --git a/src/puntocassa/FrmMovimentiNew.java b/src/puntocassa/FrmMovimenti.java
similarity index 95%
rename from src/puntocassa/FrmMovimentiNew.java
rename to src/puntocassa/FrmMovimenti.java
index e0f3dcb..4d0af26 100644
--- a/src/puntocassa/FrmMovimentiNew.java
+++ b/src/puntocassa/FrmMovimenti.java
@@ -27,7 +27,7 @@ import puntocassa.utils.Utils;
  *
  * @author Marco
  */
-public class FrmMovimentiNew extends javax.swing.JFrame {
+public class FrmMovimenti extends javax.swing.JFrame {
 
     private PuntoCassa frmPuntoCassa;
     private Long idTessera=0L,idPuntoCassa=0L;
@@ -40,7 +40,7 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
     /**
      * Creates new form frm
      */
-    public FrmMovimentiNew(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath) {
+    public FrmMovimenti(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath) {
 
         frmPuntoCassa=frm;
         frmPuntoCassa.setEnabled(false);
@@ -483,13 +483,13 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
                 }
             }
         } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         }
         //</editor-fold>
         //</editor-fold>
@@ -499,11 +499,19 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
 
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
-                new FrmMovimentiNew(null,0L,0L,null).setVisible(true);
+                new FrmMovimenti(null,0L,0L,null).setVisible(true);
             }
         });
     }
diff --git a/src/puntocassa/FrmProdottiNew.form b/src/puntocassa/FrmProdotti.form
similarity index 100%
rename from src/puntocassa/FrmProdottiNew.form
rename to src/puntocassa/FrmProdotti.form
diff --git a/src/puntocassa/FrmProdottiNew.java b/src/puntocassa/FrmProdotti.java
similarity index 97%
rename from src/puntocassa/FrmProdottiNew.java
rename to src/puntocassa/FrmProdotti.java
index ba428fa..e0c82db 100644
--- a/src/puntocassa/FrmProdottiNew.java
+++ b/src/puntocassa/FrmProdotti.java
@@ -30,7 +30,7 @@ import puntocassa.utils.Utils;
  *
  * @author Marco
  */
-public class FrmProdottiNew extends javax.swing.JFrame {
+public class FrmProdotti extends javax.swing.JFrame {
 
 private PuntoCassa frmPuntoCassa;
 
@@ -43,7 +43,7 @@ private PuntoCassa frmPuntoCassa;
     /**
      * Creates new form frm
      */
-    public FrmProdottiNew(PuntoCassa frm,String imgPath) {
+    public FrmProdotti(PuntoCassa frm,String imgPath) {
 
         frmPuntoCassa=frm;
         frmPuntoCassa.setEnabled(false);
@@ -678,23 +678,27 @@ private PuntoCassa frmPuntoCassa;
                 }
             }
         } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         }
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
 
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
-                new FrmProdottiNew(null,null).setVisible(true);
+                new FrmProdotti(null,null).setVisible(true);
             }
         });
     }
diff --git a/src/puntocassa/FrmProgressNew.form b/src/puntocassa/FrmProgress.form
similarity index 100%
rename from src/puntocassa/FrmProgressNew.form
rename to src/puntocassa/FrmProgress.form
diff --git a/src/puntocassa/FrmProgressNew.java b/src/puntocassa/FrmProgress.java
similarity index 87%
rename from src/puntocassa/FrmProgressNew.java
rename to src/puntocassa/FrmProgress.java
index d93a1e3..18c01d8 100644
--- a/src/puntocassa/FrmProgressNew.java
+++ b/src/puntocassa/FrmProgress.java
@@ -13,14 +13,14 @@ import javax.swing.ImageIcon;
  *
  * @author Marco
  */
-public class FrmProgressNew extends javax.swing.JFrame {
+public class FrmProgress extends javax.swing.JFrame {
 
    private PuntoCassa frmPuntoCassa;
   
     /**
      * Creates new form frm
      */
-    public FrmProgressNew(PuntoCassa frm) {
+    public FrmProgress(PuntoCassa frm) {
         frmPuntoCassa=frm;
         initComponents();
         String startDir = System.getProperty("user.dir");
@@ -117,23 +117,27 @@ public class FrmProgressNew extends javax.swing.JFrame {
                 }
             }
         } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         }
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
         //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
+        //</editor-fold>
 
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
-                new FrmProgressNew(null).setVisible(true);
+                new FrmProgress(null).setVisible(true);
             }
         });
     }
diff --git a/src/puntocassa/FrmStornoNew.form b/src/puntocassa/FrmStorno.form
similarity index 100%
rename from src/puntocassa/FrmStornoNew.form
rename to src/puntocassa/FrmStorno.form
diff --git a/src/puntocassa/FrmStornoNew.java b/src/puntocassa/FrmStorno.java
similarity index 97%
rename from src/puntocassa/FrmStornoNew.java
rename to src/puntocassa/FrmStorno.java
index f846ce8..382bee2 100644
--- a/src/puntocassa/FrmStornoNew.java
+++ b/src/puntocassa/FrmStorno.java
@@ -27,7 +27,7 @@ import puntocassa.utils.Utils;
  *
  * @author Marco
  */
-public class FrmStornoNew extends javax.swing.JFrame {
+public class FrmStorno extends javax.swing.JFrame {
 
     private PuntoCassa frmPuntoCassa;
     private Long idTessera=0L,idPuntoCassa=0L;
@@ -41,7 +41,7 @@ public class FrmStornoNew extends javax.swing.JFrame {
     /**
      * Creates new form frm
      */
-    public FrmStornoNew(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath,Boolean azzera) {
+    public FrmStorno(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath,Boolean azzera) {
 
         frmPuntoCassa=frm;
         frmPuntoCassa.setEnabled(false);
@@ -554,23 +554,27 @@ public class FrmStornoNew extends javax.swing.JFrame {
                 }
             }
         } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
         }
         //</editor-fold>
                //</editor-fold>
         //</editor-fold>
  //</editor-fold>
+        //</editor-fold>
+               //</editor-fold>
+        //</editor-fold>
+ //</editor-fold>
 
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
-                new FrmStornoNew(null,0L,0L,null,false).setVisible(true);
+                new FrmStorno(null,0L,0L,null,false).setVisible(true);
             }
         });
     }
diff --git a/src/puntocassa/PuntoCassa.java b/src/puntocassa/PuntoCassa.java
index 54ab818..e12fca7 100644
--- a/src/puntocassa/PuntoCassa.java
+++ b/src/puntocassa/PuntoCassa.java
@@ -123,8 +123,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
     public int hFont = 15;
     private int altControlli = 100;
     private int largControlli = 100;
-    public FrmProgressNew myProgressForm;
-    public FrmMeteoNew myMeteoForm;
+    public FrmProgress myProgressForm;
+    public FrmMeteo myMeteoForm;
     private int gratuitaResidue = 0;
     private int bonusResidui = 0;
     private StringBuilder modiPagamento = new StringBuilder("");
@@ -2694,7 +2694,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
                 this);
         if (Integer.parseInt(spia) == 1) {
             if (myMeteoForm == null) {
-                myMeteoForm = new FrmMeteoNew(this, idPuntoCassa, true);
+                myMeteoForm = new FrmMeteo(this, idPuntoCassa, true);
 
                 this.setEnabled(false);
                 Integer w = calcolaLarghezzaAltezza(300, largControlli);
@@ -2938,7 +2938,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
     }//GEN-LAST:event_jBtnStornoActionPerformed
 
     private void apriStorno(Boolean daPassaggi) {
-        FrmStornoNew jFrameStorno = new FrmStornoNew(this, idTessera, idPuntoCassa, imgPath, daPassaggi);
+        FrmStorno jFrameStorno = new FrmStorno(this, idTessera, idPuntoCassa, imgPath, daPassaggi);
         this.setEnabled(false);
         Integer w = calcolaLarghezzaAltezza(550, largControlli);
         Integer h = calcolaLarghezzaAltezza(250, altControlli);
@@ -2948,7 +2948,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
         jFrameStorno.setVisible(true);
     }
     private void jBtnprodottiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnprodottiActionPerformed
-        FrmProdottiNew jFrameProdotti = new FrmProdottiNew(this, imgPath);
+        FrmProdotti jFrameProdotti = new FrmProdotti(this, imgPath);
 
         this.setEnabled(false);
         Integer w = calcolaLarghezzaAltezza(550, largControlli);
@@ -3014,7 +3014,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
             }
             if (aggiorna) {
 
-                myProgressForm = new FrmProgressNew(this);
+                myProgressForm = new FrmProgress(this);
 
                 this.setEnabled(false);
                 Integer w = calcolaLarghezzaAltezza(300, largControlli);
@@ -3156,7 +3156,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
     }//GEN-LAST:event_txtTotalePuntiActionPerformed
 
     private void jBtnMovimentiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnMovimentiActionPerformed
-        FrmMovimentiNew jFrameMovimenti = new FrmMovimentiNew(this, idTessera, idPuntoCassa, imgPath);
+        FrmMovimenti jFrameMovimenti = new FrmMovimenti(this, idTessera, idPuntoCassa, imgPath);
 
         this.setEnabled(false);
         Integer w = calcolaLarghezzaAltezza(680, largControlli);