diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp
index 181369219..5bdf4ac67 100644
--- a/sources/bordertitleblock.cpp
+++ b/sources/bordertitleblock.cpp
@@ -241,7 +241,7 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() {
 	ip.title = title();
 	ip.filename = fileName();
 	ip.machine = machine();
-	ip.loc = loc();
+	ip.locmach = locmach();
 	ip.indexrev = indexrev();
 	ip.version = version();
 	ip.folio = folio();
@@ -264,7 +264,7 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) {
 	setTitle(ip.title);
 	setFileName(ip.filename);
 	setMachine(ip.machine);
-	setLoc(ip.loc);
+	setLocMach(ip.locmach);
 	setIndicerev(ip.indexrev);
 	setVersion(QET::displayedVersion);
 	setFolio(ip.folio);
@@ -702,7 +702,7 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &i
 	context.addValue("title",       btb_title_);
 	context.addValue("filename",    btb_filename_);
 	context.addValue("machine",     btb_machine_);
-	context.addValue("loc",         btb_loc_);
+	context.addValue("locmach",     btb_locmach_);
 	context.addValue("indexrev",    btb_indexrev_);
 	context.addValue("version",     btb_version_);
 	context.addValue("folio",       btb_final_folio_);
diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h
index 975259a27..d6da67f79 100644
--- a/sources/bordertitleblock.h
+++ b/sources/bordertitleblock.h
@@ -97,8 +97,8 @@ class BorderTitleBlock : public QObject
 	QString folio() const { return(btb_folio_); }
 	/// @return the value of the title block "Machine" field
 	QString machine() const { return(btb_machine_); }
-	/// @return the value of the title block "Folio" field
-	QString loc() const { return(btb_loc_); }
+	/// @return the value of the title block "Locmach" field
+	QString locmach() const { return(btb_locmach_); }
 	/// @return the value of the revision index block "Folio" field
 	QString indexrev() const { return(btb_indexrev_); }
 	
@@ -154,7 +154,7 @@ class BorderTitleBlock : public QObject
 	void setFolioData(int, int, QString = NULL, const DiagramContext & = DiagramContext());
 	/// @param author the new value of the "File" field
 	void setMachine(const QString &machine) { btb_machine_ = machine; }
-	void setLoc(const QString &loc) { btb_loc_ = loc; }
+	void setLocMach(const QString &locmach) { btb_locmach_ = locmach; }
 	void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; }
 	void setFileName(const QString &filename) { btb_filename_ = filename; }
 	/// @param author the new value of the "Version" field
@@ -236,7 +236,7 @@ class BorderTitleBlock : public QObject
 		QString btb_title_;
 		QString btb_folio_;
 		QString btb_machine_;
-		QString btb_loc_;
+		QString btb_locmach_;
 		QString btb_indexrev_;
 		QString btb_final_folio_;
 		QString btb_auto_page_num_;
diff --git a/sources/diagramfoliolist.cpp b/sources/diagramfoliolist.cpp
index 633c389a9..5a0e18dd5 100644
--- a/sources/diagramfoliolist.cpp
+++ b/sources/diagramfoliolist.cpp
@@ -94,7 +94,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r)
 				QString::number(diagram_list[i] ->folioIndex()+1),
 				diagram_list[i] -> border_and_titleblock.folio(),
 				diagram_list[i] -> border_and_titleblock.machine(),
-				diagram_list[i] -> border_and_titleblock.loc(),
+				diagram_list[i] -> border_and_titleblock.locmach(),
 				diagram_list[i] -> border_and_titleblock.indexrev(),
 				diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate));
 	}
diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp
index d060f5a46..eba3460d9 100644
--- a/sources/titleblock/templatecellwidget.cpp
+++ b/sources/titleblock/templatecellwidget.cpp
@@ -438,7 +438,7 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const {
 		"<li>%{title} : titre du folio</li>"
 		"<li>%{filename} : nom de fichier du projet</li>"
 		"<li>%{machine} : nom du groupe fonctionnel du projet</li>"
-		"<li>%{loc} : nom de la localisation dans le groupe fonctionnel du projet</li>"
+		"<li>%{locmach} : nom de la localisation dans le groupe fonctionnel du projet</li>"
 		"<li>%{indexrev} : indice de révision du folio</li>"
 		"<li>%{version} : version du logiciel</li>"
 		"<li>%{folio} : indications relatives au folio</li>"
diff --git a/sources/titleblockproperties.cpp b/sources/titleblockproperties.cpp
index 7a3185f7f..1d3fa6fe9 100644
--- a/sources/titleblockproperties.cpp
+++ b/sources/titleblockproperties.cpp
@@ -48,7 +48,7 @@ bool TitleBlockProperties::operator==(const TitleBlockProperties &ip) {
 		ip.date == date &&\
 		ip.filename == filename &&\
 		ip.machine == machine &&\
-		ip.loc == loc &&\
+		ip.locmach == locmach &&\
 		ip.indexrev == indexrev &&\
 		ip.version == version &&\
 		ip.folio == folio &&\
@@ -78,7 +78,7 @@ void TitleBlockProperties::toXml(QDomElement &e) const {
 	e.setAttribute("title",    title);
 	e.setAttribute("filename", filename);
 	e.setAttribute("machine", machine);
-	e.setAttribute("loc", loc);
+	e.setAttribute("locmach", locmach);
 	e.setAttribute("indexrev",indexrev);
 	e.setAttribute("version", version);
 	e.setAttribute("folio",    folio);
@@ -108,7 +108,7 @@ void TitleBlockProperties::fromXml(const QDomElement &e) {
 	if (e.hasAttribute("title"))       title    = e.attribute("title");
 	if (e.hasAttribute("filename"))    filename = e.attribute("filename");
 	if (e.hasAttribute("machine"))    machine   = e.attribute("machine");
-	if (e.hasAttribute("loc"))        loc       = e.attribute("loc");
+	if (e.hasAttribute("locmach"))     locmach  = e.attribute("locmach");
 	if (e.hasAttribute("indexrev"))   indexrev  = e.attribute("indexrev");
 	if (e.hasAttribute("version"))    version   = e.attribute("version");
 	if (e.hasAttribute("folio"))       folio    = e.attribute("folio");
@@ -141,7 +141,7 @@ void TitleBlockProperties::toSettings(QSettings &settings, const QString &prefix
 	settings.setValue(prefix + "author",   author);
 	settings.setValue(prefix + "filename", filename);
 	settings.setValue(prefix + "machine", machine);
-	settings.setValue(prefix + "loc", loc);
+	settings.setValue(prefix + "locmach", locmach);
 	settings.setValue(prefix + "indexrev", indexrev);
 	settings.setValue(prefix + "version", version);
 	settings.setValue(prefix + "folio",    folio);
@@ -163,7 +163,7 @@ void TitleBlockProperties::fromSettings(QSettings &settings, const QString &pref
 	author   = settings.value(prefix + "author").toString();
 	filename = settings.value(prefix + "filename").toString();
 	machine  = settings.value(prefix + "machine").toString();
-	loc      = settings.value(prefix + "loc").toString();
+	locmach  = settings.value(prefix + "locmach").toString();
 	indexrev = settings.value(prefix + "indexrev").toString();
 	version  = settings.value(prefix + "version").toString();
 	folio    = settings.value(prefix + "folio", "%id/%total").toString();
diff --git a/sources/titleblockproperties.h b/sources/titleblockproperties.h
index cb7afc164..77a67126d 100644
--- a/sources/titleblockproperties.h
+++ b/sources/titleblockproperties.h
@@ -55,7 +55,7 @@ class TitleBlockProperties {
 	QDate date;               ///< Date (displayed by the default template)
 	QString filename;         ///< Filename (displayed by the default template)
 	QString machine;          ///< Machine (displayed by the default template)
-	QString loc;              ///< Location(displayed by the default template)
+	QString locmach;              ///< Location(displayed by the default template)
 	QString indexrev;         ///< Revision Index (displayed by the default template)
 	QString version;          ///< Version (displayed by the default template)
 	QString folio;            ///< Folio information (displayed by the default template)
diff --git a/sources/ui/titleblockpropertieswidget.cpp b/sources/ui/titleblockpropertieswidget.cpp
index ce29be28b..d55210dec 100644
--- a/sources/ui/titleblockpropertieswidget.cpp
+++ b/sources/ui/titleblockpropertieswidget.cpp
@@ -96,7 +96,7 @@ void TitleBlockPropertiesWidget::setProperties(const TitleBlockProperties &prope
 	ui -> m_author_le -> setText (properties.author);
 	ui -> m_file_le   -> setText (properties.filename);
 	ui -> m_mach      -> setText (properties.machine);
-	ui -> m_loc       -> setText (properties.loc);
+	ui -> m_loc   -> setText (properties.locmach);
 	ui -> m_indice    -> setText (properties.indexrev);
 	ui -> m_folio_le  -> setText (properties.folio);
 	ui -> m_display_at_cb -> setCurrentIndex(properties.display_at == Qt::BottomEdge ? 0 : 1);
@@ -154,7 +154,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::properties() const {
 	prop.author   = ui -> m_author_le -> text();
 	prop.filename = ui -> m_file_le   -> text();
 	prop.machine  = ui -> m_mach      -> text();
-	prop.loc      = ui -> m_loc       -> text();
+	prop.locmach  = ui -> m_loc   -> text();
 	prop.indexrev = ui -> m_indice    -> text();
 	prop.folio    = ui -> m_folio_le  -> text();
 	prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
@@ -195,7 +195,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(QString autoN
 	prop.author   = ui -> m_author_le -> text();
 	prop.filename = ui -> m_file_le   -> text();
 	prop.machine  = ui -> m_mach      -> text();
-	prop.loc      = ui -> m_loc       -> text();
+	prop.locmach  = ui -> m_loc       -> text();
 	prop.indexrev = ui -> m_indice    -> text();
 	prop.folio    = "%autonum";
 	prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
diff --git a/sources/ui/titleblockpropertieswidget.ui b/sources/ui/titleblockpropertieswidget.ui
index e4c4676af..c60bc7e41 100644
--- a/sources/ui/titleblockpropertieswidget.ui
+++ b/sources/ui/titleblockpropertieswidget.ui
@@ -194,7 +194,7 @@
                 <item row="8" column="3">
                  <widget class="QLineEdit" name="m_loc">
                   <property name="toolTip">
-                   <string>Disponible en tant que %loc pour les modèles de cartouches</string>
+                   <string>Disponible en tant que %locmach pour les modèles de cartouches</string>
                   </property>
                  </widget>
                 </item>