Thank you, this is an improvement over the previous wording.
Would you consider revising the line item about descriptive names too? I don’t think it’s very tenable for us to cast judgment on how creatively certain religious denominations name their individual houses of worship. Most instances of “Primitive Methodist Chapel” would be named after the Primitive Methodist Church or Primitive Methodism; they aren’t the result of someone snarking about how well the chapel is built.
As for the line item about constructive names, there’s a whole proposal in progress about eliminating one glaring exception for the names of route relations: