DAR-2129: Changed const and function names