include: Be consistent in naming regarding MSF's block.