DAR-1615: Changes in function names