Hate crimes are distinct from common assault.
Terrorism is distinct from murder.
Attacking a LEO is distinct from attacking a civilian.
There is plenty of precedent for including intent or the specific target in the formulation of the charge, as well as taking it into account in the punishment phase.