Issue #3170139 by jhaskins, smustgrave, basvredeling: Block names are confusing when editing default layouts