diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp
index 91685dcf0..b0917ace6 100644
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@@ -24,7 +24,7 @@
 #include "gui/jbox.h"
 #include "gui/button.h"
 #include "gui/jhook.h"
-#include "gui/jlabel.h"
+#include "gui/label.h"
 #include "gui/jlist.h"
 #include "gui/jlistbox.h"
 #include "gui/jslider.h"
diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp
index 14f57f229..64ed76ff9 100644
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@@ -22,7 +22,7 @@
 #include "gui/jbox.h"
 #include "gui/button.h"
 #include "gui/jhook.h"
-#include "gui/jlabel.h"
+#include "gui/label.h"
 #include "gui/jslider.h"
 #include "gui/jwidget.h"
 #include "gui/frame.h"
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 13b23a77f..44e84d9c4 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -22,7 +22,7 @@
 #include "gui/jbox.h"
 #include "gui/button.h"
 #include "gui/jhook.h"
-#include "gui/jlabel.h"
+#include "gui/label.h"
 #include "gui/jslider.h"
 #include "gui/jwidget.h"
 #include "gui/frame.h"
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2339da160..c8585fb28 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -21,7 +21,6 @@ add_library(gui-lib
   jimage.cpp
   jinete.cpp
   jintern.cpp
-  jlabel.cpp
   jlink_label.cpp
   jlist.cpp
   jlistbox.cpp
@@ -44,6 +43,7 @@ add_library(gui-lib
   jtooltips.cpp
   jview.cpp
   jwidget.cpp
+  label.cpp
   preferred_size_event.cpp
   property.cpp
   themes/jstandard_theme.cpp)
diff --git a/src/gui/jcustom_label.h b/src/gui/jcustom_label.h
index 07870673c..28bc8442e 100644
--- a/src/gui/jcustom_label.h
+++ b/src/gui/jcustom_label.h
@@ -7,7 +7,7 @@
 #ifndef GUI_JCUSTOM_LABEL_H_INCLUDED
 #define GUI_JCUSTOM_LABEL_H_INCLUDED
 
-#include "gui/jlabel.h"
+#include "gui/label.h"
 
 class CustomLabel : public Label
 {
diff --git a/src/gui/jinete.h b/src/gui/jinete.h
index 8235bb8ec..b1f03e68e 100644
--- a/src/gui/jinete.h
+++ b/src/gui/jinete.h
@@ -21,7 +21,7 @@
 #include "gui/jgrid.h"
 #include "gui/jhook.h"
 #include "gui/jimage.h"
-#include "gui/jlabel.h"
+#include "gui/label.h"
 #include "gui/jlink_label.h"
 #include "gui/jlist.h"
 #include "gui/jlistbox.h"
diff --git a/src/gui/jlabel.cpp b/src/gui/label.cpp
similarity index 97%
rename from src/gui/jlabel.cpp
rename to src/gui/label.cpp
index 8d8ee0a2e..934fd3d05 100644
--- a/src/gui/jlabel.cpp
+++ b/src/gui/label.cpp
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#include "gui/jlabel.h"
+#include "gui/label.h"
 #include "gui/jmessage.h"
 #include "gui/jtheme.h"
 
diff --git a/src/gui/jlabel.h b/src/gui/label.h
similarity index 84%
rename from src/gui/jlabel.h
rename to src/gui/label.h
index 7322ca2ea..e3c86e2d3 100644
--- a/src/gui/jlabel.h
+++ b/src/gui/label.h
@@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_JLABEL_H_INCLUDED
-#define GUI_JLABEL_H_INCLUDED
+#ifndef GUI_LABEL_H_INCLUDED
+#define GUI_LABEL_H_INCLUDED
 
 #include "gui/jwidget.h"