diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh b/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh
index 74b0cb0..3d3f1ed 100755
--- a/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh
+++ b/Scripts/Functions/Render/Docbook/docbook_convertToXhtml.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# render_docbook_convertToXhtml.sh -- This function uses DocBook XML
-# as input and applies XSL stylesheets to produce a big XHTML files as
-# output.  The procedure was taken from the documentation of
+# docbook_convertToXhtml.sh -- This function uses DocBook XML as input
+# and applies XSL stylesheets to produce a big XHTML files as output.
+# The procedure was taken from the documentation of
 # `docbook-style-xsl-1.69.1-5.1' package, which says: ---To publish
 # HTML from your XML documents, you just need an XSL engine.---.
 #
diff --git a/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh b/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
index f2df401..e4969b6 100755
--- a/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
+++ b/Scripts/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# render_docbook_convertToXhtmlChunk.sh -- This function uses DocBook
-# XML as input and applies XSL stylesheets to produce a directory with
-# many XHTML files as output.  The procedure was taken from the
+# docbook_convertToXhtmlChunk.sh -- This function uses DocBook XML as
+# input and applies XSL stylesheets to produce a directory with many
+# XHTML files as output.  The procedure was taken from the
 # documentation of `docbook-style-xsl-1.69.1-5.1' package, which says:
 # ---To publish HTML from your XML documents, you just need an XSLT
 # engine.---.
