diff --git a/glabels/File.cpp b/glabels/File.cpp
index ad0710b..a4d7f17 100644
--- a/glabels/File.cpp
+++ b/glabels/File.cpp
@@ -80,6 +80,8 @@ namespace glabels
 			LabelModel *label = XmlLabelParser::readFile( fileName );
 			if ( label )
 			{
+				label->setFileName( fileName );
+				
 				if ( window->isEmpty() )
 				{
 					window->setModel( label );
@@ -108,7 +110,7 @@ namespace glabels
 	///
 	bool File::save( MainWindow *window )
 	{
-		if ( window->model()->filename().isEmpty() )
+		if ( window->model()->fileName().isEmpty() )
 		{
 			return saveAs( window );
 		}
@@ -118,7 +120,7 @@ namespace glabels
 			return true;
 		}
 
-		XmlLabelCreator::writeFile( window->model(), window->model()->filename() );
+		XmlLabelCreator::writeFile( window->model(), window->model()->fileName() );
 		return true;
 	}
 
@@ -128,7 +130,7 @@ namespace glabels
 	///
 	bool File::saveAs( MainWindow *window )
 	{
-		QString rawFilename =
+		QString rawFileName =
 			QFileDialog::getSaveFileName( window,
 						      tr("Save Label As"),
 						      ".",
@@ -136,17 +138,17 @@ namespace glabels
 						      0,
 						      QFileDialog::DontConfirmOverwrite
 				                    );
-		if ( !rawFilename.isEmpty() )
+		if ( !rawFileName.isEmpty() )
 		{
-			QString filename = FileUtil::addExtension( rawFilename, ".glabels" );
+			QString fileName = FileUtil::addExtension( rawFileName, ".glabels" );
 			
 			
-			if ( QFileInfo(filename).exists() )
+			if ( QFileInfo(fileName).exists() )
 			{
 				QMessageBox msgBox( window );
 				msgBox.setWindowTitle( tr("Save Label As") );
 				msgBox.setIcon( QMessageBox::Warning );
-				msgBox.setText( tr("%1 already exists.").arg(filename) );
+				msgBox.setText( tr("%1 already exists.").arg(fileName) );
 				msgBox.setInformativeText( tr("Do you want to replace it?") );
 				msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
 				msgBox.setDefaultButton( QMessageBox::No );
@@ -157,8 +159,8 @@ namespace glabels
 				}
 			}
 			
-			XmlLabelCreator::writeFile( window->model(), filename );
-			window->model()->setFilename( filename );
+			XmlLabelCreator::writeFile( window->model(), fileName );
+			window->model()->setFileName( fileName );
 			return true;
 		}
 
diff --git a/glabels/LabelModel.cpp b/glabels/LabelModel.cpp
index a6db1db..5b2c26f 100644
--- a/glabels/LabelModel.cpp
+++ b/glabels/LabelModel.cpp
@@ -47,7 +47,7 @@ namespace glabels
 	{
 		static int untitledCount = 0;
 		
-		if ( mFilename.isEmpty() )
+		if ( mFileName.isEmpty() )
 		{
 			if ( mUntitledInstance == 0 )
 			{
@@ -60,7 +60,7 @@ namespace glabels
 		}
 		else
 		{
-			QFileInfo fileInfo( mFilename );
+			QFileInfo fileInfo( mFileName );
 			return fileInfo.baseName();
 		}
 	}
diff --git a/glabels/LabelModel.h b/glabels/LabelModel.h
index 628bf60..270ae8a 100644
--- a/glabels/LabelModel.h
+++ b/glabels/LabelModel.h
@@ -75,8 +75,8 @@ namespace glabels
 		void clearModified();
 
 		QString shortName();
-		inline const QString& filename() const;
-		inline void setFilename( const QString &filename );
+		inline const QString& fileName() const;
+		inline void setFileName( const QString &fileName );
 
 		inline int compressionLevel() const;
 		inline void setCompressionLevel( int compressionLevel );
@@ -191,7 +191,7 @@ namespace glabels
 	private:
 		int                          mUntitledInstance;
 		bool                         mModified;
-		QString                      mFilename;
+		QString                      mFileName;
 		int                          mCompressionLevel;
 		const libglabels::Template*  mTmplate;
 		const libglabels::Frame*     mFrame;
@@ -213,17 +213,17 @@ namespace glabels
 	}
 
 
-	inline const QString& LabelModel::filename() const
+	inline const QString& LabelModel::fileName() const
 	{
-		return mFilename;
+		return mFileName;
 	}
 
 
-	inline void LabelModel::setFilename( const QString &filename )
+	inline void LabelModel::setFileName( const QString &fileName )
 	{
-		if ( mFilename != filename )
+		if ( mFileName != fileName )
 		{
-			mFilename = filename;
+			mFileName = fileName;
 			emit nameChanged();
 		}
 	}