654-replace deprecated function names