diff --git a/test/cal.t b/test/cal.t
index 6ee5f2b40..c1f30bb23 100755
--- a/test/cal.t
+++ b/test/cal.t
@@ -65,7 +65,7 @@ if ($day <= 9)
 }
 
 # task cal   and   task cal y
-my $output = qx{../src/task rc:cal.rc rc._forcecolor:on cal 2>&1};
+my $output = qx{../src/task rc:cal.rc rc._forcecolor:on calendar 2>&1};
 if ($wday == 6 || $wday == 0)
 {
   like   ($output, qr/\[30;106m$day/,      'Current day is highlighted');
@@ -78,11 +78,11 @@ like   ($output, qr/$month\S*?\s+?$year/, 'Current month and year are displayed'
 $output = qx{../src/task rc:cal.rc add zero 2>&1};
 unlike ($output, qr/\[41m\d+/,       'No overdue tasks are present');
 unlike ($output, qr/\[43m\d+/,       'No due tasks are present');
-$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday cal 2>&1};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday calendar 2>&1};
 like   ($output, qr/Su Mo Tu/,       'Week starts on Sunday');
-$output = qx{../src/task rc:cal.rc rc.weekstart:Monday cal 2>&1};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday calendar 2>&1};
 like   ($output, qr/Fr Sa Su/,       'Week starts on Monday');
-$output = qx{../src/task rc:cal.rc cal y 2>&1};
+$output = qx{../src/task rc:cal.rc calendar y 2>&1};
 like   ($output, qr/$month\S*?\s+?$year/,         'Current month and year are displayed');
 if ($month eq "Jan")
 {
@@ -98,19 +98,19 @@ unlike ($output, qr/$month\S*?\s+?$nextyear/,     'Current month and year ahead
 # task cal due   and   task cal due y
 qx{../src/task rc:cal.rc add due:20190515 one 2>&1};
 qx{../src/task rc:cal.rc add due:20200123 two 2>&1};
-$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due 2>&1};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on calendar due 2>&1};
 unlike ($output, qr/April 2019/,    'April 2019 is not displayed');
 like   ($output, qr/May 2019/,      'May 2019 is displayed');
 unlike ($output, qr/January 2020/,  'January 2020 is not displayed');
 like   ($output, qr/30;42m15/,      'Task 1 is color-coded due');
-$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due y 2>&1};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on calendar due y 2>&1};
 like   ($output, qr/30;42m23/,      'Task 2 is color-coded due');
 like   ($output, qr/April 2020/,    'April 2020 is displayed');
 unlike ($output, qr/May 2020/,      'May 2020 is not displayed');
 qx{../src/task rc:cal.rc ls 2>&1};
 qx{../src/task rc:cal.rc 1-3 del 2>&1};
 qx{../src/task rc:cal.rc add due:20080408 three 2>&1};
-$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due 2>&1};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on calendar due 2>&1};
 like   ($output, qr/April 2008/,     'April 2008 is displayed');
 like   ($output, qr/41m 8/,          'Task 3 is color-coded overdue');
 like   ($output, qr/37;100m19/,      'Saturday April 19, 2008 is color-coded');
@@ -118,7 +118,7 @@ like   ($output, qr/37;100m20/,      'Sunday April 20, 2008 is color-coded');
 like   ($output, qr/30;47m  1/,      'Weeknumbers are color-coded');
 
 # task cal 2016
-$output = qx{../src/task rc:cal.rc rc.weekstart:Monday cal 2016 2>&1};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday calendar 2016 2>&1};
 unlike ($output, qr/2015/,           'Year 2015 is not displayed');
 unlike ($output, qr/2017/,           'Year 2017 is not displayed');
 like   ($output, qr/January 2016/,   'January 2016 is displayed');
@@ -127,32 +127,32 @@ like   ($output, qr/53 +1/,          '2015 has 53 weeks (ISO)');
 like   ($output, qr/1 +4/,           'First week in 2016 starts with Mon Jan 4 (ISO)');
 like   ($output, qr/52 +26/,         'Last week in 2016 starts with Mon Dec 26 (ISO)');
 like   ($output, qr/9 +29/,          'Leap year - Feb 29 is Monday in week 9 (ISO)');
-$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday cal 2016 2>&1};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday calendar 2016 2>&1};
 like   ($output, qr/1 +1/,           'First week in 2016 starts with Fri Jan 1 (US)');
 like   ($output, qr/53 +25/,         'Last week in 2016 starts with Sun Dec 25 (US)');
-$output = qx{../src/task rc:cal.rc rc.weekstart:Monday rc.displayweeknumber:off cal 2016 2>&1};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday rc.displayweeknumber:off calendar 2016 2>&1};
 unlike ($output, qr/53/,             'Weeknumbers are not displayed');
 
 # task cal 4 2010
-$output = qx{../src/task rc:cal.rc rc.monthsperline:1 cal 4 2010 2>&1};
+$output = qx{../src/task rc:cal.rc rc.monthsperline:1 calendar 4 2010 2>&1};
 unlike ($output, qr/March 2010/,     'March 2010 is not displayed');
 like   ($output, qr/April 2010/,     'April 2010 is displayed');
 unlike ($output, qr/May 2010/,       'May 2010 is not displayed');
 
 # calendar offsets
