Replace 'firearms' by 'marksmanship'

per #3737, plus fix minor typo