Pathan and Pashtun is the same thing.
Khan was a title given to muslim rulers, and now is a common surname which is commonly used by the Pashtun people, due to the aryanisation of that particular part of asia.
I wonder if Genghis Khan was a muslim ruler.