diff --git a/Jamfile b/Jamfile
index 461bf27..24c90da 100644
--- a/Jamfile
+++ b/Jamfile
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Part of Equinox Desktop Environment (EDE).
-# Copyright (c) 2000-2007 EDE Authors.
+# Copyright (c) 2007-2008 EDE Authors.
 #
 # This program is licenced under terms of the 
 # GNU General Public Licence version 2 or newer.
@@ -19,16 +19,16 @@ SubInclude TOP ede-about ;
 SubInclude TOP ede-calc ;
 SubInclude TOP ede-control ;
 SubInclude TOP ede-crasher ;
-SubInclude TOP edesktopconf ;
+SubInclude TOP ede-desktop-conf ;
 #SubInclude TOP edewm ;
 SubInclude TOP efiler ;
-SubInclude TOP ehelp ;
+SubInclude TOP ede-help ;
 SubInclude TOP eiconman ;
 SubInclude TOP eimage ;
 SubInclude TOP elma ;
 SubInclude TOP emountd ;
 SubInclude TOP etimedate ;
-SubInclude TOP etip ;
+SubInclude TOP ede-tip ;
 SubInclude TOP evoke ;
 SubInclude TOP doc ;
 SubInclude TOP data ;
diff --git a/etip/Fortune.cpp b/ede-tip/Fortune.cpp
similarity index 100%
rename from etip/Fortune.cpp
rename to ede-tip/Fortune.cpp
diff --git a/etip/Fortune.h b/ede-tip/Fortune.h
similarity index 100%
rename from etip/Fortune.h
rename to ede-tip/Fortune.h
diff --git a/etip/Jamfile b/ede-tip/Jamfile
similarity index 100%
rename from etip/Jamfile
rename to ede-tip/Jamfile
diff --git a/etip/doc/etip.jpg b/ede-tip/doc/etip.jpg
similarity index 100%
rename from etip/doc/etip.jpg
rename to ede-tip/doc/etip.jpg
diff --git a/etip/doc/etip.txt b/ede-tip/doc/etip.txt
similarity index 100%
rename from etip/doc/etip.txt
rename to ede-tip/doc/etip.txt
diff --git a/etip/etip-compiler.c b/ede-tip/etip-compiler.c
similarity index 100%
rename from etip/etip-compiler.c
rename to ede-tip/etip-compiler.c
diff --git a/etip/etip.conf b/ede-tip/etip.conf
similarity index 100%
rename from etip/etip.conf
rename to ede-tip/etip.conf
diff --git a/etip/etip.cpp b/ede-tip/etip.cpp
similarity index 100%
rename from etip/etip.cpp
rename to ede-tip/etip.cpp
diff --git a/etip/fl/etip.fl b/ede-tip/fl/etip.fl
similarity index 100%
rename from etip/fl/etip.fl
rename to ede-tip/fl/etip.fl
diff --git a/etip/icons/hint.xpm b/ede-tip/icons/hint.xpm
similarity index 100%
rename from etip/icons/hint.xpm
rename to ede-tip/icons/hint.xpm
diff --git a/etip/tips/ede b/ede-tip/tips/ede
similarity index 100%
rename from etip/tips/ede
rename to ede-tip/tips/ede