DAR-1615: Changed function names