diff --git a/etc/config.csh/setup b/etc/config.csh/setup
index 51a92cd054..ecdea3b40f 100644
--- a/etc/config.csh/setup
+++ b/etc/config.csh/setup
@@ -5,11 +5,10 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2019 OpenCFD Ltd.
+#     Copyright (C) 2018-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/config.csh/setup
@@ -89,7 +88,7 @@ endif
 
 # Capture and evaluate any command-line parameters
 # These can be used to set/unset values, specify additional files etc.
-setenv FOAM_SETTINGS "${*}"
+setenv FOAM_SETTINGS "$argv[*]"
 
 while ( $#argv > 0 )
     switch ($argv[1])
diff --git a/etc/cshrc b/etc/cshrc
index 91dcace4a6..86fb8bb6cf 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -6,11 +6,10 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/cshrc
@@ -176,7 +175,7 @@ endif
 # Finalize setup of OpenFOAM environment
 if ( -d "$WM_PROJECT_DIR" ) then
     if ($?FOAM_VERBOSE && $?prompt) echo "source $WM_PROJECT_DIR/etc/config.csh/setup"
-    source "$WM_PROJECT_DIR/etc/config.csh/setup" "${*}"
+    source "$WM_PROJECT_DIR/etc/config.csh/setup" $argv[*]
 else
     echo "Error: did not locate installation path for $WM_PROJECT-$WM_PROJECT_VERSION"
     echo "No directory: $WM_PROJECT_DIR"