Simplify CompTIA modifiers, add group names