diff --git a/hurricane/src/CMakeLists.txt b/hurricane/src/CMakeLists.txt
index 4ec93fc7..64cdd235 100644
--- a/hurricane/src/CMakeLists.txt
+++ b/hurricane/src/CMakeLists.txt
@@ -10,7 +10,8 @@ find_package(FLEX REQUIRED)
 
 add_subdirectory(hurricane)
 add_subdirectory(analogic)
-add_subdirectory(graphical)
+add_subdirectory(viewer)
+add_subdirectory(editor)
 
 set(DEST_DIR "$ENV{DESTDIR}")
 configure_file(${HURRICANE_SOURCE_DIR}/hurricane.pc.cmake hurricane.pc @ONLY)
diff --git a/hurricane/src/editor/CMakeLists.txt b/hurricane/src/editor/CMakeLists.txt
index 375c415c..8625646a 100644
--- a/hurricane/src/editor/CMakeLists.txt
+++ b/hurricane/src/editor/CMakeLists.txt
@@ -5,9 +5,9 @@ include_directories(${HURRICANE_SOURCE_DIR}/hurricane)
 set(includes InstanceFigure.h Utils.h)
 set(cpps InstanceFigure.cpp CellScene.cpp)
 
-add_library(hurricanefigs SHARED ${cpps})
-target_link_libraries(hurricanefigs ${QT_LIBRARIES} hurricane)
+add_library(hurricaneeditor SHARED ${cpps})
+target_link_libraries(hurricaneeditor ${QT_LIBRARIES} hurricane)
 
 install(FILES ${includes} DESTINATION /include/hurricane) 
-install(TARGETS hurricanefigs DESTINATION /lib)
+install(TARGETS hurricaneeditor DESTINATION /lib)
 
diff --git a/hurricane/src/editor/Utils.h b/hurricane/src/editor/Utils.h
index 9326b2b9..01d75b3e 100644
--- a/hurricane/src/editor/Utils.h
+++ b/hurricane/src/editor/Utils.h
@@ -8,10 +8,10 @@
 using namespace H;
 
 inline void BoxToRectangle(const Box& box, QRectF& rec) {
-	double xmin = GetValue(box.GetXMin());
-	double xmax = GetValue(box.GetXMax());
-	double ymin = GetValue(box.GetYMin());
-	double ymax = GetValue(box.GetYMax());
+	double xmin = GetValue(box.getXMin());
+	double xmax = GetValue(box.getXMax());
+	double ymin = GetValue(box.getYMin());
+	double ymax = GetValue(box.getYMax());
 	rec.setCoords(xmin, ymin, xmax, ymax);
 }
 
diff --git a/hurricane/src/hurricane.pc.cmake b/hurricane/src/hurricane.pc.cmake
index 47c993d0..a762b3c4 100644
--- a/hurricane/src/hurricane.pc.cmake
+++ b/hurricane/src/hurricane.pc.cmake
@@ -6,5 +6,5 @@ includedir=${exec_prefix}/include
 Name: hurricane
 Description: Hurricane Libs
 Version: 2.0.b
-Libs: -L${libdir} -lanalogic -lhurricanefigs -lhurricane
+Libs: -L${libdir} -lanalogic -lhurricaneviewer -lhurricane
 Cflags: -I${includedir}/hurricane
diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt
index 354222dc..2ac3151d 100644
--- a/hurricane/src/viewer/CMakeLists.txt
+++ b/hurricane/src/viewer/CMakeLists.txt
@@ -5,8 +5,8 @@ include_directories(${HURRICANE_SOURCE_DIR}/hurricane)
 set(includes CellWidget.h)
 set(cpps CellWidget.cpp)
 
-add_library(hurricanefigs SHARED ${cpps})
-target_link_libraries(hurricanefigs ${QT_LIBRARIES} hurricane)
+add_library(hurricaneviewer SHARED ${cpps})
+target_link_libraries(hurricaneviewer ${QT_LIBRARIES} hurricane)
 
 install(FILES ${includes} DESTINATION /include/hurricane) 
-install(TARGETS hurricanefigs DESTINATION /lib)
+install(TARGETS hurricaneviewer DESTINATION /lib)