Add 1.7 blocks and fix block names