Renaming items that got renamed in gen 6
Merge pull request #1024 from WriggleNightbug/patch-2

Renaming items that got renamed in gen 6