diff --git a/Scripts/Bash/Functions/cli.sh b/Scripts/Bash/Functions/cli.sh
index 98c7778..e4b1e4b 100644
--- a/Scripts/Bash/Functions/cli.sh
+++ b/Scripts/Bash/Functions/cli.sh
@@ -43,10 +43,10 @@ function cli {
     # or not.
     local FLAG_QUIET='false'
     
-    # Initialize default value to answer flag. The answer flag (--yes)
-    # controls whether centos-art.sh script does or does not pass
-    # confirmation request points.
-    local FLAG_YES='false'
+    # Initialize default value to answer flag. The answer flag
+    # (--answer) controls whether centos-art.sh script does or does
+    # not pass confirmation request points. By default it doesn't.
+    local FLAG_ANSWER='false'
 
     # Initialize default value to filter flag. The filter flag
     # (--filter) is used mainly to reduce the number of files to
diff --git a/Scripts/Bash/Functions/cli_doParseArgumentsCommon.sh b/Scripts/Bash/Functions/cli_doParseArgumentsCommon.sh
index 84d1522..1505fcd 100755
--- a/Scripts/Bash/Functions/cli_doParseArgumentsCommon.sh
+++ b/Scripts/Bash/Functions/cli_doParseArgumentsCommon.sh
@@ -54,7 +54,7 @@ function cli_doParseArgumentsCommon {
     # Define local array to store long definition of common arguments.
     LONG[0]='filter'
     LONG[1]='quiet'
-    LONG[2]='answer-yes'
+    LONG[2]='answer'
     LONG[3]='dont-commit-changes'
 
     # Define local array to store definition of whether the common
@@ -62,7 +62,7 @@ function cli_doParseArgumentsCommon {
     # required at all [empty]).
     REQUIRED[0]=':'
     REQUIRED[1]=''
-    REQUIRED[2]=''
+    REQUIRED[2]=':'
     REQUIRED[3]=''
 
     # Save default arguments passed to centos-art.sh command-line.
@@ -162,9 +162,9 @@ function cli_doParseArgumentsCommon {
                 shift 1
                 ;;
 
-            --answer-yes )
-                FLAG_YES="true"
-                shift 1
+            --answer )
+                FLAG_ANSWER="$2"
+                shift 2
                 ;;
 
             --dont-commit-changes )