Unrename a few more (wrongly renamed).