diff --git a/data/categories.txt b/data/categories.txt
index 419c6f1be4..d773e66074 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10666,10 +10666,10 @@ zh-Hans:锁匠
 zh-Hant:鎖匠
 
 craft-painter
-en:Painter
+en:House Painter|painter|decorator
 ar:رسام
 be:Мастак
-bg:Художник
+bg:Бояджия
 cs:Malíř
 da:Maler
 de:Maler
diff --git a/data/editor.config b/data/editor.config
index 54c68a2373..d09d402db3 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -228,7 +228,7 @@
         <include group="poi_internet" />
         <include field="operator" />
       </type>
-      <type id="amenity-car_sharing" can_add="no">
+      <type id="amenity-car_sharing">
         <include group="poi" />
         <include field="operator" />
         <include field="website" />
@@ -406,6 +406,7 @@
         <include group="poi" />
         <include field="operator" />
       </type>
+      <!-- Too generic to be added -->
       <type id="craft" can_add="no">
         <include group="poi_internet" />
       </type>
@@ -421,7 +422,7 @@
       <type id="craft-carpenter">
         <include group="poi_internet" />
       </type>
-      <!-- Not addable because ambigous with shop=confectionery -->
+      <!-- Not addable because ambiguous with shop=confectionery -->
       <type id="craft-confectionery" group="shop" can_add="no">
         <include group="poi_internet" />
       </type>
@@ -431,7 +432,7 @@
       <type id="craft-electronics_repair">
         <include group="poi_internet" />
       </type>
-      <type id="craft-gardener" can_add="no">
+      <type id="craft-gardener">
         <include group="poi_internet" />
       </type>
       <type id="craft-handicraft">
@@ -440,10 +441,10 @@
       <type id="craft-hvac" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="craft-metal_construction" can_add="no">
+      <type id="craft-metal_construction">
         <include group="poi_internet" />
       </type>
-      <type id="craft-painter" can_add="no">
+      <type id="craft-painter">
         <include group="poi_internet" />
       </type>
       <type id="craft-photographer">
@@ -529,7 +530,7 @@
         <include field="name" />
 <!--        <include field="wikipedia" />-->
       </type>
-      <!-- Not addable as mapping as a node is uncommon, also ambigous with amenity-grave_yard -->
+      <!-- Not addable as mapping as a node is uncommon, also ambiguous with amenity-grave_yard -->
       <type id="landuse-cemetery" can_add="no">
         <include group="poi" />
 <!--        <include field="wikipedia" />-->
@@ -574,6 +575,7 @@
         <include field="height" />
 <!--        <include field="wikipedia" />-->
       </type>
+      <!-- Too generic to be added -->
       <type id="office" can_add="no">
         <include group="poi_internet" />
       </type>
@@ -659,6 +661,10 @@
       <type id="shop-bakery" group="shop">
         <include group="poi_internet" />
       </type>
+      <!-- Not addable because ambiguous with shop=bakery -->
+      <type id="shop-pastry" group="shop" can_add="no">
+        <include group="poi_internet" />
+      </type>
       <type id="shop-beauty">
         <include group="poi_internet" />
       </type>
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 3ebb4b9a4f..236eedb1d3 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -7472,12 +7472,12 @@
     zh-Hant = 鐵工
 
   [type.craft.painter]
-    en = Painter
+    en = House Painter
     af = Verwer
     ar = رسام
     az = Rəssam
     be = Мастак
-    bg = Художник
+    bg = Бояджия
     cs = Malíř
     da = Maler
     de = Maler