updated naming convention on blocks and items