utsab, rnjn | BDSHR-219 | renaming handlers for better code readability