More ItemNames tweaks.
Fixed some item names, add more 1.8 items
Now using ImmutableMap.builder()