Rename scaffholding block to content_scaffholding for consistency