Upgrade find-and-replace for spec fixes