Um, dont swap the block if you're gonna do this, all that is different from the d16z6 and d16y8 is the intake manifold, and the head, so just swap those if you are.