Name Tweaks

Tweaks certain block or item names to avoid confusion, or just to make the game look better