Rename 'ItemBlock' to 'BlockItem' as per convention