renaming patches for consistency