Appogiatura: A type of non-chord tone where a dissonant note is approached by a leap and resolved by step into a consonant note.
Suspension: A type of non-chord tone where a consonant note from the previous chord is held over into the next chord as a dissonance before resolving down.
Passing Tone: A type of non-chord tone that fills in the gap between two chord tones, usually approached and resolved by step.