Revert "New block/item name system."

This reverts commit c97491a311978859e0e2cd356bce3738a97a7dc1.