Changing deprecated function names