I do find it odd that it settled into ADHD-I, ADHD-H and ADHD-C; the one that is primarily expressed through hyperactivity literally is called “Attention Deficit Hyperactivity Disorder - Hyperactive”.
Removing the H and using the subtypes would add clarity for sure.
How do you feel about square drive? I’m no carpenter, just someone that’s done enough work around the house, but I’ve found that Torx are the best option but square is a close second (but I don’t think I’ve used them in any especially high torque situations, and they may fall short there).