diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_deleteEntry.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_deleteEntry.sh
index f4e7e46..fac78da 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_deleteEntry.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_deleteEntry.sh
@@ -116,7 +116,7 @@ function manual_deleteEntry {
     # Remove entry menus and nodes from chapter definition to reflect
     # the fact it has been removed.  This is mainly applied when one
     # of the chapters (e.g., trunk/, tags/, or branches/) is removed.
-    if [[ ! -d $MANUAL_DIR_CHAPTER ]];then
+    if [[ ! -d $MANUAL_CHAPTER_DIR ]];then
         manual_updateChaptersMenu 'remove-entry'
         manual_updateChaptersNodes
     fi
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_editEntry.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_editEntry.sh
index d87dcbf..fa0ae4c 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_editEntry.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_editEntry.sh
@@ -30,11 +30,11 @@ function manual_editEntry {
     # chapters sets how many chapters does the manual has and the
     # directory and file structure required to make them active part
     # of a texinfo manual.
-    if [[ ! -d $MANUAL_DIR_CHAPTER ]];then
+    if [[ ! -d $MANUAL_CHAPTER_DIR ]];then
 
         # Print confirmation question.
         cli_printMessage "`gettext "The following documentation chapter will be created:"`"
-        cli_printMessage "$MANUAL_DIR_CHAPTER" "AsResponseLine"
+        cli_printMessage "$MANUAL_CHAPTER_DIR" "AsResponseLine"
         cli_printMessage "`gettext "Do you want to continue?"`" "AsYesOrNoRequestLine"
 
         # Update manual chapter related files.
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_getActions.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_getActions.sh
index 0bc76a9..a4a8d22 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_getActions.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_getActions.sh
@@ -124,11 +124,11 @@ function manual_getActions {
     # tags) and handle everything else inside them as sections. Sub
     # and subsub section will not have their own files, they will be
     # written inside section files instead.
-    MANUAL_DIR_CHAPTER=$(echo $ENTRY | cut -d / -f-8)
+    MANUAL_CHAPTER_DIR=$(echo $ENTRY | cut -d / -f-8)
 
     # Define chapter name for the documentation entry we are working
     # with.
-    MANUAL_CHA_NAME=$(basename "$MANUAL_DIR_CHAPTER")
+    MANUAL_CHAPTER_NAME=$(basename "$MANUAL_CHAPTER_DIR")
 
     # Define base name for documentation manual files (without
     # extension). This is the main file name used to build texinfo
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersFiles.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersFiles.sh
index 6a38b6e..3119b8f 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersFiles.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersFiles.sh
@@ -28,29 +28,29 @@ function manual_updateChaptersFiles {
 
     # Define chapter's generic structure. 
     local CHAPTERBODY="\
-        @node $MANUAL_CHA_NAME
-        @chapter $MANUAL_CHA_NAME
-        @cindex $(echo $MANUAL_CHA_NAME | tr '[[:upper:]]' '[[:lower:]]')
-        @include $MANUAL_CHA_NAME/chapter-intro.texi
-        @include $MANUAL_CHA_NAME/chapter-menu.texi
-        @include $MANUAL_CHA_NAME/chapter-nodes.texi"
+        @node $MANUAL_CHAPTER_NAME
+        @chapter $MANUAL_CHAPTER_NAME
+        @cindex $(echo $MANUAL_CHAPTER_NAME | tr '[[:upper:]]' '[[:lower:]]')
+        @include $MANUAL_CHAPTER_NAME/chapter-intro.texi
+        @include $MANUAL_CHAPTER_NAME/chapter-menu.texi
+        @include $MANUAL_CHAPTER_NAME/chapter-nodes.texi"
 
     # Remove any space/tabs at the begining of @... lines.
     CHAPTERBODY=$(echo "$CHAPTERBODY" | sed -r 's!^[[:space:]]+@!@!')
 
     # Create directory to store chapter files.
-    if [[ ! -d $MANUAL_DIR_CHAPTER ]];then
-        mkdir $MANUAL_DIR_CHAPTER
+    if [[ ! -d $MANUAL_CHAPTER_DIR ]];then
+        mkdir $MANUAL_CHAPTER_DIR
     fi
 
     # Create files to store chapter information. If chapter files
     # already exist, they will be re-written and any previous
     # information inside them will be lost.
-    echo "$CHAPTERBODY" > $MANUAL_DIR_CHAPTER/chapter.texi
-    echo "" > $MANUAL_DIR_CHAPTER/chapter-menu.texi
-    echo "" > $MANUAL_DIR_CHAPTER/chapter-nodes.texi
+    echo "$CHAPTERBODY" > $MANUAL_CHAPTER_DIR/chapter.texi
+    echo "" > $MANUAL_CHAPTER_DIR/chapter-menu.texi
+    echo "" > $MANUAL_CHAPTER_DIR/chapter-nodes.texi
 
     # Initialize chapter instroduction using template file.
-    cp ${FUNCCONFIG}/manual-cha-intro.texi $MANUAL_DIR_CHAPTER/chapter-intro.texi
+    cp ${FUNCCONFIG}/manual-cha-intro.texi $MANUAL_CHAPTER_DIR/chapter-intro.texi
 
 }
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersMenu.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersMenu.sh
index c3ec336..1e3542b 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersMenu.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_updateChaptersMenu.sh
@@ -43,12 +43,12 @@ function manual_updateChaptersMenu {
         'remove-entry' )
             # Remove chapter from menu.
             MENUCHAPTERS=$(echo "${MENUCHAPTERS}" \
-                | egrep -v "^\* ${MANUAL_CHA_NAME}::[[:print:]]*$")
+                | egrep -v "^\* ${MANUAL_CHAPTER_NAME}::[[:print:]]*$")
             ;;
         'update-entry' | * )
             # Update chapter menu using texinfo format.
             MENUCHAPTERS="${MENUCHAPTERS}
-                * ${MANUAL_CHA_NAME}::"
+                * ${MANUAL_CHAPTER_NAME}::"
             ;;
     esac
 
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_updateMenu.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_updateMenu.sh
index b147742..d37f0dc 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_updateMenu.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_updateMenu.sh
@@ -47,7 +47,7 @@ function manual_updateMenu {
 
     # Define chapter's menu. Remove `@menu', `@end menu', and empty lines
     # from output.
-    local MENU=$(cat $MANUAL_DIR_CHAPTER/chapter-menu.texi \
+    local MENU=$(cat $MANUAL_CHAPTER_DIR/chapter-menu.texi \
         | egrep -v '^[[:space:]]*$' | egrep -v '^@(end )?menu') 
 
     # Re-defined chapter's menu based on action.
@@ -80,6 +80,6 @@ function manual_updateMenu {
     MENU=$(echo "$MENU" | sed -r 's!^[[:space:]]+!!g')
 
     # Dump final menu structure back into chapter's menu file.
-    echo "$MENU" > $MANUAL_DIR_CHAPTER/chapter-menu.texi
+    echo "$MENU" > $MANUAL_CHAPTER_DIR/chapter-menu.texi
 
 }
diff --git a/Scripts/Bash/centos-art/Functions/Manual/manual_updateNodes.sh b/Scripts/Bash/centos-art/Functions/Manual/manual_updateNodes.sh
index 9f5bf43..8f91dd8 100755
--- a/Scripts/Bash/centos-art/Functions/Manual/manual_updateNodes.sh
+++ b/Scripts/Bash/centos-art/Functions/Manual/manual_updateNodes.sh
@@ -27,7 +27,7 @@
 function manual_updateNodes {
 
     # Retrive nodes' entries from chapter-menu.texi file.
-    local NODES=$(cat $MANUAL_DIR_CHAPTER/chapter-menu.texi \
+    local NODES=$(cat $MANUAL_CHAPTER_DIR/chapter-menu.texi \
         | sed -r 's!^\* !!' | sed -r 's!:{1,2}.*$!!g' \
         | egrep -v '^@(end )?menu$' | sed -r 's! !:!g' | sort | uniq)
 
@@ -57,7 +57,7 @@ function manual_updateNodes {
         echo ""
 
     # Dump node information into chapter node file.
-    done > $MANUAL_DIR_CHAPTER/chapter-nodes.texi
+    done > $MANUAL_CHAPTER_DIR/chapter-nodes.texi
 
 }