diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri
index cbb2dc364..222583850 100644
--- a/src/app/puzzle/puzzle.pri
+++ b/src/app/puzzle/puzzle.pri
@@ -6,6 +6,7 @@ SOURCES += \
     $$PWD/main.cpp \
     $$PWD/vpapplication.cpp \
     $$PWD/vpcarrousel.cpp \
+    $$PWD/vpcarrouselpiecelist.cpp \
     $$PWD/vpcommands.cpp \
     $$PWD/vpiececarrouselpiecepreview.cpp \
     $$PWD/vpmainwindow.cpp \
@@ -21,7 +22,6 @@ SOURCES += \
     $$PWD/xml/vplayoutfilereader.cpp \
     $$PWD/xml/vplayoutfilewriter.cpp \
     $$PWD/xml/vplayoutliterals.cpp \
-    $$PWD/vpiececarrousellayer.cpp \
     $$PWD/vpiececarrouselpiece.cpp
 
 *msvc*:SOURCES +=
@@ -30,6 +30,7 @@ HEADERS += \
     $$PWD/dialogs/vpdialogabout.h \
     $$PWD/vpapplication.h \
     $$PWD/vpcarrousel.h \
+    $$PWD/vpcarrouselpiecelist.h \
     $$PWD/vpcommands.h \
     $$PWD/vpiececarrouselpiecepreview.h \
     $$PWD/vpmainwindow.h \
@@ -46,7 +47,6 @@ HEADERS += \
     $$PWD/xml/vplayoutfilereader.h \
     $$PWD/xml/vplayoutfilewriter.h \
     $$PWD/xml/vplayoutliterals.h \
-    $$PWD/vpiececarrousellayer.h \
     $$PWD/vpiececarrouselpiece.h
 
 FORMS += \
diff --git a/src/app/puzzle/vpiececarrousellayer.cpp b/src/app/puzzle/vpcarrouselpiecelist.cpp
similarity index 85%
rename from src/app/puzzle/vpiececarrousellayer.cpp
rename to src/app/puzzle/vpcarrouselpiecelist.cpp
index d7b432bb0..d461dd648 100644
--- a/src/app/puzzle/vpiececarrousellayer.cpp
+++ b/src/app/puzzle/vpcarrouselpiecelist.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
  **
- **  @file   vpiececarrousellayer.cpp
+ **  @file   vpcarrouselpiecelist.cpp
  **  @author Ronan Le Tiec
  **  @date   25 4, 2020
  **
@@ -26,7 +26,7 @@
  **
  *************************************************************************/
 
-#include "vpiececarrousellayer.h"
+#include "vpcarrouselpiecelist.h"
 #include "vpcarrousel.h"
 #include "../vmisc/backport/qoverload.h"
 
@@ -37,7 +37,7 @@
 Q_LOGGING_CATEGORY(pCarrouselLayer, "p.carrouselLayer")
 
 //---------------------------------------------------------------------------------------------------------------------
-VPieceCarrouselLayer::VPieceCarrouselLayer(VPuzzleLayer *layer, VPCarrousel *carrousel) :
+VPCarrouselPieceList::VPCarrouselPieceList(VPuzzleLayer *layer, VPCarrousel *carrousel) :
     m_layer(layer),
     m_carrousel(carrousel),
     m_carrouselPieces(QList<VPieceCarrouselPiece*>())
