Man, there were a lot of renamings :)
Reviewed-by: NRichard Levitte <levitte@openssl.org>