Issue #2193577 by benjy: Rename Block Layout to Block layout for consistency.