I never considered motivation and willpower to be separate, but I think your breakdown makes a lot of sense.