Fixed bug, renew block and item names