Rename some patches to be more concise. More to come once we can think of better names :p