diff --git a/elementscategoryeditor.cpp b/elementscategoryeditor.cpp
index 19f973e14..339515af4 100644
--- a/elementscategoryeditor.cpp
+++ b/elementscategoryeditor.cpp
@@ -1,6 +1,6 @@
 #include "elementscategoryeditor.h"
 #include "elementscategory.h"
-#include "nameslist.h"
+#include "nameslistwidget.h"
 
 /**
 	Constructeur fournissant un dialogue d'edition de categorie.
@@ -46,7 +46,7 @@ void ElementsCategoryEditor::buildDialog() {
 	QVBoxLayout *editor_layout = new QVBoxLayout();
 	setLayout(editor_layout);
 	
-	names_list = new NamesList();
+	names_list = new NamesListWidget();
 	
 	buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 	connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
diff --git a/elementscategoryeditor.h b/elementscategoryeditor.h
index af13edec0..b08ea49eb 100644
--- a/elementscategoryeditor.h
+++ b/elementscategoryeditor.h
@@ -6,7 +6,7 @@
 	categorie.
 */
 class ElementsCategory;
-class NamesList;
+class NamesListWidget;
 class ElementsCategoryEditor : public QDialog {
 	Q_OBJECT
 	
@@ -23,7 +23,7 @@ class ElementsCategoryEditor : public QDialog {
 	private:
 	ElementsCategory *category;
 	QDialogButtonBox *buttons;
-	NamesList *names_list;
+	NamesListWidget *names_list;
 	bool mode_edit;
 	
 	// methodes
diff --git a/nameslist.cpp b/nameslistwidget.cpp
similarity index 85%
rename from nameslist.cpp
rename to nameslistwidget.cpp
index 227e17c49..c77cff1b2 100644
--- a/nameslist.cpp
+++ b/nameslistwidget.cpp
@@ -1,10 +1,10 @@
-#include "nameslist.h"
+#include "nameslistwidget.h"
 
 /**
 	Constructeur
 	@param parent QWidget parent de la liste de noms
 */
-NamesList::NamesList(QWidget *parent) : QWidget(parent) {
+NamesListWidget::NamesListWidget(QWidget *parent) : QWidget(parent) {
 	QVBoxLayout *names_list_layout = new QVBoxLayout();
 	setLayout(names_list_layout);
 	
@@ -24,13 +24,13 @@ NamesList::NamesList(QWidget *parent) : QWidget(parent) {
 /**
 	Destructeur
 */
-NamesList::~NamesList() {
+NamesListWidget::~NamesListWidget() {
 }
 
 /**
 	Ajoute une ligne a l'editeur
 */
-void NamesList::addLine() {
+void NamesListWidget::addLine() {
 	clean();
 	QTreeWidgetItem *qtwi = new QTreeWidgetItem();
 	qtwi -> setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -40,7 +40,7 @@ void NamesList::addLine() {
 /**
 	Verifie qu'il y a au moins un nom
 */
-bool NamesList::checkOneName() {
+bool NamesListWidget::checkOneName() {
 	updateHash();
 	if (!hash_names.size()) {
 		QMessageBox::critical(
@@ -56,7 +56,7 @@ bool NamesList::checkOneName() {
 /**
 	Lit les noms valides dans hash_names
 */
-void NamesList::updateHash() {
+void NamesListWidget::updateHash() {
 	hash_names.clear();
 	int names_count = tree_names -> topLevelItemCount();
 	for (int i = 0 ; i < names_count ; ++ i) {
@@ -69,7 +69,7 @@ void NamesList::updateHash() {
 /**
 	Nettoie la liste des noms en enlevant les lignes vides
 */
-void NamesList::clean() {
+void NamesListWidget::clean() {
 	int names_count = tree_names -> topLevelItemCount() - 1;
 	for (int i = names_count ; i >= 0 ; -- i) {
 		if (
@@ -84,7 +84,7 @@ void NamesList::clean() {
 /**
 	@return Les noms entres dans la Names List
 */
-QHash<QString, QString> NamesList::names() {
+QHash<QString, QString> NamesListWidget::names() {
 	updateHash();
 	return(hash_names);
 }
@@ -93,7 +93,7 @@ QHash<QString, QString> NamesList::names() {
 	Specifie les noms que la liste doit afficher
 	@param provided_names Hash des noms a afficher
 */
-void NamesList::setNames(QHash<QString, QString> &provided_names) {
+void NamesListWidget::setNames(QHash<QString, QString> &provided_names) {
 	foreach(QString lang, provided_names.keys()) {
 		QString value = provided_names[lang];
 		if (lang == "" || value == "") continue;
diff --git a/nameslist.h b/nameslistwidget.h
similarity index 72%
rename from nameslist.h
rename to nameslistwidget.h
index 26cc96398..00690e1cf 100644
--- a/nameslist.h
+++ b/nameslistwidget.h
@@ -1,20 +1,20 @@
-#ifndef NAMES_LIST_H
-#define NAMES_LIST_H
+#ifndef NAMES_LIST_WIDGET_H
+#define NAMES_LIST_WIDGET_H
 #include <QtGui>
 /**
 	Cette classe represente une interface permettant de saisir les noms des
 	categories et elements.
 */
-class NamesList : public QWidget {
+class NamesListWidget : public QWidget {
 	Q_OBJECT
 	
 	// constructeurs, destructeur
 	public:
-	NamesList(QWidget * = 0);
-	virtual ~NamesList();
+	NamesListWidget(QWidget * = 0);
+	virtual ~NamesListWidget();
 	
 	private:
-	NamesList(const NamesList &);
+	NamesListWidget(const NamesListWidget &);
 	
 	// attributs
 	private:
diff --git a/newelementwizard.cpp b/newelementwizard.cpp
index 1d2ca8b03..dece19b30 100644
--- a/newelementwizard.cpp
+++ b/newelementwizard.cpp
@@ -1,7 +1,7 @@
 #include "newelementwizard.h"
 #include "elementscategorieswidget.h"
 #include "elementscategorieslist.h"
-#include "nameslist.h"
+#include "nameslistwidget.h"
 #include "diagram.h"
 #include "element.h"
 
@@ -174,7 +174,7 @@ void NewElementWizard::buildStep3() {
 	explication -> setAlignment(Qt::AlignJustify | Qt::AlignVCenter);
 	explication -> setWordWrap(true);
 	step3_layout -> addWidget(explication);
-	element_names = new NamesList();
+	element_names = new NamesListWidget();
 	QHash<QString, QString> hash_name;
 	hash_name.insert(QLocale::system().name().left(2), tr("Nom du nouvel \351l\351ment"));
 	element_names -> setNames(hash_name);
diff --git a/newelementwizard.h b/newelementwizard.h
index 1129f16ee..3355e61e7 100644
--- a/newelementwizard.h
+++ b/newelementwizard.h
@@ -13,7 +13,7 @@
 	  - les orientations possibles
 */
 class ElementsCategoriesWidget;
-class NamesList;
+class NamesListWidget;
 class Diagram;
 class NewElementWizard : public QDialog {
 	Q_OBJECT
@@ -37,7 +37,7 @@ class NewElementWizard : public QDialog {
 	QSpinBox *sb_height;
 	QSpinBox *sb_hotspot_x;
 	QSpinBox *sb_hotspot_y;
-	NamesList *element_names;
+	NamesListWidget *element_names;
 	QPushButton *button_previous;
 	QPushButton *button_next;
 	WizardState current_state;
diff --git a/qelectrotech.pro b/qelectrotech.pro
index b733e70d1..df2a69818 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -25,7 +25,7 @@ HEADERS += aboutqet.h \
            elementtextitem.h \
            exportdialog.h \
            fixedelement.h \
-           nameslist.h \
+           nameslistwidget.h \
            newelementwizard.h \
            qetapp.h \
            terminal.h
@@ -47,7 +47,7 @@ SOURCES += aboutqet.cpp \
            exportdialog.cpp \
            fixedelement.cpp \
            main.cpp \
-           nameslist.cpp \
+           nameslistwidget.cpp \
            newelementwizard.cpp \
            qetapp.cpp \
            terminal.cpp