I just replaced my PNP switch, and used a small framing square to just make sure the score on the end of the switch was lined up with the shaft (you'll see what I'm talking about when you have the thing apart). Honestly, you don't even need to do that, you can just eyeball it and it should be fine. I didn't use the Autozone PNP switch, so I wouldn't be able to help you on that aspect. Out of curiosity, is your check engine light on? Mine was, and still is, and I can't get the thing to turn off.