diff --git a/TODO b/TODO
index 5510ce1..d338813 100644
--- a/TODO
+++ b/TODO
@@ -5,20 +5,19 @@
 MASTER SCRIPT
 -------------
 
-  - The BLFS module should be called in conjunction with any of
-    LFS, CLFS or HLFS modules.
-    Before working on that we need to fix the BLFS support.
+  - Nothing to be done at code level, for now.
+
+  - Update README to reflect the new work-flow.
 
 
-LFS MODULE (Applicable also to CLFS and HLFS modules)
-----------
+xLFS MODULES
+------------
 
-  - To add a switch to build the BLFS module dependencies at the end of
-    the LFS build, that is, wget and sudo. SVN and libxslt aren't needed
-    at this stage due that the BLFS book could be downloaded and parser
-    at the same time that the LFS book. Plus links or lynx to read the
-    (to be) generated BLFS HTML pages and, maybe, gpm.
-    Before working on that we need to fix the BLFS support.
+  - Rework Makefile creation to build the system more "by the book".
+    Work in progress
+
+  - To create Makefile entries to build blfs-tool dependencies.
+    Waiting the Makefile rework.
 
   - To add support for copying to the final system pre-generated
     configuration files created by the user.
diff --git a/blfs-tool b/blfs-tool
index d4376d3..2259d36 100755
--- a/blfs-tool
+++ b/blfs-tool
@@ -44,7 +44,7 @@ simple_error() {        # Basic error trap.... JUST DIE
 }
 
 see_ya() {
-    echo -e "\n${L_arrow}${BOLD}jhalfs-X${R_arrow} exit${OFF}\n"
+    echo -e "\n${L_arrow}${BOLD}jhalfs-trunk${R_arrow} exit${OFF}\n"
 }
 ##### Simple error TRAPS
 # ctrl-c   SIGINT
diff --git a/jhalfs b/jhalfs
index b872ae0..a43241e 100755
--- a/jhalfs
+++ b/jhalfs
@@ -42,7 +42,7 @@ simple_error() {        # Basic error trap.... JUST DIE
 }
 
 see_ya() {
-    echo -e "\n${L_arrow}${BOLD}jhalfs-X${R_arrow} exit${OFF}\n"
+    echo -e "\n${L_arrow}${BOLD}jhalfs-trunk${R_arrow} exit${OFF}\n"
 }
 ##### Simple error TRAPS
 # ctrl-c   SIGINT
@@ -62,7 +62,7 @@ trap 'echo -e "\n\n${RED}INTERRUPT${OFF} trapped\n" &&  exit 2'  1 2 3 15 17 18
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 version="
-${BOLD}  \"jhalfs-X\"${OFF} builder tool (experimental) \$Rev$
+${BOLD}  \"jhalfs-X\"${OFF} builder tool (development) \$Rev$
   \$Date$
 
   Written by George Boudreau and Manuel Canales Esparcia,