Some renamings and namespace deletions.