Renamed and tidied patches, all applied at -p1 now