Consisten naming across the standard library

Details are explained in #1516.