Clean up + name-change for block wrapper