diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri
index e110dcc4c..81d208244 100644
--- a/src/app/puzzle/puzzle.pri
+++ b/src/app/puzzle/puzzle.pri
@@ -8,8 +8,8 @@ SOURCES += \
     $$PWD/vpcarrousel.cpp \
     $$PWD/vpcarrouselpiece.cpp \
     $$PWD/vpcarrouselpiecelist.cpp \
+    $$PWD/vpcarrouselpiecepreview.cpp \
     $$PWD/vpcommands.cpp \
-    $$PWD/vpiececarrouselpiecepreview.cpp \
     $$PWD/vpmainwindow.cpp \
     $$PWD/vpuzzlecommandline.cpp \
     $$PWD/vpuzzlegraphicslayout.cpp \
@@ -32,8 +32,8 @@ HEADERS += \
     $$PWD/vpcarrousel.h \
     $$PWD/vpcarrouselpiece.h \
     $$PWD/vpcarrouselpiecelist.h \
+    $$PWD/vpcarrouselpiecepreview.h \
     $$PWD/vpcommands.h \
-    $$PWD/vpiececarrouselpiecepreview.h \
     $$PWD/vpmainwindow.h \
     $$PWD/vpstable.h \
     $$PWD/vpuzzlecommandline.h \
diff --git a/src/app/puzzle/vpcarrouselpiece.cpp b/src/app/puzzle/vpcarrouselpiece.cpp
index 8d4754c07..7cc6c7173 100644
--- a/src/app/puzzle/vpcarrouselpiece.cpp
+++ b/src/app/puzzle/vpcarrouselpiece.cpp
@@ -49,7 +49,7 @@ Q_LOGGING_CATEGORY(pCarrouselPiece, "p.carrouselPiece")
 //---------------------------------------------------------------------------------------------------------------------
 VPCarrouselPiece::VPCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer) :
     m_piece(piece),
