diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 676c9d8e62..8890b803bd 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 9081521956..45ce6de5d6 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -52309,7 +52309,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 17
@@ -52317,7 +52316,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 18
@@ -52325,23 +52323,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 19
@@ -52349,23 +52330,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 20
@@ -52373,23 +52337,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 20
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
 }
 cont {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d68be566f7..3b61bbd867 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 43cd93a771..01b56ab999 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -50568,7 +50568,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 17
@@ -50576,7 +50575,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 18
@@ -50584,23 +50582,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 19
@@ -50608,23 +50589,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 20
@@ -50632,23 +50596,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 20
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
 }
 cont {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 1ea804f367..5f9f552b58 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index c72c329e4e..290e3081b3 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -50742,7 +50742,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 17
@@ -50750,7 +50749,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 18
@@ -50758,23 +50756,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 19
@@ -50782,23 +50763,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 20
@@ -50806,23 +50770,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 20
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 180c19160b..fcb16d70a4 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 0cc8ffa6b9..ce93fec611 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -52625,7 +52625,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 17
@@ -52633,7 +52632,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 18
@@ -52641,23 +52639,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 19
@@ -52665,23 +52646,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 20
@@ -52689,23 +52653,6 @@ cont {
       color: 11190117
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 20
-    area {
-      color: 11190117
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index ac4950f8ca..32ed566f62 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 5d91a9e4a8..c9a823fe27 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -52799,7 +52799,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 17
@@ -52807,7 +52806,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
   }
   element {
     scale: 18
@@ -52815,23 +52813,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 19
@@ -52839,23 +52820,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
   element {
     scale: 20
@@ -52863,23 +52827,6 @@ cont {
       color: 1317888
       priority: -1930
     }
-    apply_if: "!name"
-  }
-  element {
-    scale: 20
-    area {
-      color: 1317888
-      priority: -1930
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 200
-    }
-    apply_if: "name"
   }
 }
 cont {
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index f6478ec0a3..73c66f6c03 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -119,7 +119,7 @@ natural-bare_rock                                   # area z12- (also has captio
 === 80
 
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12- (also has caption z18-)
+leisure-garden-residential                          # area z12-
 leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
 leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
 leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 3645790342..ca3a3f2639 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -119,7 +119,7 @@ natural-bare_rock                                   # area z12- (also has captio
 === 80
 
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12- (also has caption z18-)
+leisure-garden-residential                          # area z12-
 leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
 leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
 leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)