Finish renaming, fixed warning

Turned out the warning came from me missing a line of code. D'oh.
Fixed that and renamed menu entries to tactical tonfa.