"N+ in nwell" and "P+ in p-substrate" are called "TAP" in sky130 and differentiated from "DIFF" which is "N+ in p-substrate" and "P+ in nwell". Magic has always made this distinction, plus it always distinguishes between N-diffusion and P-diffusion. So there are four types of diffusion in magic, called "ndiff", "pdiff" (corresponding to "DIFF" in sky130), and "nsd" and "psd" (corresponding to "TAP" in sky130).
However, magic also creates different types for extraction of devices, so that if you are trying to create a diode that will be extracted as a diode device, you should use the "ndiode" layer (or "ndiodelvs", "nndiode", or "mvndiode", depending on what you're trying to achieve).
Or you can use the parameterized device generator to create a diode structure for you.