diff --git a/hurricane/src/hviewer/CMakeLists.txt b/hurricane/src/hviewer/CMakeLists.txt
index a06151ea..a35ca6ed 100644
--- a/hurricane/src/hviewer/CMakeLists.txt
+++ b/hurricane/src/hviewer/CMakeLists.txt
@@ -11,7 +11,6 @@
                                      hurricane/viewer/GraphicsWidget.h
                                      hurricane/viewer/DynamicLabel.h
                                      hurricane/viewer/MousePositionWidget.h
-                                     hurricane/viewer/Selector.h
                                      hurricane/viewer/SelectCommand.h
                                      hurricane/viewer/CellWidget.h
                                      hurricane/viewer/CellWidgets.h
@@ -38,7 +37,7 @@
                                      hurricane/viewer/MoveCommand.h
                                      hurricane/viewer/ZoomCommand.h
                                      hurricane/viewer/SelectCommand.h
-                                     hurricane/viewer/SelectorCommand.h
+                                     hurricane/viewer/SelectorCriterion.h
                                      hurricane/viewer/CellWidget.h
                                      hurricane/viewer/CellWidgets.h
                                      hurricane/viewer/CellViewer.h
@@ -69,7 +68,7 @@
                                      MoveCommand.cpp
                                      ZoomCommand.cpp
                                      SelectCommand.cpp
-                                     SelectorCommand.cpp
+                                     SelectorCriterion.cpp
                                      CellWidget.cpp
                                      CellViewer.cpp
                                      RecordModel.cpp
diff --git a/hurricane/src/hviewer/SelectorCommand.cpp b/hurricane/src/hviewer/SelectorCriterion.cpp
similarity index 97%
rename from hurricane/src/hviewer/SelectorCommand.cpp
rename to hurricane/src/hviewer/SelectorCriterion.cpp
index 28d87700..8b6c2306 100644
--- a/hurricane/src/hviewer/SelectorCommand.cpp
+++ b/hurricane/src/hviewer/SelectorCriterion.cpp
@@ -24,8 +24,7 @@
 
 
 #include  "hurricane/viewer/CellWidget.h"
-//#include  "hurricane/viewer/SelectorCriterion.h"
-#include  "hurricane/viewer/SelectorCommand.h"
+#include  "hurricane/viewer/SelectorCriterion.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/hurricane/viewer/CellWidget.h b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h
index 514938ad..03a0ecc9 100644
--- a/hurricane/src/hviewer/hurricane/viewer/CellWidget.h
+++ b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h
@@ -52,8 +52,7 @@ class QAction;
 #include  "hurricane/viewer/DisplayStyle.h"
 #include  "hurricane/viewer/CellWidgets.h"
 #include  "hurricane/viewer/Selector.h"
-//#include  "hurricane/viewer/SelectorCriterion.h"
-#include  "hurricane/viewer/SelectorCommand.h"
+#include  "hurricane/viewer/SelectorCriterion.h"
 
 
 
diff --git a/hurricane/src/hviewer/hurricane/viewer/SelectorCommand.h b/hurricane/src/hviewer/hurricane/viewer/SelectorCriterion.h
similarity index 100%
rename from hurricane/src/hviewer/hurricane/viewer/SelectorCommand.h
rename to hurricane/src/hviewer/hurricane/viewer/SelectorCriterion.h