diff --git a/include/Dialog_Partition_Label.h b/include/Dialog_FileSystem_Label.h
similarity index 78%
rename from include/Dialog_Partition_Label.h
rename to include/Dialog_FileSystem_Label.h
index 8779ebb7..67e5c030 100644
--- a/include/Dialog_Partition_Label.h
+++ b/include/Dialog_FileSystem_Label.h
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GPARTED_DIALOG_PARTITION_LABEL_H
-#define GPARTED_DIALOG_PARTITION_LABEL_H
+#ifndef GPARTED_DIALOG_FILESYSTEM_LABEL_H
+#define GPARTED_DIALOG_FILESYSTEM_LABEL_H
 
 #include "../include/Partition.h"
 #include "../include/i18n.h"
@@ -27,15 +27,15 @@
 #include <gtkmm/entry.h>
 
 #define BORDER 8
- 
-namespace GParted
-{ 
 
-class Dialog_Partition_Label : public Gtk::Dialog
+namespace GParted
+{
+
+class Dialog_FileSystem_Label : public Gtk::Dialog
 {
 public:
-	Dialog_Partition_Label( const Partition & partition );
-	~Dialog_Partition_Label();
+	Dialog_FileSystem_Label( const Partition & partition );
+	~Dialog_FileSystem_Label();
 	Glib::ustring get_new_label();
 
 private:
@@ -44,4 +44,4 @@ private:
 
 } //GParted
 
-#endif /* GPARTED_DIALOG_PARTITION_LABEL_H */
+#endif /* GPARTED_DIALOG_FILESYSTEM_LABEL_H */
diff --git a/include/Makefile.am b/include/Makefile.am
index 869e94ea..6ecd0542 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,9 +8,9 @@ EXTRA_DIST = \
 	DialogManageFlags.h		\
 	Dialog_Base_Partition.h		\
 	Dialog_Disklabel.h		\
+	Dialog_FileSystem_Label.h	\
 	Dialog_Partition_Copy.h		\
 	Dialog_Partition_Info.h		\
-	Dialog_Partition_Label.h	\
 	Dialog_Partition_New.h		\
 	Dialog_Partition_Resize_Move.h	\
 	Dialog_Progress.h		\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86d7f881..cf5ca7f5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,9 +6,9 @@ include/Utils.h
 src/Copy_Blocks.cc
 src/Dialog_Base_Partition.cc
 src/Dialog_Disklabel.cc
+src/Dialog_FileSystem_Label.cc
 src/Dialog_Partition_Copy.cc
 src/Dialog_Partition_Info.cc
-src/Dialog_Partition_Label.cc
 src/Dialog_Partition_New.cc
 src/Dialog_Partition_Resize_Move.cc
 src/Dialog_Progress.cc
diff --git a/src/Dialog_Partition_Label.cc b/src/Dialog_FileSystem_Label.cc
similarity index 89%
rename from src/Dialog_Partition_Label.cc
rename to src/Dialog_FileSystem_Label.cc
index d5b97f45..600fdd7f 100644
--- a/src/Dialog_Partition_Label.cc
+++ b/src/Dialog_FileSystem_Label.cc
@@ -13,18 +13,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Partition_Label.h"
+
+#include "../include/Dialog_FileSystem_Label.h"
 
 namespace GParted
 {
 
-Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition )
+Dialog_FileSystem_Label::Dialog_FileSystem_Label( const Partition & partition )
 {
 	this ->set_resizable( false ) ;
 	this ->set_has_separator( false ) ;
 	this ->set_size_request( 300, 80 ) ;
-	
+
 	/* TO TRANSLATORS: dialog title, looks like   Set file system label on /dev/hda3 */
 	this->set_title( String::ucompose( _("Set file system label on %1"), partition.get_path() ) );
 
@@ -61,11 +61,11 @@ Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition )
 	this ->show_all_children() ;
 }
 
-Dialog_Partition_Label::~Dialog_Partition_Label()
+Dialog_FileSystem_Label::~Dialog_FileSystem_Label()
 {
 }
 
-Glib::ustring Dialog_Partition_Label::get_new_label()
+Glib::ustring Dialog_FileSystem_Label::get_new_label()
 {
 	return Utils::trim( Glib::ustring( entry ->get_text() ) );
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 027c5bbf..b1f07640 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,9 +19,9 @@ gpartedbin_SOURCES = \
 	DialogManageFlags.cc		\
 	Dialog_Base_Partition.cc	\
 	Dialog_Disklabel.cc		\
+	Dialog_FileSystem_Label.cc	\
 	Dialog_Partition_Copy.cc	\
 	Dialog_Partition_Info.cc	\
-	Dialog_Partition_Label.cc	\
 	Dialog_Partition_New.cc		\
 	Dialog_Partition_Resize_Move.cc	\
 	Dialog_Progress.cc		\
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 912b2c3c..9c4a6ba1 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -24,7 +24,7 @@
 #include "../include/Dialog_Partition_Copy.h"
 #include "../include/Dialog_Partition_New.h"
 #include "../include/Dialog_Partition_Info.h"
-#include "../include/Dialog_Partition_Label.h"
+#include "../include/Dialog_FileSystem_Label.h"
 #include "../include/DialogManageFlags.h"
 #include "../include/OperationCopy.h"
 #include "../include/OperationCheck.h"
@@ -2473,7 +2473,7 @@ void Win_GParted::activate_check()
 
 void Win_GParted::activate_label_filesystem()
 {
-	Dialog_Partition_Label dialog( selected_partition );
+	Dialog_FileSystem_Label dialog( selected_partition );
 	dialog .set_transient_for( *this );
 
 	if (	( dialog .run() == Gtk::RESPONSE_OK )