diff --git a/internal/entity/camera_makes.go b/internal/entity/camera_makes.go
index e01f8bb5f..5ff8fa0ae 100644
--- a/internal/entity/camera_makes.go
+++ b/internal/entity/camera_makes.go
@@ -6,8 +6,11 @@ var CameraMakes = map[string]string{
 	"apple":                   "Apple",
 	"Casio":                   "CASIO",
 	"CASIO COMPUTER":          "CASIO",
+	"CASIO COMPUTER CO":       "CASIO",
 	"CASIO COMPUTER CO.":      "CASIO",
+	"CASIO COMPUTER CO.,LTD":  "CASIO",
 	"CASIO COMPUTER CO.,LTD.": "CASIO",
+	"CASIO CORPORATION":       "CASIO",
 	"Kodak":                   "KODAK",
 	"EASTMAN KODAK":           "KODAK",
 	"EASTMAN KODAK COMPANY":   "KODAK",
@@ -24,14 +27,47 @@ var CameraMakes = map[string]string{
 	"FUJIFILM CORPORATION":    "FUJIFILM",
 	"Huawei":                  "HUAWEI",
 	"RaspberryPi":             "Raspberry Pi",
+	"Pentax":                  "PENTAX",
+	"PENTAX Corporation":      "PENTAX",
+	"PENTAX CORPORATION":      "PENTAX",
+	"Blackberry":              "BlackBerry",
+	"Research In Motion":      "BlackBerry",
+	"Sony":                    "SONY",
+	"VenTrade GmbH, Germany":  "VenTrade",
 }
 
 var CameraModels = map[string]string{
-	"AI2302":                     "ASUS Zenfone 10",
-	"ASUS_AI2302":                "ASUS Zenfone 10",
+	"AI2302":                     "Zenfone 10",
+	"_AI2302":                    "Zenfone 10",
+	"ASUS_AI2302":                "Zenfone 10",
+	"Blackberry Q5":              "BlackBerry Q5",
+	"Blackberry Q10":             "BlackBerry Q10",
+	"Blackberry Z10":             "BlackBerry Z10",
+	"Blackberry Z3":              "BlackBerry Z3",
+	"Blackberry Z30":             "BlackBerry Z30",
+	"Blackberry Leap":            "BlackBerry Leap",
+	"Blackberry Classic":         "BlackBerry Classic",
+	"Blackberry Passport":        "BlackBerry Passport",
 	"iPhone SE (1st generation)": "iPhone SE",
 	"iPhone SE (2nd generation)": "iPhone SE",
 	"iPhone SE (3rd generation)": "iPhone SE",
+	"iPhone SE (4th generation)": "iPhone SE",
+	"iPhone SE (5th generation)": "iPhone SE",
+	"iPad (1st generation)":      "iPad",
+	"iPad (2nd generation)":      "iPad",
+	"iPad (3rd generation)":      "iPad",
+	"iPad (4th generation)":      "iPad",
+	"iPad (5th generation)":      "iPad",
+	"iPad Air (1st generation)":  "iPad Air",
+	"iPad Air (2nd generation)":  "iPad Air",
+	"iPad Air (3rd generation)":  "iPad Air",
+	"iPad Air (4th generation)":  "iPad Air",
+	"iPad Air (5th generation)":  "iPad Air",
+	"iPad Pro (1st generation)":  "iPad Pro",
+	"iPad Pro (2nd generation)":  "iPad Pro",
+	"iPad Pro (3rd generation)":  "iPad Pro",
+	"iPad Pro (4th generation)":  "iPad Pro",
+	"iPad Pro (5th generation)":  "iPad Pro",
 	"SM-G780F":                   "Galaxy S20",
 	"SM-G781B":                   "Galaxy S20 FE",
 	"SM-G991A":                   "Galaxy S21",