Replace deprecated function names