CR changes: rename the function also in unit tests ;)