Fix redundant item and blocks names