diff --git a/Scripts/Functions/Render/Svg/svg_convertPngTo.sh b/Scripts/Functions/Render/Svg/svg_convertPngTo.sh
index db10df3..35b6e41 100755
--- a/Scripts/Functions/Render/Svg/svg_convertPngTo.sh
+++ b/Scripts/Functions/Render/Svg/svg_convertPngTo.sh
@@ -27,7 +27,7 @@ function svg_convertPngTo {
 
     # Initialize image formats.
     local FORMAT=''
-    local FORMATS=$(render_getConfigOption "$ACTION" '2')
+    local FORMATS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2')
 
     # Convert from PNG to specified formats.
     for FORMAT in $FORMATS;do
diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh b/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh
index e7bbb94..8a2cc6a 100755
--- a/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh
+++ b/Scripts/Functions/Render/Svg/svg_convertPngToDm.sh
@@ -37,7 +37,7 @@ function svg_convertPngToDm {
     local DST=''
 
     # Initialize display manager type.
-    local DM=$(render_getConfigOption "${ACTION}" '2')
+    local DM=$(${CLI_FUNCNAME}_getConfigOption "${ACTION}" '2')
 
     # Initialize screen resolutions used by display manager theme.
     # These are the different screen resolutions a display manager
@@ -46,7 +46,7 @@ function svg_convertPngToDm {
     # background files provided by the artistic motif used to build
     # the display manager theme.
     local RESOLUTION=''
-    local RESOLUTIONS=$(render_getConfigOption "${ACTION}" '3')
+    local RESOLUTIONS=$(${CLI_FUNCNAME}_getConfigOption "${ACTION}" '3')
 
     # Verify screen resolutions. We cannot produce display manager
     # theme if no screen resolution has been specified.
diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh b/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh
index 3fc218b..e6a6608 100755
--- a/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh
+++ b/Scripts/Functions/Render/Svg/svg_convertPngToGrub.sh
@@ -64,7 +64,7 @@ function svg_convertPngToGrub {
     # configuration script. These options are applied to pnmremap when
     # doing color reduction, so any option available for pnmremap
     # command can be passed to renderSyslinux functionality.
-    local OPTIONS=$(render_getConfigOption "$ACTION" '2-')
+    local OPTIONS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-')
 
     # Check options passed to action. This is required in order to
     # aviod using options used already in this script. For example
diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh b/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh
index c5583a8..cda7238 100755
--- a/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh
+++ b/Scripts/Functions/Render/Svg/svg_convertPngToSyslinux.sh
@@ -73,7 +73,7 @@ function svg_convertPngToSyslinux {
     # configuration script. These options are applied to pnmremap when
     # doing color reduction, so any option available for pnmremap
     # command can be passed to renderSyslinux functionality.
-    local OPTIONS=$(render_getConfigOption "$ACTION" '2-')
+    local OPTIONS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-')
 
     # Check options passed to action. This is required in order to
     # aviod using options already used in this script. For example
diff --git a/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh b/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh
index 16d428c..1cc6eed 100755
--- a/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh
+++ b/Scripts/Functions/Render/Svg/svg_convertPngToThumbnail.sh
@@ -31,7 +31,7 @@ function svg_convertPngToThumbnail {
 
     # Get image size.
     local SIZE=''
-    local SIZES=$(render_getConfigOption "$ACTION" '2-')
+    local SIZES=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-')
 
     # Check image sizes and do convertion.
     if [[ "$SIZES" == "" ]];then
diff --git a/Scripts/Functions/Render/Svg/svg_doLastCommand.sh b/Scripts/Functions/Render/Svg/svg_doLastCommand.sh
index 34f1a2a..c858204 100755
--- a/Scripts/Functions/Render/Svg/svg_doLastCommand.sh
+++ b/Scripts/Functions/Render/Svg/svg_doLastCommand.sh
@@ -29,12 +29,12 @@ function svg_doLastCommand {
     # Define the file extensions. This value is a regular expression
     # pattern which must match the file extensions that last-rendition
     # actions will be applied to.
-    local EXTENSION=$(render_getConfigOption "$ACTION" '2')
+    local EXTENSION=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2')
 
     # Define the command string that will be evaluated as
     # last-rendition action. Only commands that perform in-place
     # modifications can be passed here.
-    local COMMAND=$(render_getConfigOption "$ACTION" '3-')
+    local COMMAND=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '3-')
 
     # Define the list of files to process. This value contain all the
     # files in the output directory which extension match the
diff --git a/Scripts/Functions/Render/Svg/svg_doPostCommand.sh b/Scripts/Functions/Render/Svg/svg_doPostCommand.sh
index 6892434..1491b1b 100755
--- a/Scripts/Functions/Render/Svg/svg_doPostCommand.sh
+++ b/Scripts/Functions/Render/Svg/svg_doPostCommand.sh
@@ -26,10 +26,10 @@
 function svg_doPostCommand {
 
     # Define the file extension of base-rendition output.
-    local EXTENSION=$(render_getConfigOption "$ACTION" '2')
+    local EXTENSION=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2')
 
     # Define the command string.
-    local COMMAND=$(render_getConfigOption "$ACTION" '3-')
+    local COMMAND=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '3-')
 
     # Verify the absolute path of base-rendition output.
     cli_checkFiles ${FILE}.${EXTENSION}
diff --git a/Scripts/Functions/Render/Svg/svg_groupBy.sh b/Scripts/Functions/Render/Svg/svg_groupBy.sh
index 08f5aaf..c17abf2 100755
--- a/Scripts/Functions/Render/Svg/svg_groupBy.sh
+++ b/Scripts/Functions/Render/Svg/svg_groupBy.sh
@@ -39,7 +39,7 @@ function svg_groupBy {
     # Sanitate file types passed from render.conf.sh pre-rendition
     # configuration script.
     local FORMAT=''
-    local FORMATS=$(render_getConfigOption "$ACTION" '2-')
+    local FORMATS=$(${CLI_FUNCNAME}_getConfigOption "$ACTION" '2-')
 
     for FORMAT in $FORMATS;do
 
diff --git a/Scripts/Functions/Render/render.sh b/Scripts/Functions/Render/render.sh
index 6678ef9..69fccdb 100755
--- a/Scripts/Functions/Render/render.sh
+++ b/Scripts/Functions/Render/render.sh
@@ -82,7 +82,7 @@ function render {
     local RENDER_EXTENSIONS='svg docbook'
 
     # Interpret arguments and options passed through command-line.
-    render_getOptions
+    ${CLI_FUNCNAME}_getOptions
 
     # Redefine positional parameters using ARGUMENTS. At this point,
     # option arguments have been removed from ARGUMENTS variable and
diff --git a/Scripts/Functions/Render/render_doBaseActions.sh b/Scripts/Functions/Render/render_doBaseActions.sh
index 3a88a32..45f8354 100755
--- a/Scripts/Functions/Render/render_doBaseActions.sh
+++ b/Scripts/Functions/Render/render_doBaseActions.sh
@@ -46,7 +46,7 @@ function render_doBaseActions {
     PARENTDIR=$(basename "${ACTIONVAL}")
 
     # Define base location of template files.
-    render_getDirTemplate
+    ${CLI_FUNCNAME}_getDirTemplate
     
     # Loop through list of supported file extensions. 
     for RENDER_EXTENSION in ${RENDER_EXTENSIONS};do
@@ -178,7 +178,7 @@ function render_doBaseActions {
             fi
  
             # Define final location of output directory.
-            render_getDirOutput
+            ${CLI_FUNCNAME}_getDirOutput
 
             # Get relative path to file. The path string (stored in
             # FILE) has two parts: 1. the variable path and 2. the
@@ -220,7 +220,7 @@ function render_doBaseActions {
 
             # Apply translation file to design model to produce the design
             # model translated instance. 
-            render_doTranslation
+            ${CLI_FUNCNAME}_doTranslation
 
             # Expand translation markers inside design model instance.
             cli_expandTMarkers ${INSTANCE}
diff --git a/Scripts/Functions/Render/render_doThemeActions.sh b/Scripts/Functions/Render/render_doThemeActions.sh
index ddd59a6..4a1e142 100755
--- a/Scripts/Functions/Render/render_doThemeActions.sh
+++ b/Scripts/Functions/Render/render_doThemeActions.sh
@@ -125,7 +125,7 @@ function render_doThemeActions {
 
         # Execute direct rendition on theme specific renderable
         # directory as specified by action value.
-        render_doBaseActions
+        ${CLI_FUNCNAME}_doBaseActions
 
         # Increment counter to match the correct count value.
         COUNT=$(($COUNT + 1))