Apparently DSM6 is giving up on naming disorders and will instead name only the traits. So instead of being diagnosed as autistic and ADHD you'll be diagnosed with Hyperfocus, Executive Disfunction, Maladaptive Daydreaming and stuff like that...