Undo texture name changes from this branch.

This reverts commit 47012a1d6a7168458e1bc6bdeabb9f11d0f4859c, so this
branch is only the anvil fixes.