Adding my two cents, discipline is for teaching the behavior you want to see performed, ie holding bottom out correctly for spanks or licking properly one's pussy (I'm a Domme). Punishment is for behavior that is not tolerable, ie pouting or swearing.
Playing is all other times