Removed prefix from item and block names