diff --git a/Scripts/Functions/Tuneup/tuneup.sh b/Scripts/Functions/Tuneup/tuneup.sh
index 8fd45ee..7b68d88 100755
--- a/Scripts/Functions/Tuneup/tuneup.sh
+++ b/Scripts/Functions/Tuneup/tuneup.sh
@@ -29,7 +29,7 @@ function tuneup {
     local ACTIONVAL=''
 
     # Interpret arguments and options passed through command-line.
-    tuneup_getArguments
+    tuneup_getOptions
 
     # Redefine positional parameters using ARGUMENTS. At this point,
     # option arguments have been removed from ARGUMENTS variable and
diff --git a/Scripts/Functions/Tuneup/tuneup_getArguments.sh b/Scripts/Functions/Tuneup/tuneup_getArguments.sh
deleted file mode 100755
index a3b5e26..0000000
--- a/Scripts/Functions/Tuneup/tuneup_getArguments.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#
-# tuneup_getArguments.sh -- This function interprets arguments passed to
-# tuneup functionality and calls actions accordingly.
-#
-# Copyright (C) 2009-2011 Alain Reguera Delgado
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function tuneup_getArguments {
-
-    # Define short options we want to support.
-    local ARGSS=""
-
-    # Define long options we want to support.
-    local ARGSL="filter:,quiet,answer-yes,dont-commit-changes"
-
-    # Redefine ARGUMENTS variable using getopt output.
-    cli_doParseArguments
-
-    # Redefine positional parameters using ARGUMENTS variable.
-    eval set -- "$ARGUMENTS"
-
-    # Look for options passed through command-line.
-    while true; do
-
-        case "$1" in
-
-            --filter )
-                FLAG_FILTER="$2"
-                shift 2
-                ;;
-
-            --quiet )
-                FLAG_QUIET="true"
-                FLAG_DONT_COMMIT_CHANGES="true"
-                shift 1
-                ;;
-
-            --answer-yes )
-                FLAG_ANSWER="true"
-                shift 1
-                ;;
-
-            --dont-commit-changes )
-                FLAG_DONT_COMMIT_CHANGES="true"
-                shift 1
-                ;;
-
-            -- )
-                # Remove the `--' argument from the list of arguments
-                # in order for processing non-option arguments
-                # correctly. At this point all option arguments have
-                # been processed already but the `--' argument still
-                # remains to mark ending of option arguments and
-                # begining of non-option arguments. The `--' argument
-                # needs to be removed here in order to avoid
-                # centos-art.sh script to process it as a path inside
-                # the repository, which obviously is not.
-                shift 1
-                break
-                ;;
-        esac
-    done
-
-    # Redefine ARGUMENTS variable using current positional parameters. 
-    cli_doParseArgumentsReDef "$@"
-
-}
diff --git a/Scripts/Functions/Tuneup/tuneup_getOptions.sh b/Scripts/Functions/Tuneup/tuneup_getOptions.sh
new file mode 100755
index 0000000..7de3a06
--- /dev/null
+++ b/Scripts/Functions/Tuneup/tuneup_getOptions.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# tuneup_getOptions.sh -- This function interprets option parameters
+# passed to `tuneup' functionality and calls actions accordingly.
+#
+# Copyright (C) 2009-2011 Alain Reguera Delgado
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+
+function tuneup_getOptions {
+
+    # Define short options we want to support.
+    local ARGSS=""
+
+    # Define long options we want to support.
+    local ARGSL="filter:,quiet,answer-yes,dont-commit-changes"
+
+    # Redefine ARGUMENTS variable using getopt output.
+    cli_doParseArguments
+
+    # Redefine positional parameters using ARGUMENTS variable.
+    eval set -- "$ARGUMENTS"
+
+    # Look for options passed through command-line.
+    while true; do
+
+        case "$1" in
+
+            --filter )
+                FLAG_FILTER="$2"
+                shift 2
+                ;;
+
+            --quiet )
+                FLAG_QUIET="true"
+                FLAG_DONT_COMMIT_CHANGES="true"
+                shift 1
+                ;;
+
+            --answer-yes )
+                FLAG_ANSWER="true"
+                shift 1
+                ;;
+
+            --dont-commit-changes )
+                FLAG_DONT_COMMIT_CHANGES="true"
+                shift 1
+                ;;
+
+            -- )
+                # Remove the `--' argument from the list of arguments
+                # in order for processing non-option arguments
+                # correctly. At this point all option arguments have
+                # been processed already but the `--' argument still
+                # remains to mark ending of option arguments and
+                # begining of non-option arguments. The `--' argument
+                # needs to be removed here in order to avoid
+                # centos-art.sh script to process it as a path inside
+                # the repository, which obviously is not.
+                shift 1
+                break
+                ;;
+        esac
+    done
+
+    # Redefine ARGUMENTS variable using current positional parameters. 
+    cli_doParseArgumentsReDef "$@"
+
+}