Rename several things for recent rust stdlib changes