diff --git a/ede-conf/ede-conf.conf b/ede-conf/ede-conf.conf
index 171caba..602b3da 100644
--- a/ede-conf/ede-conf.conf
+++ b/ede-conf/ede-conf.conf
@@ -1,9 +1,6 @@
 #
-# This is a default data for control panel.
-# 
-# You can change them, and howto for this
-# you can find in econtrol documentation.
-
+# This is a default data for EDE control panel.
+#
 
 # This is the main key, and must be present if
 # you want to control panel read it
diff --git a/ede-conf/ede-conf.cpp b/ede-conf/ede-conf.cpp
index 5fbd3d8..e69d62f 100644
--- a/ede-conf/ede-conf.cpp
+++ b/ede-conf/ede-conf.cpp
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Econtrol, control panel for EDE
+ * ede-conf, a control panel for EDE
  * Part of Equinox Desktop Environment (EDE).
  * Copyright (c) 2008 EDE Authors.
  *
@@ -10,6 +10,12 @@
  * See COPYING for details.
  */
 
+#include <FL/Fl.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/fl_draw.H>
+
 #include <edelib/Config.h>
 #include <edelib/StrUtil.h>
 #include <edelib/Debug.h>
@@ -22,12 +28,6 @@
 #include <edelib/Run.h>
 #include <edelib/File.h>
 
-#include <FL/Fl.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Shared_Image.H>
-#include <FL/fl_draw.H>
-
 typedef edelib::list<edelib::String> StrList;
 typedef edelib::list<edelib::String>::iterator StrListIter;
 
@@ -98,7 +98,7 @@ void close_cb(Fl_Widget*, void* w) {
 void load_buttons(Fl_Group* g, Fl_Box* tipbox) {
 	edelib::Config c;
 
-	if(!c.load("econtrol.conf")) {
+	if(!c.load("ede-conf.conf")) {
 		EWARNING("Can't load config\n");
 		return;
 	}