diff --git a/assets/config/labels.yml b/assets/config/labels.yml
index 09642f3f1..c93200e60 100644
--- a/assets/config/labels.yml
+++ b/assets/config/labels.yml
@@ -1843,16 +1843,16 @@ aircraft carrier:
     - vehicle
 
 airliner:
+  label: aircraft
   categories:
-    - aircraft
-    - fly
+    - airport
     - vehicle
 
 airship:
+  label: aircraft
   threshold: 0.5
   categories:
-    - aircraft
-    - fly
+    - airport
     - vehicle
 
 ambulance:
diff --git a/internal/entity/location.go b/internal/entity/location.go
index dade6758a..c44efd903 100644
--- a/internal/entity/location.go
+++ b/internal/entity/location.go
@@ -27,8 +27,8 @@ var locTypeLabels = map[string]string{
 	"residential": "residential area",
 	"museum": "museum",
 	"castle": "castle",
-	"terminal": "airport terminal",
-	"ferry terminal": "ferry terminal",
+	"terminal": "airport",
+	"ferry terminal": "harbor",
 	"bridge": "bridge",
 	"university": "university",
 	"mall": "mall",