diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index 2dfa665e..dfb37ed1 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -109,8 +109,8 @@ private:
 
 	bool remove_filesystem( const Partition & partition, OperationDetail & operationdetail ) ;
 
-	bool label_partition( const Partition & partition, OperationDetail & operation_detail ) ;
-	
+	bool label_filesystem( const Partition & partition, OperationDetail & operationdetail );
+
 	bool change_uuid( const Partition & partition, OperationDetail & operation_detail ) ;
 
 	bool resize_move( const Device & device,
diff --git a/include/Win_GParted.h b/include/Win_GParted.h
index 3a554f4c..0c3275d4 100644
--- a/include/Win_GParted.h
+++ b/include/Win_GParted.h
@@ -103,7 +103,7 @@ private:
 	void allow_check( bool state ) {
 		toggle_item( state, MENU_CHECK ) ; } 
 	
-	void allow_label_partition( bool state )	{
+	void allow_label_filesystem( bool state ) {
 		toggle_item( state, MENU_LABEL_PARTITION ) ; } 
 
 	void allow_change_uuid( bool state )	{
@@ -168,8 +168,8 @@ private:
 	void activate_manage_flags() ;
 	void activate_check() ;
 	void activate_change_uuid() ;
-	void activate_label_partition() ;
-	
+	void activate_label_filesystem();
+
 	void activate_undo();
 	void remove_operation( int index = -1, bool remove_all = false ) ;
 	int  partition_in_operation_queue_count( const Partition & partition ) ;
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 0e5592f9..440c7f12 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -728,7 +728,7 @@ bool GParted_Core::apply_operation_to_disk( Operation * operation )
 					       operation ->operation_detail ) ;
 				break ;
 			case OPERATION_LABEL_FILESYSTEM:
-				succes = label_partition( operation ->partition_new, operation ->operation_detail ) ;
+				succes = label_filesystem( operation->partition_new, operation->operation_detail );
 				break ;
 			case OPERATION_CHANGE_UUID:
 				succes = change_uuid( operation ->partition_new, operation ->operation_detail ) ;
@@ -2069,7 +2069,7 @@ bool GParted_Core::remove_filesystem( const Partition & partition, OperationDeta
 	return success ;
 }
 
-bool GParted_Core::label_partition( const Partition & partition, OperationDetail & operationdetail )	
+bool GParted_Core::label_filesystem( const Partition & partition, OperationDetail & operationdetail )
 {
 	if( partition.get_filesystem_label().empty() ) {
 		operationdetail.add_child( OperationDetail(
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index b03e92e5..95029515 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -389,7 +389,7 @@ void Win_GParted::init_partition_menu()
 
 	menu_partition .items() .push_back(
 			Gtk::Menu_Helpers::MenuElem( _("_Label File System"),
-						     sigc::mem_fun( *this, &Win_GParted::activate_label_partition ) ) );
+			                             sigc::mem_fun( *this, &Win_GParted::activate_label_filesystem ) ) );
 	MENU_LABEL_PARTITION = index++ ;
 
 	menu_partition .items() .push_back(
@@ -935,7 +935,7 @@ void Win_GParted::set_valid_operations()
 {
 	allow_new( false ); allow_delete( false ); allow_resize( false ); allow_copy( false );
 	allow_paste( false ); allow_format( false ); allow_toggle_busy_state( false ) ;
-	allow_manage_flags( false ) ; allow_check( false ) ; allow_label_partition( false ) ;
+	allow_manage_flags( false ) ; allow_check( false ) ; allow_label_filesystem( false );
 	allow_change_uuid( false ); allow_info( false ) ;
 
 	dynamic_cast<Gtk::Label*>( menu_partition .items()[ MENU_TOGGLE_BUSY ] .get_child() )
@@ -1102,7 +1102,7 @@ void Win_GParted::set_valid_operations()
 		
 		//only allow labelling of real partitions that support labelling
 		if ( selected_partition .status == GParted::STAT_REAL && fs .write_label )
-			allow_label_partition( true ) ;
+			allow_label_filesystem( true );
 
 		//only allow changing UUID of real partitions that support it
 		if ( selected_partition .status == GParted::STAT_REAL && fs .write_uuid )
@@ -2471,7 +2471,7 @@ void Win_GParted::activate_check()
 	show_operationslist() ;
 }
 
-void Win_GParted::activate_label_partition() 
+void Win_GParted::activate_label_filesystem()
 {
 	Dialog_Partition_Label dialog( selected_partition );
 	dialog .set_transient_for( *this );