@@ -46,13 +46,13 @@ VPieceCarrouselLayer::VPieceCarrouselLayer(VPuzzleLayer *layer, VPCarrousel *car
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VPieceCarrouselLayer::~VPieceCarrouselLayer()
+VPCarrouselPieceList::~VPCarrouselPieceList()
 {
     Clear();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselLayer::Init()
+void VPCarrouselPieceList::Init()
 {
     // initiales the structure
     QVBoxLayout *layoutPiecesLayout = new QVBoxLayout();
@@ -63,12 +63,12 @@ void VPieceCarrouselLayer::Init()
     Refresh();
 
     // add the connections
-    connect(m_layer, &VPuzzleLayer::PieceAdded, this, &VPieceCarrouselLayer::on_PieceAdded);
-    connect(m_layer, &VPuzzleLayer::PieceRemoved, this, &VPieceCarrouselLayer::on_PieceRemoved);
+    connect(m_layer, &VPuzzleLayer::PieceAdded, this, &VPCarrouselPieceList::on_PieceAdded);
+    connect(m_layer, &VPuzzleLayer::PieceRemoved, this, &VPCarrouselPieceList::on_PieceRemoved);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselLayer::Refresh()
+void VPCarrouselPieceList::Refresh()
 {
     Clear();
 
@@ -94,7 +94,7 @@ void VPieceCarrouselLayer::Refresh()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselLayer::Clear()
+void VPCarrouselPieceList::Clear()
 {
     // Removes and deletes the carrousel pieces from the layer
     while (!m_carrouselPieces.isEmpty())
@@ -111,25 +111,25 @@ void VPieceCarrouselLayer::Clear()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QList<VPieceCarrouselPiece*> VPieceCarrouselLayer::GetCarrouselPieces()
+QList<VPieceCarrouselPiece*> VPCarrouselPieceList::GetCarrouselPieces()
 {
     return m_carrouselPieces;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VPCarrousel* VPieceCarrouselLayer::GetCarrousel()
+VPCarrousel* VPCarrouselPieceList::GetCarrousel()
 {
     return m_carrousel;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VPuzzleLayer* VPieceCarrouselLayer::GetLayer()
+VPuzzleLayer* VPCarrouselPieceList::GetLayer()
 {
     return m_layer;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselLayer::on_PieceAdded(VPuzzlePiece* piece)
+void VPCarrouselPieceList::on_PieceAdded(VPuzzlePiece* piece)
 {
     Q_UNUSED(piece)
 
@@ -139,7 +139,7 @@ void VPieceCarrouselLayer::on_PieceAdded(VPuzzlePiece* piece)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VPieceCarrouselLayer::on_PieceRemoved(VPuzzlePiece* piece)
+void VPCarrouselPieceList::on_PieceRemoved(VPuzzlePiece* piece)
 {
     for (auto carrouselPiece : m_carrouselPieces)
     {
diff --git a/src/app/puzzle/vpiececarrousellayer.h b/src/app/puzzle/vpcarrouselpiecelist.h
similarity index 87%
rename from src/app/puzzle/vpiececarrousellayer.h
rename to src/app/puzzle/vpcarrouselpiecelist.h
index b2122d0d4..0e51aa756 100644
--- a/src/app/puzzle/vpiececarrousellayer.h
+++ b/src/app/puzzle/vpcarrouselpiecelist.h
@@ -1,6 +1,6 @@
 /************************************************************************
  **
- **  @file   vpiececarrousellayer.h
+ **  @file   vpcarrouselpiecelist.h
  **  @author Ronan Le Tiec
  **  @date   25 4, 2020
  **
@@ -26,8 +26,8 @@
  **
  *************************************************************************/
 
-#ifndef VPIECECARROUSELLAYER_H
-#define VPIECECARROUSELLAYER_H
+#ifndef VPCARROUSELPIECELIST_H
+#define VPCARROUSELPIECELIST_H
 
 #include <QWidget>
 #include "vpuzzlelayer.h"
@@ -35,12 +35,12 @@
 
 class VPCarrousel;
 
-class VPieceCarrouselLayer : public QWidget
+class VPCarrouselPieceList : public QWidget
 {
     Q_OBJECT
 public:
-    VPieceCarrouselLayer(VPuzzleLayer *layer, VPCarrousel *carrousel);
-    ~VPieceCarrouselLayer();
+    VPCarrouselPieceList(VPuzzleLayer *layer, VPCarrousel *carrousel);
+    ~VPCarrouselPieceList();
 
     void Init();
     void Refresh();
@@ -61,7 +61,7 @@ public:
     VPuzzleLayer* GetLayer();
 
 private:
-    Q_DISABLE_COPY(VPieceCarrouselLayer)
+    Q_DISABLE_COPY(VPCarrouselPieceList)
 
     VPuzzleLayer *m_layer;
     VPCarrousel *m_carrousel;
@@ -81,4 +81,4 @@ private slots:
 
 };
 
-#endif // VPIECECARROUSELLAYER_H
+#endif // VPCARROUSELPIECELIST_H
diff --git a/src/app/puzzle/vpiececarrouselpiece.cpp b/src/app/puzzle/vpiececarrouselpiece.cpp
index 8f4e76e96..78a8b1999 100644
--- a/src/app/puzzle/vpiececarrouselpiece.cpp
+++ b/src/app/puzzle/vpiececarrouselpiece.cpp
@@ -38,7 +38,7 @@
 #include <QMenu>
 
 #include "vpuzzlemimedatapiece.h"
-#include "vpiececarrousellayer.h"
+#include "vpcarrouselpiecelist.h"
 #include "vpcarrousel.h"
 
 #include <QLoggingCategory>
@@ -47,7 +47,7 @@ Q_LOGGING_CATEGORY(pCarrouselPiece, "p.carrouselPiece")
 
 
 //---------------------------------------------------------------------------------------------------------------------
-VPieceCarrouselPiece::VPieceCarrouselPiece(VPuzzlePiece *piece, VPieceCarrouselLayer *carrouselLayer) :
+VPieceCarrouselPiece::VPieceCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer) :
     m_piece(piece),
     m_carrouselLayer(carrouselLayer),
     m_dragStart(QPoint())
diff --git a/src/app/puzzle/vpiececarrouselpiece.h b/src/app/puzzle/vpiececarrouselpiece.h
index 96264e0d0..4f2ad2a8b 100644
--- a/src/app/puzzle/vpiececarrouselpiece.h
+++ b/src/app/puzzle/vpiececarrouselpiece.h
@@ -37,13 +37,13 @@
 #include "vpiececarrouselpiecepreview.h"
 
 
-class VPieceCarrouselLayer;
+class VPCarrouselPieceList;
 
 class VPieceCarrouselPiece : public QFrame
 {
     Q_OBJECT
 public:
-    explicit VPieceCarrouselPiece(VPuzzlePiece *piece, VPieceCarrouselLayer *carrouselLayer);
+    explicit VPieceCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer);
     ~VPieceCarrouselPiece();
 
     void Init();
@@ -82,7 +82,7 @@ private:
 
     VPuzzlePiece *m_piece;
 
-    VPieceCarrouselLayer *m_carrouselLayer;
+    VPCarrouselPieceList *m_carrouselLayer;
 
     QLabel *m_label{nullptr};
     VPieceCarrouselPiecePreview *m_piecePreview{nullptr};