Renaming patches to support full flavor in future