patches, renamings