Rename some remaining workspace -> blockSpace usages