Rename some pattern types to be more descriptive, and fix diagonal cross