Name/Registry cleaned up for blocks...On to items now