Some renamings.