Fixed #9 - Changed some item names