Refactor updating of a block with some early renaming