diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d4d837..18133a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})
 
 aux_source_directory("widgets" LAYER_SOURCES)
-aux_source_directory("tree-renderer" RENDERER_SOURCES)
+aux_source_directory("cell-selector" CELL_SELECTOR_SOURCES)
 aux_source_directory("gds-utils" GDS_SOURCES)
 aux_source_directory("latex-renderer" LATEX_SOURCES)
 aux_source_directory("cairo-renderer" CAIRO_SOURCES)
@@ -26,7 +26,7 @@ set(SOURCE "main.c" "command-line.c" "gds-render-gui.c" "external-renderer.c")
 set(SOURCE
   ${SOURCE}
   ${LAYER_SOURCES}
-  ${RENDERER_SOURCES}
+  ${CELL_SELECTOR_SOURCES}
   ${GDS_SOURCES}
   ${LATEX_SOURCES}
   ${CAIRO_SOURCES}
diff --git a/tree-renderer/lib-cell-renderer.c b/cell-selector/lib-cell-renderer.c
similarity index 98%
rename from tree-renderer/lib-cell-renderer.c
rename to cell-selector/lib-cell-renderer.c
index bb7bf02..fc69653 100644
--- a/tree-renderer/lib-cell-renderer.c
+++ b/cell-selector/lib-cell-renderer.c
@@ -28,7 +28,7 @@
  * @{
  */
 
-#include <gds-render/tree-renderer/lib-cell-renderer.h>
+#include <gds-render/cell-selector/lib-cell-renderer.h>
 #include <gds-render/gds-utils/gds-types.h>
 
 G_DEFINE_TYPE(LibCellRenderer, lib_cell_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
diff --git a/tree-renderer/tree-store.c b/cell-selector/tree-store.c
similarity index 98%
rename from tree-renderer/tree-store.c
rename to cell-selector/tree-store.c
index 6b15217..eec292d 100644
--- a/tree-renderer/tree-store.c
+++ b/cell-selector/tree-store.c
@@ -28,8 +28,8 @@
  * @{
  */
 
-#include <gds-render/tree-renderer/tree-store.h>
-#include <gds-render/tree-renderer/lib-cell-renderer.h>
+#include <gds-render/cell-selector/tree-store.h>
+#include <gds-render/cell-selector/lib-cell-renderer.h>
 #include <gds-render/gds-utils/gds-types.h>
 
 /**
diff --git a/gds-render-gui.c b/gds-render-gui.c
index d903efe..1790fad 100644
--- a/gds-render-gui.c
+++ b/gds-render-gui.c
@@ -35,8 +35,8 @@
 #include <gds-render/gds-utils/gds-tree-checker.h>
 #include <gds-render/layer/layer-selector.h>
 #include <gds-render/widgets/activity-bar.h>
-#include <gds-render/tree-renderer/tree-store.h>
-#include <gds-render/tree-renderer/lib-cell-renderer.h>
+#include <gds-render/cell-selector/tree-store.h>
+#include <gds-render/cell-selector/lib-cell-renderer.h>
 #include <gds-render/latex-renderer/latex-output.h>
 #include <gds-render/cairo-renderer/cairo-output.h>
 #include <gds-render/widgets/conv-settings-dialog.h>
diff --git a/include/gds-render/tree-renderer/lib-cell-renderer.h b/include/gds-render/cell-selector/lib-cell-renderer.h
similarity index 100%
rename from include/gds-render/tree-renderer/lib-cell-renderer.h
rename to include/gds-render/cell-selector/lib-cell-renderer.h
diff --git a/include/gds-render/tree-renderer/tree-store.h b/include/gds-render/cell-selector/tree-store.h
similarity index 100%
rename from include/gds-render/tree-renderer/tree-store.h
rename to include/gds-render/cell-selector/tree-store.h