Minor renamings.