diff --git a/Scripts/Functions/Locale/locale.sh b/Scripts/Functions/Locale/locale.sh
index 9f1deeb..7500c7f 100755
--- a/Scripts/Functions/Locale/locale.sh
+++ b/Scripts/Functions/Locale/locale.sh
@@ -57,7 +57,7 @@ function locale {
     L10N_BASEDIR="$(cli_getRepoTLDir)/L10n"
 
     # Interpret arguments and options passed through command-line.
-    ${CLI_FUNCNAME}_getOptions
+    locale_getOptions
 
     # Redefine positional parameters using ARGUMENTS. At this point,
     # option arguments have been removed from ARGUMENTS variable and
diff --git a/Scripts/Functions/Locale/locale_editMessages.sh b/Scripts/Functions/Locale/locale_editMessages.sh
index aea546f..6247999 100755
--- a/Scripts/Functions/Locale/locale_editMessages.sh
+++ b/Scripts/Functions/Locale/locale_editMessages.sh
@@ -82,7 +82,7 @@ function locale_editMessages {
         eval ${EDITOR} ${FILE}
 
         # Update machine object (.mo) from portable object (.po).
-        ${CLI_FUNCNAME}_updateMessageBinary ${FILE}
+        locale_updateMessageBinary ${FILE}
 
     done
 
diff --git a/Scripts/Functions/Locale/locale_getOptions.sh b/Scripts/Functions/Locale/locale_getOptions.sh
index bc6d7a5..ece927d 100755
--- a/Scripts/Functions/Locale/locale_getOptions.sh
+++ b/Scripts/Functions/Locale/locale_getOptions.sh
@@ -65,17 +65,17 @@ function locale_getOptions {
                 ;;
 
             --update )
-                ACTIONNAMS="$ACTIONNAMS ${CLI_FUNCNAME}_updateMessages"
+                ACTIONNAMS="$ACTIONNAMS locale_updateMessages"
                 shift 1
                 ;;
 
             --edit )
-                ACTIONNAMS="$ACTIONNAMS ${CLI_FUNCNAME}_editMessages"
+                ACTIONNAMS="$ACTIONNAMS locale_editMessages"
                 shift 1
                 ;;
 
             --delete )
-                ACTIONNAMS="$ACTIONNAMS ${CLI_FUNCNAME}_deleteMessages"
+                ACTIONNAMS="$ACTIONNAMS locale_deleteMessages"
                 shift 1
                 ;;
 
@@ -103,7 +103,7 @@ function locale_getOptions {
     # Verify action names. When no action name is specified, use
     # edition as default action name.
     if [[ $ACTIONNAMS == '' ]];then
-        ACTIONNAMS="${CLI_FUNCNAME}_editMessages"
+        ACTIONNAMS="locale_editMessages"
     fi
 
     # Redefine ARGUMENTS variable using current positional parameters. 
diff --git a/Scripts/Functions/Locale/locale_updateMessagePObjects.sh b/Scripts/Functions/Locale/locale_updateMessagePObjects.sh
index 3ac1d26..14908bc 100755
--- a/Scripts/Functions/Locale/locale_updateMessagePObjects.sh
+++ b/Scripts/Functions/Locale/locale_updateMessagePObjects.sh
@@ -57,7 +57,7 @@ function locale_updateMessagePObjects {
         # Sanitate portable object metadata. This is the first time
         # the portable object is created so some modifications are
         # needed to customized metadata.
-        ${CLI_FUNCNAME}_updateMessageMetadata "${FILE}.po"
+        locale_updateMessageMetadata "${FILE}.po"
 
     fi
 
diff --git a/Scripts/Functions/Locale/locale_updateMessageShell.sh b/Scripts/Functions/Locale/locale_updateMessageShell.sh
index c0530a3..5307c80 100755
--- a/Scripts/Functions/Locale/locale_updateMessageShell.sh
+++ b/Scripts/Functions/Locale/locale_updateMessageShell.sh
@@ -57,10 +57,10 @@ function locale_updateMessageShell {
         --width=70 --sort-by-file ${FILES}
 
     # Sanitate portable object template metadata.
-    ${CLI_FUNCNAME}_updateMessageMetadata "${FILE}.pot"
+    locale_updateMessageMetadata "${FILE}.pot"
 
     # Verify, initialize or update portable objects from portable
     # object templates.
-    ${CLI_FUNCNAME}_updateMessagePObjects "${FILE}"
+    locale_updateMessagePObjects "${FILE}"
 
 }
diff --git a/Scripts/Functions/Locale/locale_updateMessageXml.sh b/Scripts/Functions/Locale/locale_updateMessageXml.sh
index ffb860d..86846e1 100755
--- a/Scripts/Functions/Locale/locale_updateMessageXml.sh
+++ b/Scripts/Functions/Locale/locale_updateMessageXml.sh
@@ -107,6 +107,6 @@ function locale_updateMessageXml {
 
    # Verify, initialize or merge portable objects from portable object
    # templates.
-   ${CLI_FUNCNAME}_updateMessagePObjects "${MESSAGES}"
+   locale_updateMessagePObjects "${MESSAGES}"
 
 }
diff --git a/Scripts/Functions/Locale/locale_updateMessages.sh b/Scripts/Functions/Locale/locale_updateMessages.sh
index 46c505a..86a06b8 100755
--- a/Scripts/Functions/Locale/locale_updateMessages.sh
+++ b/Scripts/Functions/Locale/locale_updateMessages.sh
@@ -44,14 +44,14 @@ function locale_updateMessages {
         # Update translatable strings inside the portable object
         # template related to XML-based files (e.g., scalable vector
         # graphics).
-        ${CLI_FUNCNAME}_updateMessageXml
+        locale_updateMessageXml
 
     elif [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Scripts$" ]];then
 
         # Update translatable strings inside the portable object
         # template related to shell scripts (e.g., the centos-art.sh
         # script).
-        ${CLI_FUNCNAME}_updateMessageShell
+        locale_updateMessageShell
 
     else