Item Names

Hopefully this will fix everything.
Merge branch 'JohnDev-Branch' of https://github.com/bgrayd/Tarsus into JohnDev-Branch