Convert to new stream API function names