Refactoring oncall to onduty

Tested/confirmed the functionality is as expected