diff --git a/catalogue/CreateAdminHostCmdLineArgs.cpp b/catalogue/CreateAdminHostCmdLineArgs.cpp
index 1331e8d0ceb7b16d3e9be59e5b3a5aae34e1fce9..df55d7fee545ef543602e4b4bccfe2bc62367e8b 100644
--- a/catalogue/CreateAdminHostCmdLineArgs.cpp
+++ b/catalogue/CreateAdminHostCmdLineArgs.cpp
@@ -31,7 +31,7 @@ namespace catalogue {
 CreateAdminHostCmdLineArgs::CreateAdminHostCmdLineArgs(const int argc, char *const *const argv):
   help(false) {
   static struct option longopts[] = {
-    {"comment"  , required_argument, NULL, 'c'},
+    {"comment"  , required_argument, NULL, 'm'},
     {"help"     ,       no_argument, NULL, 'h'},
     {"hostname" , required_argument, NULL, 'n'},
     {NULL       ,                 0, NULL,   0}
@@ -42,9 +42,9 @@ CreateAdminHostCmdLineArgs::CreateAdminHostCmdLineArgs(const int argc, char *con
   opterr = 0;
 
   int opt = 0;
-  while((opt = getopt_long(argc, argv, ":c:hn:", longopts, NULL)) != -1) {
+  while((opt = getopt_long(argc, argv, ":m:hn:", longopts, NULL)) != -1) {
     switch(opt) {
-    case 'c':
+    case 'm':
       comment = optarg ? optarg : "";
       break;
     case 'h':
@@ -99,7 +99,7 @@ CreateAdminHostCmdLineArgs::CreateAdminHostCmdLineArgs(const int argc, char *con
     // Check the number of arguments
   if(nbArgs != 1) {
     exception::CommandLineNotParsed ex;
-    ex.getMessage() << "Wrong number of command-line arguments: excepted=1 actual=" << nbArgs;
+    ex.getMessage() << "Wrong number of command-line arguments: expected=1 actual=" << nbArgs;
     throw ex;
   }
 
@@ -112,7 +112,7 @@ CreateAdminHostCmdLineArgs::CreateAdminHostCmdLineArgs(const int argc, char *con
 void CreateAdminHostCmdLineArgs::printUsage(std::ostream &os) {
   os <<
     "Usage:" << std::endl <<
-    "    cta-catalogue-admin-host-create databaseConnectionFile -n <hostname> -c <comment> [-h]" << std::endl <<
+    "    cta-catalogue-admin-host-create databaseConnectionFile -n <hostname> -m <comment> [-h]" << std::endl <<
     "Where:" << std::endl <<
     "    databaseConnectionFile" << std::endl <<
     "        The path to the file containing the connection details of the CTA" << std::endl <<
@@ -120,7 +120,7 @@ void CreateAdminHostCmdLineArgs::printUsage(std::ostream &os) {
     "Options:" << std::endl <<
     "    -n,--hostname <hostname>" << std::endl <<
     "        The name of the admin host to be created" << std::endl <<
-    "    -c,--comment <comment>" << std::endl <<
+    "    -m,--comment <comment>" << std::endl <<
     "        Comment to describe the creation of the admin host" << std::endl <<
     "    -h,--help" << std::endl <<
     "        Prints this usage message" << std::endl <<
diff --git a/catalogue/CreateAdminHostCmdLineArgsTest.cpp b/catalogue/CreateAdminHostCmdLineArgsTest.cpp
index 09def8cf66931321cd86c66790db3a002f285394..eae7e14835d5105be73f998f351cec6f9475f527 100644
--- a/catalogue/CreateAdminHostCmdLineArgsTest.cpp
+++ b/catalogue/CreateAdminHostCmdLineArgsTest.cpp
@@ -116,7 +116,7 @@ TEST_F(cta_catalogue_CreateAdminHostCmdLineArgsTest, hostname_short) {
   args->argv[1] = dupString("dbConfigPath");
   args->argv[2] = dupString("-n");
   args->argv[3] = dupString("adminHostname");
-  args->argv[4] = dupString("-c");
+  args->argv[4] = dupString("-m");
   args->argv[5] = dupString("comment");
   args->argv[6] = NULL;
 
diff --git a/catalogue/CreateAdminUserCmdLineArgs.cpp b/catalogue/CreateAdminUserCmdLineArgs.cpp
index bc34a061a860efff770f343811c0d64f38ff5314..b68290fd471c4c7e8147d48f3234041d67746e74 100644
--- a/catalogue/CreateAdminUserCmdLineArgs.cpp
+++ b/catalogue/CreateAdminUserCmdLineArgs.cpp
@@ -31,7 +31,7 @@ namespace catalogue {
 CreateAdminUserCmdLineArgs::CreateAdminUserCmdLineArgs(const int argc, char *const *const argv):
   help(false) {
   static struct option longopts[] = {
-    {"comment"  , required_argument, NULL, 'c'},
+    {"comment"  , required_argument, NULL, 'm'},
     {"help"     ,       no_argument, NULL, 'h'},
     {"username" , required_argument, NULL, 'u'},
     {NULL       ,                 0, NULL,   0}
@@ -42,9 +42,9 @@ CreateAdminUserCmdLineArgs::CreateAdminUserCmdLineArgs(const int argc, char *con
   opterr = 0;
 
   int opt = 0;
-  while((opt = getopt_long(argc, argv, ":c:hu:", longopts, NULL)) != -1) {
+  while((opt = getopt_long(argc, argv, ":m:hu:", longopts, NULL)) != -1) {
     switch(opt) {
-    case 'c':
+    case 'm':
       comment = optarg ? optarg : "";
       break;
     case 'h':
@@ -99,7 +99,7 @@ CreateAdminUserCmdLineArgs::CreateAdminUserCmdLineArgs(const int argc, char *con
     // Check the number of arguments
   if(nbArgs != 1) {
     exception::CommandLineNotParsed ex;
-    ex.getMessage() << "Wrong number of command-line arguments: excepted=1 actual=" << nbArgs;
+    ex.getMessage() << "Wrong number of command-line arguments: expected=1 actual=" << nbArgs;
     throw ex;
   }
 
@@ -112,7 +112,7 @@ CreateAdminUserCmdLineArgs::CreateAdminUserCmdLineArgs(const int argc, char *con
 void CreateAdminUserCmdLineArgs::printUsage(std::ostream &os) {
   os <<
     "Usage:" << std::endl <<
-    "    cta-catalogue-admin-user-create databaseConnectionFile -u <username> -c <comment> [-h]" << std::endl <<
+    "    cta-catalogue-admin-user-create databaseConnectionFile -u <username> -m <comment> [-h]" << std::endl <<
     "Where:" << std::endl <<
     "    databaseConnectionFile" << std::endl <<
     "        The path to the file containing the connection details of the CTA" << std::endl <<
@@ -120,7 +120,7 @@ void CreateAdminUserCmdLineArgs::printUsage(std::ostream &os) {
     "Options:" << std::endl <<
     "    -u,--username <username>" << std::endl <<
     "        The name of the admin user to be created" << std::endl <<
-    "    -c,--comment <comment>" << std::endl <<
+    "    -m,--comment <comment>" << std::endl <<
     "        Comment to describe the creation of the admin user" << std::endl <<
     "    -h,--help" << std::endl <<
     "        Prints this usage message" << std::endl <<
diff --git a/catalogue/CreateAdminUserCmdLineArgsTest.cpp b/catalogue/CreateAdminUserCmdLineArgsTest.cpp
index 1507f8f6f20160d92743d99f2b777cb5cc404829..9e707b970b9270e84b84b5399024e8d07176a607 100644
--- a/catalogue/CreateAdminUserCmdLineArgsTest.cpp
+++ b/catalogue/CreateAdminUserCmdLineArgsTest.cpp
@@ -116,7 +116,7 @@ TEST_F(cta_catalogue_CreateAdminUserCmdLineArgsTest, username_short) {
   args->argv[1] = dupString("dbConfigPath");
   args->argv[2] = dupString("-u");
   args->argv[3] = dupString("adminUsername");
-  args->argv[4] = dupString("-c");
+  args->argv[4] = dupString("-m");
   args->argv[5] = dupString("comment");
   args->argv[6] = NULL;
 
diff --git a/catalogue/CreateSchemaCmdLineArgs.cpp b/catalogue/CreateSchemaCmdLineArgs.cpp
index 880a2f6f71522f678dda05970047409ab108a572..ec27f661f2cac0f6e9760cd29fcf746d55365b6e 100644
--- a/catalogue/CreateSchemaCmdLineArgs.cpp
+++ b/catalogue/CreateSchemaCmdLineArgs.cpp
@@ -84,7 +84,7 @@ CreateSchemaCmdLineArgs::CreateSchemaCmdLineArgs(const int argc, char *const *co
   // Check the number of arguments
   if(nbArgs != 1) {
     exception::CommandLineNotParsed ex;
-    ex.getMessage() << "Wrong number of command-line arguments: excepted=1 actual=" << nbArgs;
+    ex.getMessage() << "Wrong number of command-line arguments: expected=1 actual=" << nbArgs;
     throw ex;
   }
 
diff --git a/catalogue/DropSchemaCmdLineArgs.cpp b/catalogue/DropSchemaCmdLineArgs.cpp
index 8cd404ffbf6e928d9b6ed401f5ceb675a6b8f250..33abba00a46c639d826cdd1da2d411838386b2b6 100644
--- a/catalogue/DropSchemaCmdLineArgs.cpp
+++ b/catalogue/DropSchemaCmdLineArgs.cpp
@@ -84,7 +84,7 @@ DropSchemaCmdLineArgs::DropSchemaCmdLineArgs(const int argc, char *const *const
   // Check the number of arguments
   if(nbArgs != 1) {
     exception::CommandLineNotParsed ex;
-    ex.getMessage() << "Wrong number of command-line arguments: excepted=1 actual=" << nbArgs;
+    ex.getMessage() << "Wrong number of command-line arguments: expected=1 actual=" << nbArgs;
     throw ex;
   }
 
diff --git a/catalogue/PollDatabaseCmdLineArgs.cpp b/catalogue/PollDatabaseCmdLineArgs.cpp
index 3fe9bc96a22998bfb74d4166a62db6a05f4c0580..6963ca5d326999f3eba3c9ae33a64fe5629ee606 100644
--- a/catalogue/PollDatabaseCmdLineArgs.cpp
+++ b/catalogue/PollDatabaseCmdLineArgs.cpp
@@ -87,7 +87,7 @@ PollDatabaseCmdLineArgs::PollDatabaseCmdLineArgs(const int argc, char *const *co
   // Check the number of arguments
   if(nbArgs != 2) {
     exception::CommandLineNotParsed ex;
-    ex.getMessage() << "Wrong number of command-line arguments: excepted=2 actual=" << nbArgs;
+    ex.getMessage() << "Wrong number of command-line arguments: expected=2 actual=" << nbArgs;
     throw ex;
   }
 
diff --git a/catalogue/cta-catalogue-admin-host-create.1cta b/catalogue/cta-catalogue-admin-host-create.1cta
index 5056f164a786fdf0634db516e72d3301960c53ae..8876802544c3b338bd0c5c84657652c9af78e002 100644
--- a/catalogue/cta-catalogue-admin-host-create.1cta
+++ b/catalogue/cta-catalogue-admin-host-create.1cta
@@ -17,7 +17,7 @@
 .SH NAME
 cta-catalogue-admin-host-create \- Create a CTA admin host
 .SH SYNOPSIS
-.BI "cta-catalogue-admin-host-create databaseConnectionFile -n <hostname> -c <comment> [-h]"
+.BI "cta-catalogue-admin-host-create databaseConnectionFile -n <hostname> -m <comment> [-h]"
 
 .SH DESCRIPTION
 \fBcta-catalogue-admin-host-create\fP is a command-line tool that creates an
@@ -36,7 +36,7 @@ CTA catalogue database.
 \fB\-n, \-\-hostname <hostname>
 The name of the admin host to be created.
 .TP
-\fB\-c, \-\-comment <comment>
+\fB\-m, \-\-comment <comment>
 Comment describing the creation of the admin host.
 .TP
 \fB\-h, \-\-help
diff --git a/catalogue/cta-catalogue-admin-user-create.1cta b/catalogue/cta-catalogue-admin-user-create.1cta
index 543b3fba70cf2edc3d4c64a311fca645cbd22052..2c7f93ae7b8d5398f394b0880925e311efeb2e45 100644
--- a/catalogue/cta-catalogue-admin-user-create.1cta
+++ b/catalogue/cta-catalogue-admin-user-create.1cta
@@ -17,7 +17,7 @@
 .SH NAME
 cta-catalogue-admin-user-create \- Create a CTA admin user
 .SH SYNOPSIS
-.BI "cta-catalogue-admin-user-create databaseConnectionFile -u <username> -c <comment> [-h]"
+.BI "cta-catalogue-admin-user-create databaseConnectionFile -u <username> -m <comment> [-h]"
 
 .SH DESCRIPTION
 \fBcta-catalogue-admin-user-create\fP is a command-line tool that creates an
@@ -36,7 +36,7 @@ CTA catalogue database.
 \fB\-u, \-\-username <username>
 The name of the admin user to be created.
 .TP
-\fB\-c, \-\-comment <comment>
+\fB\-m, \-\-comment <comment>
 Comment describing the creation of the admin user.
 .TP
 \fB\-h, \-\-help
diff --git a/continuousintegration/orchestration/tests/prepare_tests.sh b/continuousintegration/orchestration/tests/prepare_tests.sh
index f5105d372e9f21c70141208465503e0f4b95d156..d911505184892745997f8cf44740ff99ce4a4450 100755
--- a/continuousintegration/orchestration/tests/prepare_tests.sh
+++ b/continuousintegration/orchestration/tests/prepare_tests.sh
@@ -58,11 +58,11 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA configuration for tests"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -m "docker cli"
   # to allow client connecting to dual stack IPv6/IPv4 xrootd server
   # otherwise only use IPv4 by adding '-I v4' to ExecStart line in /etc/systemd/system/cta-frontend.service
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname [::ffff:${ctacliIP}] -c "docker cli"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username ctaadmin1 -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname [::ffff:${ctacliIP}] -m "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username ctaadmin1 -m "docker cli"
   kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin logicallibrary add \
      --name ${LIBRARYNAME}                                            \
      --comment "ctasystest"                                           
diff --git a/continuousintegration/orchestration/tests/systest.sh b/continuousintegration/orchestration/tests/systest.sh
index 54f779d952b0bc8498aa69884d0846e800a22938..b040006485c3ddbcf31c4bb96be8fb4951ee14f2 100755
--- a/continuousintegration/orchestration/tests/systest.sh
+++ b/continuousintegration/orchestration/tests/systest.sh
@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -m "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -m "docker cli"
   kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
      --name ${LIBRARYNAME}                                            \
      --comment "ctasystest"                                           
diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh
index 62eb88b846b930f0e00d0b8b3408d22cdab827af..45622843a16fc39dcb3f49cd1db10df4214be2cb 100755
--- a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh
+++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh
@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -m "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -m "docker cli"
 kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
       --name ${LIBRARYNAME}                                            \
       --comment "ctasystest"                                           
diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh
index 954ad73c726ac00b8670b97d4773e261f885ae38..28d123f22d71794076941411b08d6cba03513ef5 100755
--- a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh
+++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh
@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -m "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -m "docker cli"
 kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
       --name ${LIBRARYNAME}                                            \
       --comment "ctasystest"