Dyskinesia is an umbrella term encompassing a range of different movements. These are all movements that can be out of your control. Dyskinesia is very common in cerebral palsy.
Spasticity is usually caused by central nervous system injuries, such as brain injuries or spinal cord injuries. Spasticity is a little different from stiffness.