combat package rename

Was bugging for me still.