Finishes wooden/metallic naming conversion

I had missed a pair of bolts and have changed fishing spears to match as well, so everything should be good in adjective land now.
Merge pull request #7869 from reverieAlice/meterial_name_changes

Finishes wooden/metallic naming conversion