Self Discipline & Willpower, defined

Self Discipline, my definition:
To be able to keep to planned schedules.
To be able to concentrate at task at hand and not easily get distracted.
To be able to prioritize tasks, and to stick to it.

Willpower, my definition:
To not give up easily.
To persevere within reasonable predicted chance of success.
To be able to swallow pride/humiliation to do what is necessary.
To not be easily daunted by the amount of effort needed to accomplish something.

Gotta work on 'em.