-    m_carrouselLayer(carrouselLayer),
+    m_carrouselPieceList(carrouselLayer),
     m_dragStart(QPoint())
 {
     Init();
@@ -75,7 +75,7 @@ void VPCarrouselPiece::Init()
     setStyleSheet("background-color:white; border: 2px solid transparent;");
 
     // define the preview of the piece
-    m_piecePreview = new VPieceCarrouselPiecePreview(this);
+    m_piecePreview = new VPCarrouselPiecePreview(this);
 
     // m_graphicsView = new VMainGraphicsView(this);
     // --> undefined reference to 'VMainGraphicsView::VMainGraphicView(QWidget*)'
@@ -175,7 +175,7 @@ void VPCarrouselPiece::mousePressEvent(QMouseEvent *event)
     {
         if(!(event->modifiers() & Qt::ControlModifier))
         {
-            m_carrouselLayer->GetCarrousel()->ClearSelection();
+            m_carrouselPieceList->GetCarrousel()->ClearSelection();
             m_piece->SetIsSelected(true);
         }
         else
@@ -207,7 +207,7 @@ void VPCarrouselPiece::mouseMoveEvent(QMouseEvent *event)
     }
 
     // make sure the multiple selection is removed
-    m_carrouselLayer->GetCarrousel()->ClearSelection();
+    m_carrouselPieceList->GetCarrousel()->ClearSelection();
     m_piece->SetIsSelected(true);
 
     // starts the dragging
diff --git a/src/app/puzzle/vpcarrouselpiece.h b/src/app/puzzle/vpcarrouselpiece.h
index 452a25774..403df3aab 100644
--- a/src/app/puzzle/vpcarrouselpiece.h
+++ b/src/app/puzzle/vpcarrouselpiece.h
@@ -34,7 +34,7 @@
 #include <QMouseEvent>
 
 #include "vpuzzlepiece.h"
-#include "vpiececarrouselpiecepreview.h"
+#include "vpcarrouselpiecepreview.h"
 
 
 class VPCarrouselPieceList;
@@ -82,10 +82,10 @@ private:
 
     VPuzzlePiece *m_piece;
 
-    VPCarrouselPieceList *m_carrouselLayer;
+    VPCarrouselPieceList *m_carrouselPieceList;
 
     QLabel *m_label{nullptr};
-    VPieceCarrouselPiecePreview *m_piecePreview{nullptr};
+    VPCarrouselPiecePreview *m_piecePreview{nullptr};
 
     QPoint m_dragStart;
 
diff --git a/src/app/puzzle/vpiececarrouselpiecepreview.cpp b/src/app/puzzle/vpcarrouselpiecepreview.cpp
similarity index 82%
rename from src/app/puzzle/vpiececarrouselpiecepreview.cpp
rename to src/app/puzzle/vpcarrouselpiecepreview.cpp
index f68af933f..5c7182b43 100644
--- a/src/app/puzzle/vpiececarrouselpiecepreview.cpp
+++ b/src/app/puzzle/vpcarrouselpiecepreview.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
  **
- **  @file   vpiececarrouselpiecepreview.cpp
+ **  @file   vpcarrouselpiecepreview.cpp
  **  @author Ronan Le Tiec
  **  @date   3 5, 2020
  **
@@ -26,29 +26,29 @@
  **
  *************************************************************************/
 
-#include "vpiececarrouselpiecepreview.h"
+#include "vpcarrouselpiecepreview.h"
 
 #include <QMouseEvent>
 
 //---------------------------------------------------------------------------------------------------------------------
-VPieceCarrouselPiecePreview::VPieceCarrouselPiecePreview(QWidget *parent):
+VPCarrouselPiecePreview::VPCarrouselPiecePreview(QWidget *parent):
     QGraphicsView(parent)
 {
 
 }
 //---------------------------------------------------------------------------------------------------------------------
-VPieceCarrouselPiecePreview::~VPieceCarrouselPiecePreview()
+VPCarrouselPiecePreview::~VPCarrouselPiecePreview()
 {
 
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselPiecePreview::mousePressEvent(QMouseEvent *event)
+void VPCarrouselPiecePreview::mousePressEvent(QMouseEvent *event)
 {
     event->ignore();
 }
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselPiecePreview::mouseMoveEvent(QMouseEvent *event)
+void VPCarrouselPiecePreview::mouseMoveEvent(QMouseEvent *event)
 {
     event->ignore();
 }
diff --git a/src/app/puzzle/vpiececarrouselpiecepreview.h b/src/app/puzzle/vpcarrouselpiecepreview.h
similarity index 80%
rename from src/app/puzzle/vpiececarrouselpiecepreview.h
rename to src/app/puzzle/vpcarrouselpiecepreview.h
index 9e3049de1..4e31c80f3 100644
--- a/src/app/puzzle/vpiececarrouselpiecepreview.h
+++ b/src/app/puzzle/vpcarrouselpiecepreview.h
@@ -1,6 +1,6 @@
 /************************************************************************
  **
- **  @file   vpiececarrouselpiecepreview.h
+ **  @file   vpcarrouselpiecepreview.h
  **  @author Ronan Le Tiec
  **  @date   3 5, 2020
  **
@@ -26,20 +26,20 @@
  **
  *************************************************************************/
 
-#ifndef VPUZZLEPIECECARROUSELPIECEPREVIEW_H
-#define VPUZZLEPIECECARROUSELPIECEPREVIEW_H
+#ifndef VPCARROUSELPIECEPREVIEW_H
+#define VPCARROUSELPIECEPREVIEW_H
 
 #include <QGraphicsView>
 
-class VPieceCarrouselPiecePreview: public QGraphicsView
+class VPCarrouselPiecePreview: public QGraphicsView
 {
 public:
-    VPieceCarrouselPiecePreview(QWidget *parent = nullptr);
-    ~VPieceCarrouselPiecePreview();
+    VPCarrouselPiecePreview(QWidget *parent = nullptr);
+    ~VPCarrouselPiecePreview();
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
 };
 
-#endif // VPUZZLEPIECECARROUSELPIECEPREVIEW_H
+#endif // VPCARROUSELPIECEPREVIEW_H