-$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.monthsperline:1 cal 1 2011 2>&1};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.monthsperline:1 calendar 1 2011 2>&1};
 unlike ($output, qr/November 2010/,  'November 2010 is not displayed');
 like   ($output, qr/December 2010/,  'December 2010 is displayed');
 unlike ($output, qr/January 2011/,   'January  2011 is not displayed');
-$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:2 rc.monthsperline:1 cal 1 2011 2>&1};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:2 rc.monthsperline:1 calendar 1 2011 2>&1};
 unlike ($output, qr/January 2011/,   'January  2011 is not displayed');
 unlike ($output, qr/February 2011/,  'February 2011 is not displayed');
 like   ($output, qr/March 2011/,     'March 2011 is displayed');
 unlike ($output, qr/April 2011/,     'April 2011 is not displayed');
-$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:-12 rc.monthsperline:1 cal 2>&1};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:-12 rc.monthsperline:1 calendar 2>&1};
 like   ($output, qr/$month\S*?\s+?$prevyear/, 'Current month and year ahead are displayed');
 unlike ($output, qr/$month\S*?\s+?$year/,     'Current month and year are not displayed');
-$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:12 rc.monthsperline:1 cal 2>&1};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:12 rc.monthsperline:1 calendar 2>&1};
 unlike ($output, qr/$month\S*?\s+?$year/,     'Current month and year are not displayed');
 like   ($output, qr/$month\S*?\s+?$nextyear/, 'Current month and year ahead are displayed');
 
@@ -199,10 +199,10 @@ qx{../src/task rc:details.rc add due:20141231 six 2>&1};
 qx{../src/task rc:details.rc add due:20160101 seven 2>&1};
 qx{../src/task rc:details.rc add due:20081231 eight 2>&1};
 
-$output = qx{../src/task rc:details.rc rc.calendar.legend:no cal 2>&1};
+$output = qx{../src/task rc:details.rc rc.calendar.legend:no calendar 2>&1};
 unlike ($output, qr/Legend:/,      'Legend is not displayed');
 
-$output = qx{../src/task rc:details.rc cal rc.monthsperline:3 1 2015 2>&1};
+$output = qx{../src/task rc:details.rc calendar rc.monthsperline:3 1 2015 2>&1};
 like   ($output, qr/January 2015/, 'January 2015 is displayed');
 like   ($output, qr/20150105/,     'Due date 20150105 is displayed');
 like   ($output, qr/20150110/,     'Due date 20150110 is displayed');
@@ -211,12 +211,12 @@ unlike ($output, qr/20141231/,     'Due date 20141231 is not displayed');
 unlike ($output, qr/20150410/,     'Due date 20150410 is not displayed');
 like   ($output, qr/3 tasks/,      '3 due tasks are displayed');
 
-$output = qx{../src/task rc:details.rc cal due 2>&1};
+$output = qx{../src/task rc:details.rc calendar due 2>&1};
 like   ($output, qr/December 2008/, 'December 2008 is displayed');
 like   ($output, qr/20081231/,      'Due date 20081231 is displayed');
 like   ($output, qr/1 task/,        '1 due task is displayed');
 
-$output = qx{../src/task rc:details.rc cal 2015 2>&1};
+$output = qx{../src/task rc:details.rc calendar 2015 2>&1};
 like   ($output, qr/January 2015/,  'January 2015 is displayed');
 like   ($output, qr/December 2015/, 'December 2015 is displayed');
 unlike ($output, qr/20141231/,      'Due date 20141231 is not displayed');
@@ -236,12 +236,12 @@ if ( $mon <= 9)
 my $duedate = $year.$mon.$day;
 
 qx{../src/task rc:details.rc add due:$duedate rc.monthsperline:1 nine 2>&1};
-$output = qx{../src/task rc:details.rc cal 2>&1};
+$output = qx{../src/task rc:details.rc calendar 2>&1};
 like   ($output, qr/$month\S*?\s+?$year/, 'Current month and year are displayed');
 like   ($output, qr/$duedate/,            'Due date on current day is displayed');
 like   ($output, qr/1 task/,              '1 due task is displayed');
 
-$output = qx{../src/task rc:details.rc cal rc.monthsperline:1 1 2015 2>&1};
+$output = qx{../src/task rc:details.rc calendar rc.monthsperline:1 1 2015 2>&1};
 like   ($output, qr/Date/,         'Word Date is displayed');
 like   ($output, qr/Holiday/,      'Word Holiday is displayed');
 like   ($output, qr/20150101/,     'Holiday 20150101 is displayed');
@@ -251,7 +251,7 @@ like   ($output, qr/AAAA/,         'Holiday name AAAA is displayed');
 like   ($output, qr/BBBBBB/,       'Holiday name BBBBBB is displayed');
 like   ($output, qr/åäö/,          'Holiday name åäö is displayed');
 
-$output = qx{../src/task rc:details.rc cal rc._forcecolor:on rc.monthsperline:1 rc.calendar.details:sparse rc.calendar.holidays:sparse 1 2015 2>&1};
+$output = qx{../src/task rc:details.rc calendar rc._forcecolor:on rc.monthsperline:1 rc.calendar.details:sparse rc.calendar.holidays:sparse 1 2015 2>&1};
 unlike ($output, qr/Date/,         'Word Date is not displayed');
 unlike ($output, qr/Holiday/,      'Word Holiday is not displayed');
 like   ($output, qr/30;103m 1/,    'Holiday AAAA is color-coded');