Repository: hesa/foss-licenses (language: python)

Issue:
Don't use scancode_key as aliases
**Problem**
Currently x11 gets normalized to `ICU` 
```
$ flame --verbose license x11
ICU
 * "x11" -> "ICU via "scancode"
```

This is the case since the `scancode_key` is automatically added as an alias and for `ICU` the `scancode_key` is `x11`. 

**Solution**
In Python: do not look for the `scancode_key` when identifying the license
in JSON license files: add relevant `scancode_key`s to alias list (e.g. not `x11` for `ICU`)


Discussion / hints:
in the function `__identify_license` in the file `license_db.py`, remove

```
        elif name in self.license_db[SCANCODE_KEYS_TAG]:
            ret_name = self.license_db[SCANCODE_KEYS_TAG][name]
            ret_id = 'scancode_key'
```

Fix patch:
diff --git a/python/flame/license_db.py b/python/flame/license_db.py
index d8a1085..fe36797 100644
--- a/python/flame/license_db.py
+++ b/python/flame/license_db.py
@@ -228,9 +228,6 @@ def __identify_license(self, name):
         elif name in self.license_db[FLAME_ALIASES_TAG]:
             ret_name = self.license_db[FLAME_ALIASES_TAG][name]
             ret_id = 'alias'
-        elif name in self.license_db[SCANCODE_KEYS_TAG]:
-            ret_name = self.license_db[SCANCODE_KEYS_TAG][name]
-            ret_id = 'scancode_key'
         else:
             raise FlameException(f'Could not identify license from "{name}"')
 
@@ -330,11 +327,6 @@ def expression_license(self, license_expression, validations=None, update_dual=T
                                                       license_expression)
         replacements += ret['identifications']
 
-        ret = self.__update_license_expression_helper(self.license_db[SCANCODE_KEYS_TAG],
-                                                      'scancode',
-                                                      ret['license_expression'])
-        replacements += ret['identifications']
-
         ret = self.__update_license_expression_helper(self.license_db[LICENSE_OPERATORS_TAG],
                                                       'operator',
                                                       ret['license_expression'],
diff --git a/var/licenses/0BSD.json b/var/licenses/0BSD.json
index f430650..e18531b 100644
--- a/var/licenses/0BSD.json
+++ b/var/licenses/0BSD.json
@@ -1,22 +1,23 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "BSD Zero Clause License",
-  "scancode_key": "bsd-zero", 
-  "spdxid": "0BSD",
-  "aliases": [
-   "0BSD",
-   "BSD Zero Clause License",
-   "scancode://bsd-zero",
-   "scancode:bsd-zero",
-   "osi:0BSD",
-   "BSD 0-Clause",
-   "the Zero-Clause BSD license",
-   "BSD-0-Clause",
-   "Zero-Clause BSD license",
-   "Zero BSD",
-   "Zero-Clause BSD"
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "BSD Zero Clause License",
+    "scancode_key": "bsd-zero", 
+    "spdxid": "0BSD",
+    "aliases": [
+        "0BSD",
+        "BSD Zero Clause License",
+        "scancode://bsd-zero",
+        "scancode:bsd-zero",
+        "osi:0BSD",
+        "BSD 0-Clause",
+        "the Zero-Clause BSD license",
+        "BSD-0-Clause",
+        "Zero-Clause BSD license",
+        "Zero BSD",
+        "Zero-Clause BSD",
+        "bsd-zero"
   ]
 }
diff --git a/var/licenses/AFL-1.1.json b/var/licenses/AFL-1.1.json
index 1a990da..21dd8e4 100644
--- a/var/licenses/AFL-1.1.json
+++ b/var/licenses/AFL-1.1.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Academic Free License 1.1",
-  "scancode_key": "afl-1.1",
-  "spdxid": "AFL-1.1",
-  "aliases": [
-   "Academic Free License v1.1",
-   "Academic Free License 1.1",
-   "scancode://afl-1.1",
-   "AFL 1.1",
-   "AFL, Version 1.1",
-   "AFL, 1.1",
-   "scancode:afl-1.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Academic Free License 1.1",
+    "scancode_key": "afl-1.1",
+    "spdxid": "AFL-1.1",
+    "aliases": [
+        "Academic Free License v1.1",
+        "Academic Free License 1.1",
+        "scancode://afl-1.1",
+        "AFL 1.1",
+        "AFL, Version 1.1",
+        "AFL, 1.1",
+        "scancode:afl-1.1",
+        "afl-1.1"
+    ]
 }
diff --git a/var/licenses/AFL-1.2.json b/var/licenses/AFL-1.2.json
index 17bfc64..ffd2332 100644
--- a/var/licenses/AFL-1.2.json
+++ b/var/licenses/AFL-1.2.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Academic Free License 1.2",
-  "scancode_key": "afl-1.2",
-  "spdxid": "AFL-1.2",
-  "aliases": [
-   "AFL-1.2",
-   "Academic Free License 1.2",
-   "scancode://afl-1.2",
-   "AFL 1.2",
-   "AFL, Version 1.2",
-   "AFL, 1.2",
-   "scancode:afl-1.2"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Academic Free License 1.2",
+    "scancode_key": "afl-1.2",
+    "spdxid": "AFL-1.2",
+    "aliases": [
+        "AFL-1.2",
+        "Academic Free License 1.2",
+        "scancode://afl-1.2",
+        "AFL 1.2",
+        "AFL, Version 1.2",
+        "AFL, 1.2",
+        "scancode:afl-1.2",
+        "afl-1.2"
+    ]
 }
diff --git a/var/licenses/AFL-2.0.json b/var/licenses/AFL-2.0.json
index 86f4564..7795b90 100644
--- a/var/licenses/AFL-2.0.json
+++ b/var/licenses/AFL-2.0.json
@@ -1,22 +1,23 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Academic Free License 2.0",
-  "scancode_key": "afl-2.0",
-  "spdxid": "AFL-2.0",
-  "aliases": [
-   "Academic Free License v2.0",
-   "Academic Free License 2.0",
-   "scancode://afl-2.0",
-   "AFL 2.0",
-   "AFL, Version 2.0",
-   "AFL, 2.0",
-   "Academic Free License version 2.0",
-   "Academic Free License Version 2.0",
-   "ACADEMIC FREE LICENSE Version 2.0",
-   "Academic Free License v. 2.0",
-   "scancode:afl-2.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Academic Free License 2.0",
+    "scancode_key": "afl-2.0",
+    "spdxid": "AFL-2.0",
+    "aliases": [
+        "Academic Free License v2.0",
+        "Academic Free License 2.0",
+        "scancode://afl-2.0",
+        "AFL 2.0",
+        "AFL, Version 2.0",
+        "AFL, 2.0",
+        "Academic Free License version 2.0",
+        "Academic Free License Version 2.0",
+        "ACADEMIC FREE LICENSE Version 2.0",
+        "Academic Free License v. 2.0",
+        "scancode:afl-2.0",
+        "afl-2.0"
+    ]
 }
diff --git a/var/licenses/AFL-2.1.json b/var/licenses/AFL-2.1.json
index b5d90cd..e33e360 100644
--- a/var/licenses/AFL-2.1.json
+++ b/var/licenses/AFL-2.1.json
@@ -1,22 +1,23 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Academic Free License 2.1",
-  "scancode_key": "afl-2.1",
-  "spdxid": "AFL-2.1",
-  "aliases": [
-   "Academic Free License v2.1",
-   "Academic Free License 2.1",
-   "Academic Free License Version 2.1",
-   "scancode://afl-2.1",
-   "AFL 2.1",
-   "AFL, Version 2.1",
-   "AFL, 2.1",
-   "Academic Free License version 2.1",
-   "ACADEMIC FREE LICENSE Version 2.1",
-   "Academic Free License v. 2.1",
-   "scancode:afl-2.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Academic Free License 2.1",
+    "scancode_key": "afl-2.1",
+    "spdxid": "AFL-2.1",
+    "aliases": [
+        "Academic Free License v2.1",
+        "Academic Free License 2.1",
+        "Academic Free License Version 2.1",
+        "scancode://afl-2.1",
+        "AFL 2.1",
+        "AFL, Version 2.1",
+        "AFL, 2.1",
+        "Academic Free License version 2.1",
+        "ACADEMIC FREE LICENSE Version 2.1",
+        "Academic Free License v. 2.1",
+        "scancode:afl-2.1",
+        "afl-2.1"
+    ]
 }
diff --git a/var/licenses/AGPL-3.0-or-later.json b/var/licenses/AGPL-3.0-or-later.json
index b8da39b..b1b28ee 100644
--- a/var/licenses/AGPL-3.0-or-later.json
+++ b/var/licenses/AGPL-3.0-or-later.json
@@ -1,50 +1,51 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU Affero General Public License 3.0 or later",
-  "scancode_key": "agpl-3.0-plus",
-  "spdxid": "AGPL-3.0-or-later",
-  "aliases": [
-   "AGPL-3.0-or-later",
-   "AGPL-3.0+",
-   "AGPL3.0+",
-   "AGPL3+",
-   "AGPL (v3 or later)",
-   "Affero General Public License 3.0 or later",
-   "GNU Affero General Public License v3.0 or later",
-   "GNU Affero General Public License 3.0 (or any later version)",
-   "scancode://agpl-3.0-plus",
-   "AGPL 3.0 or later",
-   "AGPLv3+",
-   "GNU Affero General Public License, Version 3.0+",
-   "GNU AFFERO GENERAL PUBLIC LICENSE Version 3+",
-   "GNU AFFERO GENERAL PUBLIC LICENSE v3+",
-   "GNU AFFERO GENERAL PUBLIC LICENSE, version 3.0+",
-   "GNU Affero General Public License (AGPL) v3+",
-   "GNU Affero General Public License (AGPL) version 3.0+",
-   "GNU Affero General Public License 3.0+",
-   "GNU Affero General Public License Version 3+",
-   "GNU Affero General Public License v3+",
-   "GNU Affero General Public License v3 or later",
-   "GNU Affero General Public License v3.0+",
-   "GNU Affero General Public License version 3+",
-   "GNU Affero General Public License version 3 or later",
-   "GNU Affero General Public License version 3.0+",
-   "GNU Affero General Public License version 3.0 or later",
-   "GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
-   "GNU AGPL version 3 or any later version",
-   "Affero GPLv3+",
-   "GNO Affero GPL v3.0+",
-   "AGPL v3+",
-   "AGPL-V3+",
-   "AGPL-v3+",
-   "Affero GPL3+",
-   "General Affero Public License version 3+",
-   "Affero GNU Public License Version 3+",
-   "scancode:agpl-3.0-plus",
-   "AGPLv3.0+",
-   "AGPL-3+"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU Affero General Public License 3.0 or later",
+    "scancode_key": "agpl-3.0-plus",
+    "spdxid": "AGPL-3.0-or-later",
+    "aliases": [
+        "AGPL-3.0-or-later",
+        "AGPL-3.0+",
+        "AGPL3.0+",
+        "AGPL3+",
+        "AGPL (v3 or later)",
+        "Affero General Public License 3.0 or later",
+        "GNU Affero General Public License v3.0 or later",
+        "GNU Affero General Public License 3.0 (or any later version)",
+        "scancode://agpl-3.0-plus",
+        "AGPL 3.0 or later",
+        "AGPLv3+",
+        "GNU Affero General Public License, Version 3.0+",
+        "GNU AFFERO GENERAL PUBLIC LICENSE Version 3+",
+        "GNU AFFERO GENERAL PUBLIC LICENSE v3+",
+        "GNU AFFERO GENERAL PUBLIC LICENSE, version 3.0+",
+        "GNU Affero General Public License (AGPL) v3+",
+        "GNU Affero General Public License (AGPL) version 3.0+",
+        "GNU Affero General Public License 3.0+",
+        "GNU Affero General Public License Version 3+",
+        "GNU Affero General Public License v3+",
+        "GNU Affero General Public License v3 or later",
+        "GNU Affero General Public License v3.0+",
+        "GNU Affero General Public License version 3+",
+        "GNU Affero General Public License version 3 or later",
+        "GNU Affero General Public License version 3.0+",
+        "GNU Affero General Public License version 3.0 or later",
+        "GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
+        "GNU AGPL version 3 or any later version",
+        "Affero GPLv3+",
+        "GNO Affero GPL v3.0+",
+        "AGPL v3+",
+        "AGPL-V3+",
+        "AGPL-v3+",
+        "Affero GPL3+",
+        "General Affero Public License version 3+",
+        "Affero GNU Public License Version 3+",
+        "scancode:agpl-3.0-plus",
+        "agpl-3.0-plus",
+        "AGPLv3.0+",
+        "AGPL-3+"
+    ]
 }
diff --git a/var/licenses/APSL-2.0.json b/var/licenses/APSL-2.0.json
index 2726c0d..0bb8e1d 100644
--- a/var/licenses/APSL-2.0.json
+++ b/var/licenses/APSL-2.0.json
@@ -18,6 +18,7 @@
         "Apple Public Source License Ver. 2.0",
         "scancode:apsl-2.0",
         "osi:APSL-2.0",
-        "APSL-2"
+        "APSL-2",
+        "apsl-2.0"
     ]
 }
diff --git a/var/licenses/Apache-1.0.json b/var/licenses/Apache-1.0.json
index 17d95fb..eff478b 100644
--- a/var/licenses/Apache-1.0.json
+++ b/var/licenses/Apache-1.0.json
@@ -1,22 +1,23 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": "",
-    "date": "2023-08-29"
-  },
-  "name": "Apache License 1.0",
-  "scancode_key": "apache-2.0",
-  "spdxid": "Apache-1.0",
-  "aliases": [
-    "Apache License-1.0",
-    "Apache (v1.0)",
-    "Apache Software License 1.0",
-    "ASL 1.0",
-    "Apache Software License, Version 1.0",
-    "Apache License 1.0",
-    "scancode://apache-1.0",
-    "http://www.apache.org/licenses/LICENSE-1.0",
-    "https://spdx.org/licenses/apache-1.0",
-    "scancode:apache-1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": "",
+        "date": "2023-08-29"
+    },
+    "name": "Apache License 1.0",
+    "scancode_key": "apache-1.0",
+    "spdxid": "Apache-1.0",
+    "aliases": [
+        "Apache License-1.0",
+        "Apache (v1.0)",
+        "Apache Software License 1.0",
+        "ASL 1.0",
+        "Apache Software License, Version 1.0",
+        "Apache License 1.0",
+        "scancode://apache-1.0",
+        "http://www.apache.org/licenses/LICENSE-1.0",
+        "https://spdx.org/licenses/apache-1.0",
+        "scancode:apache-1.0",
+        "apache-1.0"
+    ]
 }
diff --git a/var/licenses/Apache-1.1.json b/var/licenses/Apache-1.1.json
index 24da488..d840c3f 100644
--- a/var/licenses/Apache-1.1.json
+++ b/var/licenses/Apache-1.1.json
@@ -1,26 +1,27 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": "",
-    "date": "2023-08-29"
-  },
-  "name": "Apache License 1.1",
-  "scancode_key": "apache-1.1",
-  "spdxid": "Apache-1.1",
-  "aliases": [
-    "Apache License 1.1",
-    "Apache (v1.1)",
-    "Apache Software License 1.1",
-    "ASL 1.1",
-    "Apache Software License, Version 1.1",
-    "scancode://apache-1.1",
-    "Apache License Version 1.1",
-    "Apache Software License Version 1.1",
-    "Apache Software License version 1.1",
-    "Apache Software License v1.1",
-    "http://apache.org/licenses/LICENSE-1.1",
-    "https://spdx.org/licenses/apache-1.1",
-    "scancode:apache-1.1",
-    "osi:Apache-1.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": "",
+        "date": "2023-08-29"
+    },
+    "name": "Apache License 1.1",
+    "scancode_key": "apache-1.1",
+    "spdxid": "Apache-1.1",
+    "aliases": [
+        "Apache License 1.1",
+        "Apache (v1.1)",
+        "Apache Software License 1.1",
+        "ASL 1.1",
+        "Apache Software License, Version 1.1",
+        "scancode://apache-1.1",
+        "Apache License Version 1.1",
+        "Apache Software License Version 1.1",
+        "Apache Software License version 1.1",
+        "Apache Software License v1.1",
+        "http://apache.org/licenses/LICENSE-1.1",
+        "https://spdx.org/licenses/apache-1.1",
+        "scancode:apache-1.1",
+        "osi:Apache-1.1",
+        "apache-1.1"
+    ]
 }
diff --git a/var/licenses/Artistic-1.0.json b/var/licenses/Artistic-1.0.json
index 1855987..cb17040 100644
--- a/var/licenses/Artistic-1.0.json
+++ b/var/licenses/Artistic-1.0.json
@@ -1,25 +1,26 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Artistic License 1.0",
-  "scancode_key": "artistic-1.0", 
-  "spdxid": "Artistic-1.0",
-  "aliases": [
-   "Artistic-1.0",
-   "Artistic 1.0 (original)",
-   "Artistic License 1.0",
-   "Artistic License, Version 1.0",
-   "Artistic License (Perl) 1.0",
-   "scancode://artistic-1.0",
-   "Artistic 1.0",
-   "Artistic, Version 1.0",
-   "Artistic-1",
-   "scancode:artistic-1.0",
-   "osi:Artistic-1.0",
-   "Artisticv1",
-   "AFL-1",
-   "AFLv1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Artistic License 1.0",
+    "scancode_key": "artistic-1.0", 
+    "spdxid": "Artistic-1.0",
+    "aliases": [
+        "Artistic-1.0",
+        "Artistic 1.0 (original)",
+        "Artistic License 1.0",
+        "Artistic License, Version 1.0",
+        "Artistic License (Perl) 1.0",
+        "scancode://artistic-1.0",
+        "Artistic 1.0",
+        "Artistic, Version 1.0",
+        "Artistic-1",
+        "scancode:artistic-1.0",
+        "osi:Artistic-1.0",
+        "Artisticv1",
+        "AFL-1",
+        "AFLv1",
+        "artistic-1.0"
+    ]
 }
diff --git a/var/licenses/Autoconf-exception-2.0.json b/var/licenses/Autoconf-exception-2.0.json
index b68087f..1f54ab6 100644
--- a/var/licenses/Autoconf-exception-2.0.json
+++ b/var/licenses/Autoconf-exception-2.0.json
@@ -1,11 +1,12 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Autoconf exception to GPL 2.0 or later",
-  "scancode_key": "autoconf-exception-2.0",
-  "spdxid": "Autoconf-exception-2.0",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Autoconf exception to GPL 2.0 or later",
+    "scancode_key": "autoconf-exception-2.0",
+    "spdxid": "Autoconf-exception-2.0",
+    "aliases": [
+        "autoconf-exception-2.0"
+    ]
 }
diff --git a/var/licenses/Autoconf-exception-3.0.json b/var/licenses/Autoconf-exception-3.0.json
index 9919288..ebc7363 100644
--- a/var/licenses/Autoconf-exception-3.0.json
+++ b/var/licenses/Autoconf-exception-3.0.json
@@ -1,11 +1,12 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Autoconf exception to GPL 3.0",
-  "scancode_key": "autoconf-exception-3.0",
-  "spdxid": "Autoconf-exception-3.0",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Autoconf exception to GPL 3.0",
+    "scancode_key": "autoconf-exception-3.0",
+    "spdxid": "Autoconf-exception-3.0",
+    "aliases": [
+        "autoconf-exception-3.0"
+    ]
 }
diff --git a/var/licenses/BSD-1-Clause.json b/var/licenses/BSD-1-Clause.json
index 50f16e3..a9beecb 100644
--- a/var/licenses/BSD-1-Clause.json
+++ b/var/licenses/BSD-1-Clause.json
@@ -1,20 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "BSD-1-Clause",
-  "scancode_key": "bsd-1-clause",
-  "spdxid": "BSD-1-Clause",
-  "aliases": [
-   "BSD-1-Clause",
-   "BSD 1-Clause License",
-   "scancode://bsd-1-clause",
-   "BSD 1 Clause",
-   "BSD 1 CLAUSE",
-   "BSD-1-CLAUSE",
-   "BSD-1-clause",
-   "scancode:bsd-1-clause",
-   "BSD 1C"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "BSD-1-Clause",
+    "scancode_key": "bsd-1-clause",
+    "spdxid": "BSD-1-Clause",
+    "aliases": [
+        "BSD-1-Clause",
+        "BSD 1-Clause License",
+        "scancode://bsd-1-clause",
+        "BSD 1 Clause",
+        "BSD 1 CLAUSE",
+        "BSD-1-CLAUSE",
+        "BSD-1-clause",
+        "scancode:bsd-1-clause",
+        "BSD 1C",
+        "bsd-1-clause"
+    ]
 }
diff --git a/var/licenses/BSD-2-Clause-Patent.json b/var/licenses/BSD-2-Clause-Patent.json
index 19c5b2f..22c41cf 100644
--- a/var/licenses/BSD-2-Clause-Patent.json
+++ b/var/licenses/BSD-2-Clause-Patent.json
@@ -12,6 +12,7 @@
         "BSD-2-Clause Plus Patent",
         "BSD-2-Clause Plus Patent License",
         "scancode:bsd-plus-patent",
-        "osi:BSDplusPatent"
+        "osi:BSDplusPatent",
+        "bsd-plus-patent"
   ]
 }
diff --git a/var/licenses/BSD-2-Clause-Views.json b/var/licenses/BSD-2-Clause-Views.json
index d797908..ee001c5 100644
--- a/var/licenses/BSD-2-Clause-Views.json
+++ b/var/licenses/BSD-2-Clause-Views.json
@@ -11,6 +11,7 @@
         "BSD-2-Clause-Views",
         "BSD 2-Clause with Views Sentence",
         "BSD 2-Clause with views sentence",
-        "scancode://bsd-2-clause-views"
+        "scancode://bsd-2-clause-views",
+        "bsd-2-clause-views"
     ]
 }
diff --git a/var/licenses/BSD-2-Clause.json b/var/licenses/BSD-2-Clause.json
index b00ff8a..223f8fe 100644
--- a/var/licenses/BSD-2-Clause.json
+++ b/var/licenses/BSD-2-Clause.json
@@ -44,6 +44,7 @@
         "BSD 2-clause \"Simplified\" License",
         "2-Clause BSD",
         "The 2-Clause BSD License",
-        "BSD License 2"
+        "BSD License 2",
+        "bsd-simplified"
     ]
 }
diff --git a/var/licenses/BSD-3-Clause-Clear.json b/var/licenses/BSD-3-Clause-Clear.json
index 598faf1..5fac887 100644
--- a/var/licenses/BSD-3-Clause-Clear.json
+++ b/var/licenses/BSD-3-Clause-Clear.json
@@ -15,6 +15,7 @@
         "scancode://clear-bsd",
         "Clear BSD License",
         "Clear BSD license",
-        "scancode:clear-bsd"
+        "scancode:clear-bsd",
+        "clear-bsd"
     ]
 }
diff --git a/var/licenses/BSD-3-Clause.json b/var/licenses/BSD-3-Clause.json
index fca899c..369a7e3 100644
--- a/var/licenses/BSD-3-Clause.json
+++ b/var/licenses/BSD-3-Clause.json
@@ -76,6 +76,7 @@
         "new-BSD-License",
         "new-BSD",
         "BSD-new license",
-        "3-clause-BSD-License"
+        "3-clause-BSD-License",
+        "bsd-new"
     ]
 }
diff --git a/var/licenses/BSD-4-Clause-UC.json b/var/licenses/BSD-4-Clause-UC.json
index e72d8d4..2d074c6 100644
--- a/var/licenses/BSD-4-Clause-UC.json
+++ b/var/licenses/BSD-4-Clause-UC.json
@@ -11,8 +11,7 @@
         "BSD-4-Clause (University of California-Specific)",
         "BSD-4-Clause-UC",
         "scancode://bsd-original-uc",
-        "BSD-Original-UC"
-
-        
+        "BSD-Original-UC",
+        "bsd-original-uc"
     ]
 }
diff --git a/var/licenses/BSD-4-Clause.json b/var/licenses/BSD-4-Clause.json
index 1eb8416..49560f4 100644
--- a/var/licenses/BSD-4-Clause.json
+++ b/var/licenses/BSD-4-Clause.json
@@ -19,6 +19,7 @@
         "BSD with advertising",
         "BSD 4-Clause",
         "scancode:bsd-original",
-        "Original BSD license"
+        "Original BSD license",
+        "bsd-original"
     ]
 }
diff --git a/var/licenses/BSD-Source-Code.json b/var/licenses/BSD-Source-Code.json
index 6115791..c7fe311 100644
--- a/var/licenses/BSD-Source-Code.json
+++ b/var/licenses/BSD-Source-Code.json
@@ -14,6 +14,7 @@
         "BSD Source Code",
         "BSD SOURCE CODE",
         "BSD-SOURCE-CODE",
-        "scancode:bsd-source-code"
+        "scancode:bsd-source-code",
+        "bsd-source-code"
     ]
 }
diff --git a/var/licenses/BSL-1.0.json b/var/licenses/BSL-1.0.json
index 2c9a460..17a2462 100644
--- a/var/licenses/BSL-1.0.json
+++ b/var/licenses/BSL-1.0.json
@@ -26,6 +26,7 @@
         "osi:BSL-1.0",
         "BSL 1.0 License",
         "Boost-1.0",
-        "Boost Software license 1.0"
+        "Boost Software license 1.0",
+        "boost-1.0"
     ]
 }
diff --git a/var/licenses/Beerware.json b/var/licenses/Beerware.json
index 8b1bad0..0bdd472 100644
--- a/var/licenses/Beerware.json
+++ b/var/licenses/Beerware.json
@@ -1,19 +1,20 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Beer-Ware License",
-  "scancode_key": "beerware", 
-  "spdxid": "Beerware",
-  "compatibility_as": "BSD-1-Clause",
-  "aliases": [
-   "Beerware",
-   "Beerware License",
-   "scancode://beerware",
-   "Beer-Ware License",
-   "Beerware 42",
-   "BEERWARE",
-   "scancode:beerware"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Beer-Ware License",
+    "scancode_key": "beerware", 
+    "spdxid": "Beerware",
+    "compatibility_as": "BSD-1-Clause",
+    "aliases": [
+        "Beerware",
+        "Beerware License",
+        "scancode://beerware",
+        "Beer-Ware License",
+        "Beerware 42",
+        "BEERWARE",
+        "scancode:beerware",
+        "beerware"
+    ]
 }
diff --git a/var/licenses/Bitstream-Vera.json b/var/licenses/Bitstream-Vera.json
index d2a718c..43c14db 100644
--- a/var/licenses/Bitstream-Vera.json
+++ b/var/licenses/Bitstream-Vera.json
@@ -8,6 +8,7 @@
     "spdxid": "Bitstream-Vera",
     "aliases": [
         "Bitstream vera",
-        "Bitstream Vera"
+        "Bitstream Vera",
+        "bitstream"
     ]
 }
diff --git a/var/licenses/BlueOak-1.0.0.json b/var/licenses/BlueOak-1.0.0.json
index bdb77fd..d42177e 100644
--- a/var/licenses/BlueOak-1.0.0.json
+++ b/var/licenses/BlueOak-1.0.0.json
@@ -1,15 +1,16 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Blue Oak Model License 1.0.0",
-  "scancode_key": "blueoak-1.0.0",
-  "spdxid": "BlueOak-1.0.0",
-  "aliases": [
-      "BlueOak-1.0.0",
-      "scancode://blueoak-1.0.0",
-      "Blue Oak Model License Version 1.0.0",
-      "scancode:blueoak-1.0.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Blue Oak Model License 1.0.0",
+    "scancode_key": "blueoak-1.0.0",
+    "spdxid": "BlueOak-1.0.0",
+    "aliases": [
+        "BlueOak-1.0.0",
+        "scancode://blueoak-1.0.0",
+        "Blue Oak Model License Version 1.0.0",
+        "scancode:blueoak-1.0.0",
+        "blueoak-1.0.0"
+    ]
 }
diff --git a/var/licenses/CC-BY-3.0.json b/var/licenses/CC-BY-3.0.json
index d68946b..706b5b6 100644
--- a/var/licenses/CC-BY-3.0.json
+++ b/var/licenses/CC-BY-3.0.json
@@ -1,21 +1,22 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons Attribution License 3.0",
-  "scancode_key": "cc-by-3.0", 
-  "spdxid": "CC-BY-3.0",
-  "aliases": [
-   "CC-BY-3.0",
-   "Creative Commons BY 3.0",
-   "Creative Commons Attribution 3.0 Unported",
-   "scancode://cc-by-3.0",
-   "Creative Commons Attribution unported (CC-BY) v3.0",
-   "Creative Commons Attribution 3.0",
-   "CC-A 3.0",
-   "CC-BY 3.0",
-   "http://creativecommons.org/licenses/by/3.0",
-   "scancode:cc-by-3.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons Attribution License 3.0",
+    "scancode_key": "cc-by-3.0", 
+    "spdxid": "CC-BY-3.0",
+    "aliases": [
+        "CC-BY-3.0",
+        "Creative Commons BY 3.0",
+        "Creative Commons Attribution 3.0 Unported",
+        "scancode://cc-by-3.0",
+        "Creative Commons Attribution unported (CC-BY) v3.0",
+        "Creative Commons Attribution 3.0",
+        "CC-A 3.0",
+        "CC-BY 3.0",
+        "http://creativecommons.org/licenses/by/3.0",
+        "scancode:cc-by-3.0",
+        "cc-by-3.0"
+    ]
 }
diff --git a/var/licenses/CC-BY-4.0.json b/var/licenses/CC-BY-4.0.json
index dae8cb9..ccbceaa 100644
--- a/var/licenses/CC-BY-4.0.json
+++ b/var/licenses/CC-BY-4.0.json
@@ -1,20 +1,20 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons Attribution 4.0 International Public License",
-  "scancode_key": "cc-by-4.0", 
-  "spdxid": "CC-BY-4.0",
-  "aliases": [
-   "CC-BY-4.0",
-   "cc-by-4.0",
-   "Creative Commons BY 4.0",
-   "Creative Commons Attribution 4.0",
-   "Creative Commons Attribution 4.0 International",
-   "scancode://cc-by-4.0",
-   "CC-BY 4.0",
-   "Creative Commons Attribution unported (CC-BY) v4.0",
-   "scancode:cc-by-4.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons Attribution 4.0 International Public License",
+    "scancode_key": "cc-by-4.0", 
+    "spdxid": "CC-BY-4.0",
+    "aliases": [
+        "CC-BY-4.0",
+        "cc-by-4.0",
+        "Creative Commons BY 4.0",
+        "Creative Commons Attribution 4.0",
+        "Creative Commons Attribution 4.0 International",
+        "scancode://cc-by-4.0",
+        "CC-BY 4.0",
+        "Creative Commons Attribution unported (CC-BY) v4.0",
+        "scancode:cc-by-4.0"
+    ]
 }
diff --git a/var/licenses/CC-BY-SA-2.5.json b/var/licenses/CC-BY-SA-2.5.json
index 0d592c4..4c93908 100644
--- a/var/licenses/CC-BY-SA-2.5.json
+++ b/var/licenses/CC-BY-SA-2.5.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons Attribution Share Alike License 2.5",
-  "scancode_key": "cc-by-sa-2.5", 
-  "spdxid": "CC-BY-SA-2.5",
-  "aliases": [
-   "CC-BY-SA-2.5",
-   "Creative Commons BY-SA 2.5",
-   "Creative Commons Attribution-ShareAlike 2.5",
-   "Creative Commons Attribution Share Alike 2.5 Generic",
-   "scancode://cc-by-sa-2.5",
-   "Creative Commons Attribution Share Alike 2.5",
-   "scancode:cc-by-sa-2.5"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons Attribution Share Alike License 2.5",
+    "scancode_key": "cc-by-sa-2.5", 
+    "spdxid": "CC-BY-SA-2.5",
+    "aliases": [
+        "CC-BY-SA-2.5",
+        "Creative Commons BY-SA 2.5",
+        "Creative Commons Attribution-ShareAlike 2.5",
+        "Creative Commons Attribution Share Alike 2.5 Generic",
+        "scancode://cc-by-sa-2.5",
+        "Creative Commons Attribution Share Alike 2.5",
+        "scancode:cc-by-sa-2.5",
+        "cc-by-sa-2.5"
+    ]
 }
diff --git a/var/licenses/CC-BY-SA-3.0.json b/var/licenses/CC-BY-SA-3.0.json
index 3a01207..435285e 100644
--- a/var/licenses/CC-BY-SA-3.0.json
+++ b/var/licenses/CC-BY-SA-3.0.json
@@ -1,24 +1,25 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons Attribution Share Alike License 3.0",
-  "scancode_key": "cc-by-sa-3.0", 
-  "spdxid": "CC-BY-SA-3.0",
-  "aliases": [
-   "CC-BY-SA-3.0",
-   "Creative Commons BY-SA 3.0",
-   "Creative Commons Attribution-ShareAlike 3.0 Unported",
-   "Creative Commons Attribution Share Alike 3.0 Unported",
-   "scancode://cc-by-sa-3.0",
-   "Creative Commons Attribution Share-Alike (CC-BY-SA) v3.0",
-   "Creative Commons Attribution Share Alike 3.0",
-   "Creative Commons Attribution-ShareAlike 3.0",
-   "Creative Common Attribution-ShareAlike 3.0",
-   "http://creativecommons.org/licenses/by-sa/3.0",
-   "Creative Commons Attribution-Share Alike 3.0",
-   "https://creativecommons.org/licenses/by-sa/3.0/",
-   "scancode:cc-by-sa-3.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons Attribution Share Alike License 3.0",
+    "scancode_key": "cc-by-sa-3.0", 
+    "spdxid": "CC-BY-SA-3.0",
+    "aliases": [
+        "CC-BY-SA-3.0",
+        "Creative Commons BY-SA 3.0",
+        "Creative Commons Attribution-ShareAlike 3.0 Unported",
+        "Creative Commons Attribution Share Alike 3.0 Unported",
+        "scancode://cc-by-sa-3.0",
+        "Creative Commons Attribution Share-Alike (CC-BY-SA) v3.0",
+        "Creative Commons Attribution Share Alike 3.0",
+        "Creative Commons Attribution-ShareAlike 3.0",
+        "Creative Common Attribution-ShareAlike 3.0",
+        "http://creativecommons.org/licenses/by-sa/3.0",
+        "Creative Commons Attribution-Share Alike 3.0",
+        "https://creativecommons.org/licenses/by-sa/3.0/",
+        "scancode:cc-by-sa-3.0",
+        "cc-by-sa-3.0"
+    ]
 }
diff --git a/var/licenses/CC-BY-SA-4.0.json b/var/licenses/CC-BY-SA-4.0.json
index 7e07b01..66d2bde 100644
--- a/var/licenses/CC-BY-SA-4.0.json
+++ b/var/licenses/CC-BY-SA-4.0.json
@@ -1,24 +1,24 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons Attribution-ShareAlike 4.0 International Public License",
-  "scancode_key": "cc-by-sa-4.0", 
-  "spdxid": "CC-BY-SA-4.0",
-  "aliases": [
-   "CC-BY-SA-4.0",
-   "cc-by-sa-4.0",
-   "Creative Commons BY-SA 4.0",
-   "Creative Commons Attribution Share-Alike 4.0",
-   "Creative Commons Attribution-ShareAlike 4.0 International",
-   "Creative Commons Attribution Share Alike 4.0 International",
-   "scancode://cc-by-sa-4.0",
-   "CC-BY-SA 4.0",
-   "Creative Commons Attribution Share-Alike (CC-BY-SA) v4.0",
-   "Creative Commons Attribution-ShareAlike 4.0",
-   "Creative Commons Attribution ShareAlike 4.0",
-   "CC BY-SA 4.0",
-   "scancode:cc-by-sa-4.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons Attribution-ShareAlike 4.0 International Public License",
+    "scancode_key": "cc-by-sa-4.0", 
+    "spdxid": "CC-BY-SA-4.0",
+    "aliases": [
+        "CC-BY-SA-4.0",
+        "cc-by-sa-4.0",
+        "Creative Commons BY-SA 4.0",
+        "Creative Commons Attribution Share-Alike 4.0",
+        "Creative Commons Attribution-ShareAlike 4.0 International",
+        "Creative Commons Attribution Share Alike 4.0 International",
+        "scancode://cc-by-sa-4.0",
+        "CC-BY-SA 4.0",
+        "Creative Commons Attribution Share-Alike (CC-BY-SA) v4.0",
+        "Creative Commons Attribution-ShareAlike 4.0",
+        "Creative Commons Attribution ShareAlike 4.0",
+        "CC BY-SA 4.0",
+        "scancode:cc-by-sa-4.0"
+    ]
 }
diff --git a/var/licenses/CC-PDDC.json b/var/licenses/CC-PDDC.json
index f57778a..105fb57 100644
--- a/var/licenses/CC-PDDC.json
+++ b/var/licenses/CC-PDDC.json
@@ -12,6 +12,7 @@
         "Creative Commons Copyright-Only Dedication (based on United States law) or Public Domain Certification",
         "scancode://cc-pd",
         "CC-PD",
-        "scancode:cc-pd"
+        "scancode:cc-pd",
+        "cc-pd"
     ]
 }
diff --git a/var/licenses/CC0-1.0.json b/var/licenses/CC0-1.0.json
index b896f13..c6cea43 100644
--- a/var/licenses/CC0-1.0.json
+++ b/var/licenses/CC0-1.0.json
@@ -1,23 +1,23 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Creative Commons CC0 1.0 Universal",
-  "scancode_key": "cc0-1.0", 
-  "spdxid": "CC0-1.0",
-  "aliases": [
-   "CC0-1.0",
-   "Creative Commons Zero v1.0 Universal",
-   "cc0-1.0",
-   "CC0 Universal 1.0",
-   "CC0 1.0",
-   "Creative Commons CC0 1.0 Universal",
-   "scancode://cc0-1.0",
-   "Creative Commons Zero 1.0",
-   "Creative Commons CC0 1.0 Universal License",
-   "scancode:cc0-1.0",
-   "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
-   "CC0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Creative Commons CC0 1.0 Universal",
+    "scancode_key": "cc0-1.0", 
+    "spdxid": "CC0-1.0",
+    "aliases": [
+        "CC0-1.0",
+        "Creative Commons Zero v1.0 Universal",
+        "cc0-1.0",
+        "CC0 Universal 1.0",
+        "CC0 1.0",
+        "Creative Commons CC0 1.0 Universal",
+        "scancode://cc0-1.0",
+        "Creative Commons Zero 1.0",
+        "Creative Commons CC0 1.0 Universal License",
+        "scancode:cc0-1.0",
+        "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+        "CC0"
+    ]
 }
diff --git a/var/licenses/CDDL-1.0.json b/var/licenses/CDDL-1.0.json
index 7002406..333afac 100644
--- a/var/licenses/CDDL-1.0.json
+++ b/var/licenses/CDDL-1.0.json
@@ -1,27 +1,28 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Common Development and Distribution License 1.0",
-  "scancode_key": "cddl-1.0",
-  "spdxid": "CDDL-1.0",
-  "aliases": [
-   "CDDL-1.0",
-   "Common Development and Distribution License 1.0",
-   "CDDL 1.0",
-   "Common Development and Distribution License, Version 1.0",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 governed by the laws of the State of California",
-   "scancode://cddl-1.0",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0",
-   "Common Development and Distribution License 1.0 (\"CDDL\")",
-   "CDDL, v1.0",
-   "CDDLv1.0",
-   "Common Development and Distribution Licence version 1.0 (CDDL)",
-   "Common Development and Distribution License (CDDL), Version 1.0",
-   "scancode:cddl-1.0",
-   "osi:CDDL-1.0",
-   "Common Development and Distribution License 1.0 (CDDL-1.0)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Common Development and Distribution License 1.0",
+    "scancode_key": "cddl-1.0",
+    "spdxid": "CDDL-1.0",
+    "aliases": [
+        "CDDL-1.0",
+        "Common Development and Distribution License 1.0",
+        "CDDL 1.0",
+        "Common Development and Distribution License, Version 1.0",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 governed by the laws of the State of California",
+        "scancode://cddl-1.0",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0",
+        "Common Development and Distribution License 1.0 (\"CDDL\")",
+        "CDDL, v1.0",
+        "CDDLv1.0",
+        "Common Development and Distribution Licence version 1.0 (CDDL)",
+        "Common Development and Distribution License (CDDL), Version 1.0",
+        "scancode:cddl-1.0",
+        "osi:CDDL-1.0",
+        "Common Development and Distribution License 1.0 (CDDL-1.0)",
+        "cddl-1.0"
+    ]
 }
diff --git a/var/licenses/CDDL-1.1.json b/var/licenses/CDDL-1.1.json
index 28716d4..616f991 100644
--- a/var/licenses/CDDL-1.1.json
+++ b/var/licenses/CDDL-1.1.json
@@ -1,20 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Common Development and Distribution License 1.1",
-  "scancode_key": "cddl-1.1",
-  "spdxid": "CDDL-1.1",
-  "aliases": [
-   "CDDL-1.1",
-   "Common Development and Distribution License 1.1",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.1",
-   "scancode://cddl-1.1",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE 1.1",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1",
-   "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1)",
-   "https://oss.oracle.com/licenses/CDDL+GPL-1.1",
-   "scancode:cddl-1.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Common Development and Distribution License 1.1",
+    "scancode_key": "cddl-1.1",
+    "spdxid": "CDDL-1.1",
+    "aliases": [
+        "CDDL-1.1",
+        "Common Development and Distribution License 1.1",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.1",
+        "scancode://cddl-1.1",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE 1.1",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1",
+        "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1)",
+        "https://oss.oracle.com/licenses/CDDL+GPL-1.1",
+        "scancode:cddl-1.1",
+        "cddl-1.1"
+    ]
 }
diff --git a/var/licenses/CPL-1.0.json b/var/licenses/CPL-1.0.json
index cf20022..f45f931 100644
--- a/var/licenses/CPL-1.0.json
+++ b/var/licenses/CPL-1.0.json
@@ -1,26 +1,27 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Common Public License 1.0",
-  "scancode_key": "cpl-1.0",
-  "spdxid": "CPL-1.0",
-  "aliases": [
-   "Common Public License 1.0",
-   "Common Public License, Version 1.0",
-   "Common Public License Version 1.0",
-   "scancode://cpl-1.0",
-   "CPL 1.0",
-   "Common Public License (CPL), Version 1.0",
-   "CPL-v1.0",
-   "CPL-1.0",
-   "Common Public License (CPL) -- V1.0",
-   "Common Public License - v 1.0",
-   "Common Public License v1.0",
-   "Common Public License version 1.0",
-   "Common Public License v. 1.0",
-   "scancode:cpl-1.0",
-   "osi:CPL-1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Common Public License 1.0",
+    "scancode_key": "cpl-1.0",
+    "spdxid": "CPL-1.0",
+    "aliases": [
+        "Common Public License 1.0",
+        "Common Public License, Version 1.0",
+        "Common Public License Version 1.0",
+        "scancode://cpl-1.0",
+        "CPL 1.0",
+        "Common Public License (CPL), Version 1.0",
+        "CPL-v1.0",
+        "CPL-1.0",
+        "Common Public License (CPL) -- V1.0",
+        "Common Public License - v 1.0",
+        "Common Public License v1.0",
+        "Common Public License version 1.0",
+        "Common Public License v. 1.0",
+        "scancode:cpl-1.0",
+        "osi:CPL-1.0",
+        "cpl-1.0"
+    ]
 }
diff --git a/var/licenses/Classpath-exception-2.0.json b/var/licenses/Classpath-exception-2.0.json
index 5d35373..9ba7ed4 100644
--- a/var/licenses/Classpath-exception-2.0.json
+++ b/var/licenses/Classpath-exception-2.0.json
@@ -8,6 +8,7 @@
     "spdxid": "Classpath-exception-2.0",
     "aliases": [
         "Classpath-exception",
-        "Classpath exception"
+        "Classpath exception",
+        "classpath-exception-2.0"
     ]
 }
diff --git a/var/licenses/ECL-1.0.json b/var/licenses/ECL-1.0.json
index e99a1da..e784b1e 100644
--- a/var/licenses/ECL-1.0.json
+++ b/var/licenses/ECL-1.0.json
@@ -16,6 +16,7 @@
         "ECL, Version 1.0",
         "Educational Community License version 1.0",
         "scancode:ecl-1.0",
-        "osi:ECL-1.0"
+        "osi:ECL-1.0",
+        "ecl-1.0"
     ]
 }
diff --git a/var/licenses/EFL-1.0.json b/var/licenses/EFL-1.0.json
index 0bef7b9..4a462de 100644
--- a/var/licenses/EFL-1.0.json
+++ b/var/licenses/EFL-1.0.json
@@ -18,6 +18,7 @@
         "EFL, Version 1.0",
         "Eiffel Forum License, version 1",
         "scancode:efl-1.0",
-        "osi:EFL-1.0"
+        "osi:EFL-1.0",
+        "efl-1.0"
     ]
 }
diff --git a/var/licenses/EFL-2.0.json b/var/licenses/EFL-2.0.json
index 3e1a3b2..a55ee9f 100644
--- a/var/licenses/EFL-2.0.json
+++ b/var/licenses/EFL-2.0.json
@@ -16,6 +16,7 @@
         "EFL, Version 2.0",
         "Eiffel Forum License, version 2",
         "scancode:efl-2.0",
-        "osi:EFL-2.0"
+        "osi:EFL-2.0",
+        "efl-2.0"
     ]
 }
diff --git a/var/licenses/EPL-1.0.json b/var/licenses/EPL-1.0.json
index 1768f16..ef3f198 100644
--- a/var/licenses/EPL-1.0.json
+++ b/var/licenses/EPL-1.0.json
@@ -1,42 +1,42 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Eclipse Public License 1.0",
-  "scancode_key": "epl-1.0",
-  "spdxid": "EPL-1.0",
-  "aliases": [
-    "EPL-1.0",
-    "Eclipse Public License 1.0",
-    "epl-1.0",
-    "eclipse-1.0",
-    "scancode://epl-1.0",
-    "EPL 1.0",
-    "Eclipse Public License - 1.0",
-    "Eclipse Public License (EPL) v1.0",
-    "Eclipse Public License - Version 1.0",
-    "Eclipse Public License v1.0",
-    "Eclipse Public License version 1.0",
-    "Eclipse Public License, Version 1.0",
-    "Eclipse Public License (EPL) 1.0",
-    "Eclipse Public License (EPL), Version 1.0",
-    "Eclise Public License, Version 1.0",
-    "Eclipse-1.0",
-    "EPL (Eclipse Public License), V1.0 or later",
-    "EPLv1",
-    "Eclipse Public License v1.0&#xD",
-    "http://www.eclipse.org/legal/epl-v10.html",
-    "https://www.eclipse.org/legal/epl-v10.html",
-    "Eclipse Public Licence, Version 1.0",
-    "Eclipse Public License - v1.0",
-    "Eclipse Public License -v 1.0",
-    "Eclipse Public License v 1.0",
-    "Eclipse Public License, V 1.0",
-    "scancode:epl-1.0",
-    "osi:EPL-1.0",
-    "Eclipse Public License 1.0 (EPL-1.0)",
-      "EPLv1.0",
-      "Eclipse-Public-License-v1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Eclipse Public License 1.0",
+    "scancode_key": "epl-1.0",
+    "spdxid": "EPL-1.0",
+    "aliases": [
+        "EPL-1.0",
+        "Eclipse Public License 1.0",
+        "epl-1.0",
+        "eclipse-1.0",
+        "scancode://epl-1.0",
+        "EPL 1.0",
+        "Eclipse Public License - 1.0",
+        "Eclipse Public License (EPL) v1.0",
+        "Eclipse Public License - Version 1.0",
+        "Eclipse Public License v1.0",
+        "Eclipse Public License version 1.0",
+        "Eclipse Public License, Version 1.0",
+        "Eclipse Public License (EPL) 1.0",
+        "Eclipse Public License (EPL), Version 1.0",
+        "Eclise Public License, Version 1.0",
+        "Eclipse-1.0",
+        "EPL (Eclipse Public License), V1.0 or later",
+        "EPLv1",
+        "Eclipse Public License v1.0&#xD",
+        "http://www.eclipse.org/legal/epl-v10.html",
+        "https://www.eclipse.org/legal/epl-v10.html",
+        "Eclipse Public Licence, Version 1.0",
+        "Eclipse Public License - v1.0",
+        "Eclipse Public License -v 1.0",
+        "Eclipse Public License v 1.0",
+        "Eclipse Public License, V 1.0",
+        "scancode:epl-1.0",
+        "osi:EPL-1.0",
+        "Eclipse Public License 1.0 (EPL-1.0)",
+        "EPLv1.0",
+        "Eclipse-Public-License-v1.0"
+    ]
 }
diff --git a/var/licenses/EUPL-1.0.json b/var/licenses/EUPL-1.0.json
index 8bb1510..38a15ea 100644
--- a/var/licenses/EUPL-1.0.json
+++ b/var/licenses/EUPL-1.0.json
@@ -1,26 +1,27 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "European Union Public Licence 1.0",
-  "scancode_key": "eupl-1.0",
-  "spdxid": "EUPL-1.0",
-  "aliases": [
-   "EUPL-1.0",
-   "European Union Public License 1.0",
-   "scancode://eupl-1.0",
-   "EUPL 1.0",
-   "EUPL Version 1.0",
-   "EUPL v.1.0",
-   "EUPL V.1.0",
-   "EUPL, 1.0",
-   "European Union Public License V. 1.0",
-   "European Union Public License v.1.0",
-   "European Union Public License, Version 1.0",
-   "European Union Public License (EUPL) version 1.0",
-   "European Union Public License v1.0",
-   "scancode:eupl-1.0",
-   "European Union Public Licence 1.0 (EUPL 1.0)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "European Union Public Licence 1.0",
+    "scancode_key": "eupl-1.0",
+    "spdxid": "EUPL-1.0",
+    "aliases": [
+        "EUPL-1.0",
+        "European Union Public License 1.0",
+        "scancode://eupl-1.0",
+        "EUPL 1.0",
+        "EUPL Version 1.0",
+        "EUPL v.1.0",
+        "EUPL V.1.0",
+        "EUPL, 1.0",
+        "European Union Public License V. 1.0",
+        "European Union Public License v.1.0",
+        "European Union Public License, Version 1.0",
+        "European Union Public License (EUPL) version 1.0",
+        "European Union Public License v1.0",
+        "scancode:eupl-1.0",
+        "European Union Public Licence 1.0 (EUPL 1.0)",
+        "eupl-1.0"
+    ]
 }
diff --git a/var/licenses/FSFAP.json b/var/licenses/FSFAP.json
index 3f0ab38..da7d3b9 100644
--- a/var/licenses/FSFAP.json
+++ b/var/licenses/FSFAP.json
@@ -13,6 +13,7 @@
         "scancode://fsf-ap",
         "FSF All Permissive",
         "FSF all permissive",
-        "scancode:fsf-ap"
+        "scancode:fsf-ap",
+        "fsf-ap"
     ]
 }
diff --git a/var/licenses/FSFUL.json b/var/licenses/FSFUL.json
index 5232756..22b0e10 100644
--- a/var/licenses/FSFUL.json
+++ b/var/licenses/FSFUL.json
@@ -10,6 +10,7 @@
         "FSF Unlimited License",
         "scancode://fsf-free",
         "FSFUL",
-        "scancode:fsf-free"
+        "scancode:fsf-free",
+        "fsf-free"
     ]
 }
diff --git a/var/licenses/FSFULLR.json b/var/licenses/FSFULLR.json
index b1dd7c5..f6ac2ad 100644
--- a/var/licenses/FSFULLR.json
+++ b/var/licenses/FSFULLR.json
@@ -14,6 +14,7 @@
         "FSF-Unlimited",
         "FSFULLR",
         "This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it",
-        "scancode:fsf-unlimited"
+        "scancode:fsf-unlimited",
+        "fsf-unlimited"
     ]
 }
diff --git a/var/licenses/FSFULLRWD.json b/var/licenses/FSFULLRWD.json
index 7e54223..37c6704 100644
--- a/var/licenses/FSFULLRWD.json
+++ b/var/licenses/FSFULLRWD.json
@@ -7,6 +7,7 @@
     "scancode_key": "fsf-unlimited-no-warranty",
     "spdxid": "FSFULLRWD",
     "aliases": [
-        "FSF Unlimited License No Warranty"
+        "FSF Unlimited License No Warranty",
+        "fsf-unlimited-no-warranty"
     ]
 }
diff --git a/var/licenses/FTL.json b/var/licenses/FTL.json
index 264de60..38f4686 100644
--- a/var/licenses/FTL.json
+++ b/var/licenses/FTL.json
@@ -18,6 +18,7 @@
         "http://www.freetype.org/license.html",
         "https://spdx.org/licenses/ftl",
         "FreeType License",
-        "scancode:freetype"
-  ]
+        "scancode:freetype",
+        "freetype"
+    ]
 }
diff --git a/var/licenses/GCC-exception-3.1.json b/var/licenses/GCC-exception-3.1.json
index cff9934..95f5423 100644
--- a/var/licenses/GCC-exception-3.1.json
+++ b/var/licenses/GCC-exception-3.1.json
@@ -7,6 +7,7 @@
     "scancode_key": "gcc-exception-3.1",
     "spdxid": "GCC-exception-3.1",
     "aliases": [
-        "GCC Runtime Library Exception v3.1"
+        "GCC Runtime Library Exception v3.1",
+        "gcc-exception-3.1"
     ]
 }
diff --git a/var/licenses/GPL-1.0-only.json b/var/licenses/GPL-1.0-only.json
index 8840e36..0fd600d 100644
--- a/var/licenses/GPL-1.0-only.json
+++ b/var/licenses/GPL-1.0-only.json
@@ -23,6 +23,7 @@
    "GNU GENERAL PUBLIC LICENSE Version 1",
    "scancode:gpl-1.0",
    "GPLv1.0",
-   "GPL-1"
+   "GPL-1",
+   "gpl-1.0"
   ]
 }
diff --git a/var/licenses/GPL-1.0-or-later.json b/var/licenses/GPL-1.0-or-later.json
index 914d289..0306de1 100644
--- a/var/licenses/GPL-1.0-or-later.json
+++ b/var/licenses/GPL-1.0-or-later.json
@@ -26,6 +26,7 @@
    "GNU General Public License, version 1 or later",
    "scancode:gpl-1.0-plus",
    "GPLv1+",
-   "GPLv1.0+"
+   "GPLv1.0+",
+   "gpl-1.0-plus"
   ]
 }
diff --git a/var/licenses/GPL-2.0-or-later.json b/var/licenses/GPL-2.0-or-later.json
index d924282..8f9dbe4 100644
--- a/var/licenses/GPL-2.0-or-later.json
+++ b/var/licenses/GPL-2.0-or-later.json
@@ -55,6 +55,7 @@
         "GPL version 2 or any later version",
         "GPL (>= 2)",
         "GPL 2+",
-        "GPLV2+"
+        "GPLV2+",
+        "gpl-2.0-plus"
     ]
 }
diff --git a/var/licenses/GPL-3.0-or-later.json b/var/licenses/GPL-3.0-or-later.json
index 43b101d..17b6aa0 100644
--- a/var/licenses/GPL-3.0-or-later.json
+++ b/var/licenses/GPL-3.0-or-later.json
@@ -1,57 +1,58 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU General Public License 3.0 or later",
-  "scancode_key": "gpl-3.0-plus", 
-  "spdxid": "GPL-3.0-or-later",
-  "aliases": [
-   "GPL-3.0-or-later",
-   "GPL-3.0+",
-   "GPL3.0+",
-   "GPL3+",
-   "GPL (v3 or later)",
-   "GNU General Public License v3.0 or later",
-   "GNU General Public License 3.0 (or any later version)",
-   "scancode://gpl-3.0-plus",
-   "GPL 3.0 or later",
-   "GPLv3+",
-   "GNU GENERAL PUBLIC LICENSE version 3 or higher",
-   "GNU General Public License (GPL) version 3, or any later version",
-   "GNU General Public License Version 3 or later (GPL)",
-   "GNU General Public License v3 or later",
-   "GNU General Public License version 3+",
-   "GNU General Public License, Version 3.0 or any later version",
-   "GNU General Public License; either version 3 of the License, or (at your option) any later version",
-   "GNU LGP (GNU General Public License), V3 or later",
-   "GNU General Public License version 3.0 or later",
-   "GPL-3+",
-   "GPL v3+",
-   "GPL 3 or later",
-   "gplv3+",
-   "GNU General Public License (v3 or later)",
-   "GNU General Public License v3+",
-   "GNU General Public License, v3.0 or later",
-   "GNU General Public License, Version 3 and better",
-   "GNU General Public License, Version 3+",
-   "GNU GENERAL PUBLIC LICENSE Version 3 or later",
-   "GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version",
-   "GNU General Public License as published by the Free Software Foundation, either version 3, or (at your option) any later version",
-   "GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
-   "GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
-   "GPL 3.0 or, Version later",
-   "GPL-3.0-or, Version later",
-   "GPL-3.0-or, later",
-   "GPL 3.0 or License, Version later",
-   "GPL 3.0 or License, later",
-   "GPL-3.0-or License, Version later",
-   "GPL-3.0-or License later",
-   "GPL version 3 or later",
-   "GPL version 3.0 or later",
-   "GNU General Public License (GNU GPL), version 3 or later",
-   "GNU General Public License v3 or later (GPLv3+)",
-   "GPLv3.0+",
-   "GPL 3+"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU General Public License 3.0 or later",
+    "scancode_key": "gpl-3.0-plus", 
+    "spdxid": "GPL-3.0-or-later",
+    "aliases": [
+        "GPL-3.0-or-later",
+        "GPL-3.0+",
+        "GPL3.0+",
+        "GPL3+",
+        "GPL (v3 or later)",
+        "GNU General Public License v3.0 or later",
+        "GNU General Public License 3.0 (or any later version)",
+        "scancode://gpl-3.0-plus",
+        "GPL 3.0 or later",
+        "GPLv3+",
+        "GNU GENERAL PUBLIC LICENSE version 3 or higher",
+        "GNU General Public License (GPL) version 3, or any later version",
+        "GNU General Public License Version 3 or later (GPL)",
+        "GNU General Public License v3 or later",
+        "GNU General Public License version 3+",
+        "GNU General Public License, Version 3.0 or any later version",
+        "GNU General Public License; either version 3 of the License, or (at your option) any later version",
+        "GNU LGP (GNU General Public License), V3 or later",
+        "GNU General Public License version 3.0 or later",
+        "GPL-3+",
+        "GPL v3+",
+        "GPL 3 or later",
+        "gplv3+",
+        "GNU General Public License (v3 or later)",
+        "GNU General Public License v3+",
+        "GNU General Public License, v3.0 or later",
+        "GNU General Public License, Version 3 and better",
+        "GNU General Public License, Version 3+",
+        "GNU GENERAL PUBLIC LICENSE Version 3 or later",
+        "GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version",
+        "GNU General Public License as published by the Free Software Foundation, either version 3, or (at your option) any later version",
+        "GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
+        "GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
+        "GPL 3.0 or, Version later",
+        "GPL-3.0-or, Version later",
+        "GPL-3.0-or, later",
+        "GPL 3.0 or License, Version later",
+        "GPL 3.0 or License, later",
+        "GPL-3.0-or License, Version later",
+        "GPL-3.0-or License later",
+        "GPL version 3 or later",
+        "GPL version 3.0 or later",
+        "GNU General Public License (GNU GPL), version 3 or later",
+        "GNU General Public License v3 or later (GPLv3+)",
+        "GPLv3.0+",
+        "GPL 3+",
+        "gpl-3.0-plus"
+    ]
 }
diff --git a/var/licenses/HPND.json b/var/licenses/HPND.json
index d278cfb..d558a58 100644
--- a/var/licenses/HPND.json
+++ b/var/licenses/HPND.json
@@ -1,21 +1,22 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Historical Permission Notice and Disclaimer",
-  "scancode_key": "historical", 
-  "spdxid": "HPND",
-  "aliases": [
-   "HPND",
-   "Historical Permission Notice and Disclaimer",
-   "scancode://historical",
-   "Historic Permission Notice and Disclaimer",
-   "http://www.opensource.org/licenses/historical.php",
-   "https://spdx.org/licenses/hpnd",
-   "scancode:historical",
-   "osi:HPND",
-   "Historical Permission Notice and Disclaimer (HPND)",
-   "HPND License"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Historical Permission Notice and Disclaimer",
+    "scancode_key": "historical", 
+    "spdxid": "HPND",
+    "aliases": [
+        "HPND",
+        "Historical Permission Notice and Disclaimer",
+        "scancode://historical",
+        "Historic Permission Notice and Disclaimer",
+        "http://www.opensource.org/licenses/historical.php",
+        "https://spdx.org/licenses/hpnd",
+        "scancode:historical",
+        "osi:HPND",
+        "Historical Permission Notice and Disclaimer (HPND)",
+        "HPND License",
+        "historical"
+    ]
 }
diff --git a/var/licenses/IJG-short.json b/var/licenses/IJG-short.json
index 7e75ff5..1acbffd 100644
--- a/var/licenses/IJG-short.json
+++ b/var/licenses/IJG-short.json
@@ -1,11 +1,12 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Independent JPEG Group License - short",
-  "scancode_key": "ijg-short",
-  "spdxid": "IJG-short",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Independent JPEG Group License - short",
+    "scancode_key": "ijg-short",
+    "spdxid": "IJG-short",
+    "aliases": [
+        "ijg-short"
+    ]
 }
diff --git a/var/licenses/IJG.json b/var/licenses/IJG.json
index f18fcfb..749a07f 100644
--- a/var/licenses/IJG.json
+++ b/var/licenses/IJG.json
@@ -13,6 +13,7 @@
         "scancode://ijg",
         "JPEG License",
         "IJG LICENSE",
-        "scancode:ijg"
+        "scancode:ijg",
+        "ijg"
     ]
 }
diff --git a/var/licenses/JSON.json b/var/licenses/JSON.json
index c999dad..8202cc1 100644
--- a/var/licenses/JSON.json
+++ b/var/licenses/JSON.json
@@ -1,15 +1,16 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "JSON License",
-  "scancode_key": "json", 
-  "spdxid": "JSON",
-  "aliases": [
-   "JSON",
-   "JSON License",
-   "scancode://json",
-   "JSON evil license"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "JSON License",
+    "scancode_key": "json", 
+    "spdxid": "JSON",
+    "aliases": [
+        "JSON",
+        "JSON License",
+        "scancode://json",
+        "JSON evil license",
+        "json"
+    ]
 }
diff --git a/var/licenses/LGPL-2.0-only.json b/var/licenses/LGPL-2.0-only.json
index 3841728..0b051ac 100644
--- a/var/licenses/LGPL-2.0-only.json
+++ b/var/licenses/LGPL-2.0-only.json
@@ -11,6 +11,7 @@
       "scancode://lgpl-2.0",
       "LGPL 2.0",
       "LGPLv2.0",
-      "LGPL-2"
+      "LGPL-2",
+      "lgpl-2.0"
   ]
 }
diff --git a/var/licenses/LGPL-2.0-or-later.json b/var/licenses/LGPL-2.0-or-later.json
index feaf0b5..f2831b0 100644
--- a/var/licenses/LGPL-2.0-or-later.json
+++ b/var/licenses/LGPL-2.0-or-later.json
@@ -1,36 +1,37 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU Library General Public License 2.0 or later",
-  "scancode_key": "lgpl-2.0-plus",
-  "spdxid": "LGPL-2.0-or-later",
-  "aliases": [
-   "LGPL-2.0-or-later",
-   "LGPL-2.0+",
-   "GNU Library General Public License 2.0 (or any later version)",
-   "scancode://lgpl-2.0-plus",
-   "LGPL 2.0 or later",
-   "GNU Library General Public License, Version 2.0+",
-   "GNU LIBRARY GENERAL PUBLIC LICENSE Version 2+",
-   "GNU Library or Lesser General Public License version 2.0+",
-   "GNU Library General Public License (GPL), Version 2.0+",
-   "GNU Library General Public License (LGPL), Version 2.0+",
-   "GNU Library General Public License 2+",
-   "GNU Library General Public License version 2.0+",
-   "GNU Library General Public License, Version 2.0 or any later version",
-   "LGPL 2+",
-   "LGPL 2.0+ license",
-   "LGPL V.2+",
-   "LGPL v2+",
-   "LGPLv2+",
-   "LGPL-2+",
-   "LGPL2+",
-   "GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version",
-   "GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version",
-   "GNU Library General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version",
-   "GNU Library General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version",
-   "scancode:lgpl-2.0-plus"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU Library General Public License 2.0 or later",
+    "scancode_key": "lgpl-2.0-plus",
+    "spdxid": "LGPL-2.0-or-later",
+    "aliases": [
+        "LGPL-2.0-or-later",
+        "LGPL-2.0+",
+        "GNU Library General Public License 2.0 (or any later version)",
+        "scancode://lgpl-2.0-plus",
+        "LGPL 2.0 or later",
+        "GNU Library General Public License, Version 2.0+",
+        "GNU LIBRARY GENERAL PUBLIC LICENSE Version 2+",
+        "GNU Library or Lesser General Public License version 2.0+",
+        "GNU Library General Public License (GPL), Version 2.0+",
+        "GNU Library General Public License (LGPL), Version 2.0+",
+        "GNU Library General Public License 2+",
+        "GNU Library General Public License version 2.0+",
+        "GNU Library General Public License, Version 2.0 or any later version",
+        "LGPL 2+",
+        "LGPL 2.0+ license",
+        "LGPL V.2+",
+        "LGPL v2+",
+        "LGPLv2+",
+        "LGPL-2+",
+        "LGPL2+",
+        "GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version",
+        "GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version",
+        "GNU Library General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version",
+        "GNU Library General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version",
+        "scancode:lgpl-2.0-plus",
+        "lgpl-2.0-plus"
+    ]
 }
diff --git a/var/licenses/LGPL-2.1-or-later.json b/var/licenses/LGPL-2.1-or-later.json
index 77487bc..d85f3b6 100644
--- a/var/licenses/LGPL-2.1-or-later.json
+++ b/var/licenses/LGPL-2.1-or-later.json
@@ -1,64 +1,65 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU Lesser General Public License 2.1 or later", 
-  "scancode_key": "lgpl-2.1-plus",
- "spdxid": "LGPL-2.1-or-later",
-  "aliases": [
-    "GNU Library General Public License v2.1 or later",
-    "GNU Library General Public License v2 or later",
-    "LGPL-2.1-or-later",
-    "LGPL-2.1+",
-    "LGPL2.1+",
-    "LGPL (v2.1 or later)",
-    "GNU Lesser General Public License v2.1 or later",
-    "GNU Lesser General Public License 2.1 (or any later version)",
-    "scancode://lgpl-2.1-plus",
-    "LGPL 2.1 or later",
-    "GNU Lesser General Public License, Version 2.1+",
-    "GNU LESSER GENERAL PUBLIC LICENSE 2.1+",
-    "GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1+",
-    "LGPL (GNU Lesser General Public License), V2.1 or later",
-    "LGPL 2.1+",
-    "LGPL v2.1+",
-    "LGPL version 2.1+",
-    "LGPL(v2.1+)",
-    "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 2.1+",
-    "GNU Lesser GPL 2.1+",
-    "GNU Lesser General Public License (LGPL), version 2.1+",
-    "GNU Lesser General Public License (LGPL), version 2.1 or later",
-    "GNU Lesser General Public License - v 2.1 or later",
-    "GNU Lesser General Public License Version 2.1 or later",
-    "GNU Lesser General Public License v2.1+",
-    "GNU Lesser General Public License version 2.1+",
-    "GNU Lesser General Public License version 2.1 or later",
-    "GNU Lesser General Public License, 2.1+",
-    "GNU Lesser General Public License, v. 2.1+",
-    "GNU Lesser Public License 2.1+",
-    "GNU Library or Lesser General Public License (LGPL) V2.1+",
-    "GNU Library or Lesser General Public License (LGPL) 2.1+",
-    "GNU General Lesser Public License (LGPL) version 2.1+",
-    "Lesser Gnu Public License, Version 2.1+",
-    "Lesser General Public License (LGPL) v 2.1+",
-    "Lesser General Public License (LGPL), Version 2.1+",
-    "LGPL license, Version 2.1+",
-    "LGPL v 2.1+",
-    "LGPL version 2.1 or later",
-    "LGPL, v2.1 or later",
-    "LGPLv2.1+",
-    "LGPLv2.1 or later",
-    "lgpl_v2_1+",
-    "GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1, or (at your option) any later version",
-    "GNU Lesser General Public License as published by the Free Software Foundation, either version 2.1 of the License, or (at your option) any later version",
-    "GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version",
-    "GNU Lesser General Public License, V2.1 or later",
-    "GNU Lesser General Public License as ~ published by the Free Software Foundation; either version 2.1 of ~ the License, or (at your option) any later version",
-    "scancode:lgpl-2.1-plus",
-    "LGPLv2, greater",
-      "GNU Lesser General Public License v2 or later (LGPLv2+)",
-      "LGPLv2.0+",
-      "LGPL-2.1 or later"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU Lesser General Public License 2.1 or later", 
+    "scancode_key": "lgpl-2.1-plus",
+    "spdxid": "LGPL-2.1-or-later",
+    "aliases": [
+        "GNU Library General Public License v2.1 or later",
+        "GNU Library General Public License v2 or later",
+        "LGPL-2.1-or-later",
+        "LGPL-2.1+",
+        "LGPL2.1+",
+        "LGPL (v2.1 or later)",
+        "GNU Lesser General Public License v2.1 or later",
+        "GNU Lesser General Public License 2.1 (or any later version)",
+        "scancode://lgpl-2.1-plus",
+        "LGPL 2.1 or later",
+        "GNU Lesser General Public License, Version 2.1+",
+        "GNU LESSER GENERAL PUBLIC LICENSE 2.1+",
+        "GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1+",
+        "LGPL (GNU Lesser General Public License), V2.1 or later",
+        "LGPL 2.1+",
+        "LGPL v2.1+",
+        "LGPL version 2.1+",
+        "LGPL(v2.1+)",
+        "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 2.1+",
+        "GNU Lesser GPL 2.1+",
+        "GNU Lesser General Public License (LGPL), version 2.1+",
+        "GNU Lesser General Public License (LGPL), version 2.1 or later",
+        "GNU Lesser General Public License - v 2.1 or later",
+        "GNU Lesser General Public License Version 2.1 or later",
+        "GNU Lesser General Public License v2.1+",
+        "GNU Lesser General Public License version 2.1+",
+        "GNU Lesser General Public License version 2.1 or later",
+        "GNU Lesser General Public License, 2.1+",
+        "GNU Lesser General Public License, v. 2.1+",
+        "GNU Lesser Public License 2.1+",
+        "GNU Library or Lesser General Public License (LGPL) V2.1+",
+        "GNU Library or Lesser General Public License (LGPL) 2.1+",
+        "GNU General Lesser Public License (LGPL) version 2.1+",
+        "Lesser Gnu Public License, Version 2.1+",
+        "Lesser General Public License (LGPL) v 2.1+",
+        "Lesser General Public License (LGPL), Version 2.1+",
+        "LGPL license, Version 2.1+",
+        "LGPL v 2.1+",
+        "LGPL version 2.1 or later",
+        "LGPL, v2.1 or later",
+        "LGPLv2.1+",
+        "LGPLv2.1 or later",
+        "lgpl_v2_1+",
+        "GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1, or (at your option) any later version",
+        "GNU Lesser General Public License as published by the Free Software Foundation, either version 2.1 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License, V2.1 or later",
+        "GNU Lesser General Public License as ~ published by the Free Software Foundation; either version 2.1 of ~ the License, or (at your option) any later version",
+        "scancode:lgpl-2.1-plus",
+        "LGPLv2, greater",
+        "GNU Lesser General Public License v2 or later (LGPLv2+)",
+        "LGPLv2.0+",
+        "LGPL-2.1 or later",
+        "lgpl-2.1-plus"
+    ]
 }
diff --git a/var/licenses/LGPL-3.0-only.json b/var/licenses/LGPL-3.0-only.json
index ce7e944..0acd19e 100644
--- a/var/licenses/LGPL-3.0-only.json
+++ b/var/licenses/LGPL-3.0-only.json
@@ -1,83 +1,83 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU Lesser General Public License 3.0",
-  "scancode_key": "lgpl-3.0", 
-  "spdxid": "LGPL-3.0-only",
-  "aliases": [
-   "LGPL-3.0-only",
-   "LGPL-3.0",
-   "LGPL-3",
-   "LGPL3.0",
-   "LGPL3",
-   "LGPL (v3.0)",
-   "LGPL (v3)",
-   "GNU Lesser General Public License Version 3",
-   "GNU Lesser General Public License v3.0 only",
-   "lgpl-3.0",
-   "GNU LGPLv3",
-   "GNU Lesser General Public License 3.0",
-   "GNU Lesser General Public License, Version 3.0",
-   "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-   "scancode://lgpl-3.0",
-   "LGPL 3.0",
-   "LGPLv3",
-   "GNU General Lesser Public License (LGPL) version 3.0",
-   "GNU General Lesser Public License (LGPL) version 3.00",
-   "GNU General Lesser Public License, Version 3.0",
-   "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) Version 3.0",
-   "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3",
-   "GNU LESSER GENERAL PUBLIC LICENSE - Version 3",
-   "GNU LESSER GENERAL PUBLIC LICENSE 3.0",
-   "GNU LESSER GENERAL PUBLIC LICENSE V3",
-   "GNU LESSER GENERAL PUBLIC LICENSE VERSION 3",
-   "GNU LESSER GENERAL PUBLIC LICENSE v3",
-   "GNU LESSER GENERAL PUBLIC LICENSE version 3",
-   "GNU LESSER GENERAL PUBLIC LICENSE, Version 3",
-   "GNU LGPL V3",
-   "GNU LGPL license v3.0",
-   "GNU Lesser General Public Licence, Version 3",
-   "GNU Lesser General Public License (GNU LGPL), Version 3",
-   "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 3.0",
-   "GNU Lesser GPL, Version 3",
-   "GNU Lesser General Public License (LGPL) v3.0",
-   "GNU Lesser General Public License (LGPL), Version 3",
-   "GNU Lesser General Public License (LGPL), v.3",
-   "GNU Lesser General Public License (LGPL), version 3",
-   "GNU Lesser General Public License - v 3",
-   "GNU Lesser General Public License - version 3",
-   "GNU Lesser General Public License 3",
-   "GNU Lesser General Public License, v3",
-   "GNU Lesser General Public License3",
-   "GNU Lesser General Public v3",
-   "GNU Lesser Public License, Version 3",
-   "GNU LesserGPLv3",
-   "GNU Library or Lesser General Public License (LGPL) 3.0",
-   "GNU Lessor/Library Public License, Version 3.0",
-   "GNU Library or Lesser General Public License (LGPL), Version 3",
-   "GNU Library or Lesser General Public License v3",
-   "Lesser GNU, Version 3.0",
-   "Lesser GNU Public License, Version 3.0",
-   "LGPL v3",
-   "LGPL 3",
-   "Lesser General Public License (LGPL) version 3.0",
-   "Lesser General Public License (LGPL), v 3.0",
-   "Lesser General Public License version 3.0",
-   "LGPL Licence Version 3",
-   "LGPL License (Version 3.0)",
-   "LGPL V3 License",
-   "LGPL Version 3",
-   "LGPL license, Version 3.0",
-   "LGPL v.3",
-   "LGPv3",
-   "http://opensource.org/licenses/lgpl-3.0.html",
-   "http://www.gnu.org/licenses/lgpl-3.0.txt",
-   "FSF Lesser GNU Public License, Version 3",
-   "Lesser GPL 3.0",
-   "scancode:lgpl-3.0",
-   "osi:LGPL-3.0",
-   "GNU Lesser General Public License v3 (LGPLv3)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU Lesser General Public License 3.0",
+    "scancode_key": "lgpl-3.0", 
+    "spdxid": "LGPL-3.0-only",
+    "aliases": [
+        "LGPL-3.0-only",
+        "LGPL-3.0",
+        "LGPL-3",
+        "LGPL3.0",
+        "LGPL3",
+        "LGPL (v3.0)",
+        "LGPL (v3)",
+        "GNU Lesser General Public License Version 3",
+        "GNU Lesser General Public License v3.0 only",
+        "lgpl-3.0",
+        "GNU LGPLv3",
+        "GNU Lesser General Public License 3.0",
+        "GNU Lesser General Public License, Version 3.0",
+        "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+        "scancode://lgpl-3.0",
+        "LGPL 3.0",
+        "LGPLv3",
+        "GNU General Lesser Public License (LGPL) version 3.0",
+        "GNU General Lesser Public License (LGPL) version 3.00",
+        "GNU General Lesser Public License, Version 3.0",
+        "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) Version 3.0",
+        "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3",
+        "GNU LESSER GENERAL PUBLIC LICENSE - Version 3",
+        "GNU LESSER GENERAL PUBLIC LICENSE 3.0",
+        "GNU LESSER GENERAL PUBLIC LICENSE V3",
+        "GNU LESSER GENERAL PUBLIC LICENSE VERSION 3",
+        "GNU LESSER GENERAL PUBLIC LICENSE v3",
+        "GNU LESSER GENERAL PUBLIC LICENSE version 3",
+        "GNU LESSER GENERAL PUBLIC LICENSE, Version 3",
+        "GNU LGPL V3",
+        "GNU LGPL license v3.0",
+        "GNU Lesser General Public Licence, Version 3",
+        "GNU Lesser General Public License (GNU LGPL), Version 3",
+        "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 3.0",
+        "GNU Lesser GPL, Version 3",
+        "GNU Lesser General Public License (LGPL) v3.0",
+        "GNU Lesser General Public License (LGPL), Version 3",
+        "GNU Lesser General Public License (LGPL), v.3",
+        "GNU Lesser General Public License (LGPL), version 3",
+        "GNU Lesser General Public License - v 3",
+        "GNU Lesser General Public License - version 3",
+        "GNU Lesser General Public License 3",
+        "GNU Lesser General Public License, v3",
+        "GNU Lesser General Public License3",
+        "GNU Lesser General Public v3",
+        "GNU Lesser Public License, Version 3",
+        "GNU LesserGPLv3",
+        "GNU Library or Lesser General Public License (LGPL) 3.0",
+        "GNU Lessor/Library Public License, Version 3.0",
+        "GNU Library or Lesser General Public License (LGPL), Version 3",
+        "GNU Library or Lesser General Public License v3",
+        "Lesser GNU, Version 3.0",
+        "Lesser GNU Public License, Version 3.0",
+        "LGPL v3",
+        "LGPL 3",
+        "Lesser General Public License (LGPL) version 3.0",
+        "Lesser General Public License (LGPL), v 3.0",
+        "Lesser General Public License version 3.0",
+        "LGPL Licence Version 3",
+        "LGPL License (Version 3.0)",
+        "LGPL V3 License",
+        "LGPL Version 3",
+        "LGPL license, Version 3.0",
+        "LGPL v.3",
+        "LGPv3",
+        "http://opensource.org/licenses/lgpl-3.0.html",
+        "http://www.gnu.org/licenses/lgpl-3.0.txt",
+        "FSF Lesser GNU Public License, Version 3",
+        "Lesser GPL 3.0",
+        "scancode:lgpl-3.0",
+        "osi:LGPL-3.0",
+        "GNU Lesser General Public License v3 (LGPLv3)"
+    ]
 }
diff --git a/var/licenses/LGPL-3.0-or-later.json b/var/licenses/LGPL-3.0-or-later.json
index 3670b13..a03e7a3 100644
--- a/var/licenses/LGPL-3.0-or-later.json
+++ b/var/licenses/LGPL-3.0-or-later.json
@@ -1,100 +1,101 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "GNU Lesser General Public License 3.0 or later",
-  "scancode_key": "lgpl-3.0-plus", 
-  "spdxid": "LGPL-3.0-or-later",
-  "aliases": [
-   "LGPL-3.0-or-later",
-   "LGPL-3.0+",
-   "LGPL-3+",
-   "LGPL3.0+",
-   "LGPL (v3 or later)",
-   "GNU Lesser General Public License v3.0 or later",
-   "GNU Lesser General Public License 3.0 (or any later version)",
-   "scancode://lgpl-3.0-plus",
-   "LGPL 3.0 or later",
-   "LGPLv3+",
-   "GNU Lesser General Public License, Version 3.0+",
-   "GNU General Lesser Public License (LGPL) version 3.0+",
-   "GNU General Lesser Public License (LGPL) version 3.00+",
-   "GNU General Lesser Public License, Version 3.0+",
-   "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) Version 3.0+",
-   "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE - Version 3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE 3.0+",
-   "GNU LESSER GENERAL PUBLIC LICENSE V3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE V3.0+",
-   "GNU LESSER GENERAL PUBLIC LICENSE VERSION 3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE v3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE v3.0+",
-   "GNU LESSER GENERAL PUBLIC LICENSE version 3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE, Version 3+",
-   "GNU LESSER GENERAL PUBLIC LICENSE, Version 3.0+",
-   "GNU LGPL V3+",
-   "GNU LGPL license v3.0+",
-   "GNU Lesser General Public Licence, Version 3+",
-   "GNU Lesser General Public License (GNU LGPL), Version 3+",
-   "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 3.0+",
-   "GNU Lesser GPL, Version 3+",
-   "GNU Lesser General Public License (LGPL) v3.0+",
-   "GNU Lesser General Public License (LGPL), Version 3+",
-   "GNU Lesser General Public License (LGPL), Version 3.0+",
-   "GNU Lesser General Public License (LGPL), v.3+",
-   "GNU Lesser General Public License (LGPL), version 3+",
-   "GNU Lesser General Public License (LGPLV3+)",
-   "GNU Lesser General Public License - v 3+",
-   "GNU Lesser General Public License - version 3+",
-   "GNU Lesser General Public License Version 3+",
-   "GNU Lesser General Public License 3+",
-   "GNU Lesser General Public License 3.0+",
-   "GNU Lesser General Public License v3+",
-   "GNU Lesser General Public License ver. 3 or later",
-   "GNU Lesser General Public License version 3+",
-   "GNU Lesser General Public License, v3.0+",
-   "GNU Lesser General Public License, version 3 or later",
-   "GNU Lesser General Public License3+",
-   "GNU Lesser General Public v3+",
-   "GNU Lesser Public License, Version 3+",
-   "GNU LesserGPLv3+",
-   "GNU Library or Lesser General Public License (LGPL) 3.0+",
-   "GNU Lessor/Library Public License, Version 3.0+",
-   "GNU Library or Lesser General Public License (LGPL), Version 3+",
-   "GNU Library or Lesser General Public License v3+",
-   "Lesser GNU, Version 3.0+",
-   "Lesser GNU Public License, Version 3.0+",
-   "GNU Lesser General Public Licence, Version 3.0+",
-   "LGPL v3+",
-   "LGPL 3+",
-   "LGPL 3.0+",
-   "Lesser General Public License (LGPL) v 3.0+",
-   "Lesser General Public License, version 3 or greater",
-   "Lesser General Public License (LGPL) version 3.0+",
-   "Lesser General Public License version 3.0+",
-   "LGPL Licence Version 3+",
-   "LGPL License (Version 3.0+)",
-   "LGPL V3+ License",
-   "LGPL Version 3+",
-   "LGPL Version 3.0+",
-   "LGPL license, Version 3.0+",
-   "LGPL v.3+",
-   "LGPL v3.0+",
-   "LGPL3+",
-   "LGPLv3 or later",
-   "LGPv3+",
-   "GNU Lesser General Public License Version 3 or later",
-   "FSF Lesser GNU Public License, Version 3+",
-   "Lesser GPL 3.0+",
-   "GNU LGPLv3+",
-   "GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
-   "GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
-   "GNU Lesser General Public License as published by the Free Software Foundation, version 3 or above",
-   "GNU Lesser General Public License as published by the Free Software Foundation; either version 3.0 of the License, or (at your option) any later version",
-   "GNU Lesser General Public License (LGPL) as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
-   "GNU Lesser General Public License (LGPL) version 3 or later",
-   "scancode:lgpl-3.0-plus",
-   "GNU Lesser General Public License v3 or later (LGPLv3+)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "GNU Lesser General Public License 3.0 or later",
+    "scancode_key": "lgpl-3.0-plus", 
+    "spdxid": "LGPL-3.0-or-later",
+    "aliases": [
+        "LGPL-3.0-or-later",
+        "LGPL-3.0+",
+        "LGPL-3+",
+        "LGPL3.0+",
+        "LGPL (v3 or later)",
+        "GNU Lesser General Public License v3.0 or later",
+        "GNU Lesser General Public License 3.0 (or any later version)",
+        "scancode://lgpl-3.0-plus",
+        "LGPL 3.0 or later",
+        "LGPLv3+",
+        "GNU Lesser General Public License, Version 3.0+",
+        "GNU General Lesser Public License (LGPL) version 3.0+",
+        "GNU General Lesser Public License (LGPL) version 3.00+",
+        "GNU General Lesser Public License, Version 3.0+",
+        "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) Version 3.0+",
+        "GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE - Version 3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE 3.0+",
+        "GNU LESSER GENERAL PUBLIC LICENSE V3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE V3.0+",
+        "GNU LESSER GENERAL PUBLIC LICENSE VERSION 3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE v3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE v3.0+",
+        "GNU LESSER GENERAL PUBLIC LICENSE version 3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE, Version 3+",
+        "GNU LESSER GENERAL PUBLIC LICENSE, Version 3.0+",
+        "GNU LGPL V3+",
+        "GNU LGPL license v3.0+",
+        "GNU Lesser General Public Licence, Version 3+",
+        "GNU Lesser General Public License (GNU LGPL), Version 3+",
+        "GNU LIBRARY GENERAL PUBLIC LICENSE, Version 3.0+",
+        "GNU Lesser GPL, Version 3+",
+        "GNU Lesser General Public License (LGPL) v3.0+",
+        "GNU Lesser General Public License (LGPL), Version 3+",
+        "GNU Lesser General Public License (LGPL), Version 3.0+",
+        "GNU Lesser General Public License (LGPL), v.3+",
+        "GNU Lesser General Public License (LGPL), version 3+",
+        "GNU Lesser General Public License (LGPLV3+)",
+        "GNU Lesser General Public License - v 3+",
+        "GNU Lesser General Public License - version 3+",
+        "GNU Lesser General Public License Version 3+",
+        "GNU Lesser General Public License 3+",
+        "GNU Lesser General Public License 3.0+",
+        "GNU Lesser General Public License v3+",
+        "GNU Lesser General Public License ver. 3 or later",
+        "GNU Lesser General Public License version 3+",
+        "GNU Lesser General Public License, v3.0+",
+        "GNU Lesser General Public License, version 3 or later",
+        "GNU Lesser General Public License3+",
+        "GNU Lesser General Public v3+",
+        "GNU Lesser Public License, Version 3+",
+        "GNU LesserGPLv3+",
+        "GNU Library or Lesser General Public License (LGPL) 3.0+",
+        "GNU Lessor/Library Public License, Version 3.0+",
+        "GNU Library or Lesser General Public License (LGPL), Version 3+",
+        "GNU Library or Lesser General Public License v3+",
+        "Lesser GNU, Version 3.0+",
+        "Lesser GNU Public License, Version 3.0+",
+        "GNU Lesser General Public Licence, Version 3.0+",
+        "LGPL v3+",
+        "LGPL 3+",
+        "LGPL 3.0+",
+        "Lesser General Public License (LGPL) v 3.0+",
+        "Lesser General Public License, version 3 or greater",
+        "Lesser General Public License (LGPL) version 3.0+",
+        "Lesser General Public License version 3.0+",
+        "LGPL Licence Version 3+",
+        "LGPL License (Version 3.0+)",
+        "LGPL V3+ License",
+        "LGPL Version 3+",
+        "LGPL Version 3.0+",
+        "LGPL license, Version 3.0+",
+        "LGPL v.3+",
+        "LGPL v3.0+",
+        "LGPL3+",
+        "LGPLv3 or later",
+        "LGPv3+",
+        "GNU Lesser General Public License Version 3 or later",
+        "FSF Lesser GNU Public License, Version 3+",
+        "Lesser GPL 3.0+",
+        "GNU LGPLv3+",
+        "GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License as published by the Free Software Foundation, version 3 or above",
+        "GNU Lesser General Public License as published by the Free Software Foundation; either version 3.0 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License (LGPL) as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version",
+        "GNU Lesser General Public License (LGPL) version 3 or later",
+        "scancode:lgpl-3.0-plus",
+        "GNU Lesser General Public License v3 or later (LGPLv3+)",
+        "lgpl-3.0-plus"
+    ]
 }
diff --git a/var/licenses/LLVM-exception.json b/var/licenses/LLVM-exception.json
index 7a0e77b..77f6bce 100644
--- a/var/licenses/LLVM-exception.json
+++ b/var/licenses/LLVM-exception.json
@@ -10,6 +10,7 @@
         "LLVM Exceptions",
         "LLVM Exception",
         "LLVM exception",
-        "LLVM-exception"
-  ]
+        "LLVM-exception",
+        "llvm-exception"
+    ]
 }
diff --git a/var/licenses/Latex2e.json b/var/licenses/Latex2e.json
index 39fb8cd..fb35528 100644
--- a/var/licenses/Latex2e.json
+++ b/var/licenses/Latex2e.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Latex2e License",
-  "scancode_key": "latex2e",
-  "spdxid": "Latex2e",
-  "aliases": [
-   "Latex2e",
-   "Latex2e License",
-   "scancode://latex2e",
-   "LATEX2E LICENSE",
-   "LATEX2E License",
-   "https://spdx.org/licenses/latex2e",
-   "scancode:latex2e"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Latex2e License",
+    "scancode_key": "latex2e",
+    "spdxid": "Latex2e",
+    "aliases": [
+        "Latex2e",
+        "Latex2e License",
+        "scancode://latex2e",
+        "LATEX2E LICENSE",
+        "LATEX2E License",
+        "https://spdx.org/licenses/latex2e",
+        "scancode:latex2e",
+        "latex2e"
+    ]
 }
diff --git a/var/licenses/Libpng.json b/var/licenses/Libpng.json
index 938eac6..6d30961 100644
--- a/var/licenses/Libpng.json
+++ b/var/licenses/Libpng.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Libpng License",
-  "scancode_key": "libpng", 
-  "spdxid": "Libpng",
-  "aliases": [
-   "Libpng",
-   "libpng License",
-   "PNG Reference Library License 1.0",
-   "Libpng-1.0",
-   "scancode://libpng",
-   "PNG Reference Library License 1",
-   "PNG Reference Library License version 1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Libpng License",
+    "scancode_key": "libpng", 
+    "spdxid": "Libpng",
+    "aliases": [
+        "Libpng",
+        "libpng License",
+        "PNG Reference Library License 1.0",
+        "Libpng-1.0",
+        "scancode://libpng",
+        "PNG Reference Library License 1",
+        "PNG Reference Library License version 1",
+        "libpng"
+    ]
 }
diff --git a/var/licenses/LicenseRef-scancode-boost-original.json b/var/licenses/LicenseRef-scancode-boost-original.json
index fd54251..273d1eb 100644
--- a/var/licenses/LicenseRef-scancode-boost-original.json
+++ b/var/licenses/LicenseRef-scancode-boost-original.json
@@ -1,13 +1,14 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Boost Original",
-  "scancode_key": "boost-original",
-  "spdxid": "LicenseRef-scancode-boost-original",
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Boost Original",
+    "scancode_key": "boost-original",
+    "spdxid": "LicenseRef-scancode-boost-original",
     "aliases": [
         "Boost Original",
-        "Original Boost"
-  ]
+        "Original Boost",
+        "boost-original"
+    ]
 }
diff --git a/var/licenses/LicenseRef-scancode-docbook.json b/var/licenses/LicenseRef-scancode-docbook.json
index 93adbc8..d32188b 100644
--- a/var/licenses/LicenseRef-scancode-docbook.json
+++ b/var/licenses/LicenseRef-scancode-docbook.json
@@ -8,6 +8,7 @@
   "spdxid": "LicenseRef-scancode-docbook",
   "aliases": [
       "dmit",
-      "DMIT"
+      "DMIT",
+      "docbook"
   ]
 }
diff --git a/var/licenses/LicenseRef-scancode-g10-permissive.json b/var/licenses/LicenseRef-scancode-g10-permissive.json
index 10a792a..ae2d3cc 100644
--- a/var/licenses/LicenseRef-scancode-g10-permissive.json
+++ b/var/licenses/LicenseRef-scancode-g10-permissive.json
@@ -8,5 +8,6 @@
     "spdxid": "LicenseRef-scancode-g10-permissive",
     "compatibility_as": "MIT",
     "aliases": [
+        "g10-permissive"
     ]
 }
diff --git a/var/licenses/LicenseRef-scancode-indiana-extreme.json b/var/licenses/LicenseRef-scancode-indiana-extreme.json
index 756fceb..6bcc7b2 100644
--- a/var/licenses/LicenseRef-scancode-indiana-extreme.json
+++ b/var/licenses/LicenseRef-scancode-indiana-extreme.json
@@ -7,5 +7,6 @@
     "scancode_key": "indiana-extreme",
     "spdxid": "LicenseRef-scancode-indiana-extreme",
     "aliases": [
+        "indiana-extreme"
     ]
 }
diff --git a/var/licenses/LicenseRef-scancode-iso-8879.json b/var/licenses/LicenseRef-scancode-iso-8879.json
index 6bef220..426714b 100644
--- a/var/licenses/LicenseRef-scancode-iso-8879.json
+++ b/var/licenses/LicenseRef-scancode-iso-8879.json
@@ -7,6 +7,7 @@
   "scancode_key": "iso-8879",
   "spdxid": "LicenseRef-scancode-iso-8879",
   "aliases": [
-      "LicenseRef-ISO-8879"
+      "LicenseRef-ISO-8879",
+      "iso-8879"
   ]
 }
diff --git a/var/licenses/LicenseRef-scancode-public-domain.json b/var/licenses/LicenseRef-scancode-public-domain.json
index f3a1390..78538a9 100644
--- a/var/licenses/LicenseRef-scancode-public-domain.json
+++ b/var/licenses/LicenseRef-scancode-public-domain.json
@@ -12,7 +12,8 @@
       "Public domain",
       "LicenseRef-Fedora-Public-Domain",
       "Public Domain Dedication and License",
-      "Public-Domain"
+      "Public-Domain",
+      "public-domain"
   ],
   "compatibility_as": "CC0-1.0"
 }
diff --git a/var/licenses/LicenseRef-scancode-wtfpl-1.0.json b/var/licenses/LicenseRef-scancode-wtfpl-1.0.json
index 8d0dfea..145479c 100644
--- a/var/licenses/LicenseRef-scancode-wtfpl-1.0.json
+++ b/var/licenses/LicenseRef-scancode-wtfpl-1.0.json
@@ -7,5 +7,6 @@
   "scancode_key": "wtfpl-1.0",
   "spdxid": "LicenseRef-scancode-wtfpl-1.0",
   "aliases": [
+      "wtfpl-1.0"
   ]
 }
diff --git a/var/licenses/LicenseRef-scancode-xfree86-1.0.json b/var/licenses/LicenseRef-scancode-xfree86-1.0.json
index ba01672..03f3714 100644
--- a/var/licenses/LicenseRef-scancode-xfree86-1.0.json
+++ b/var/licenses/LicenseRef-scancode-xfree86-1.0.json
@@ -1,11 +1,12 @@
 {
-"meta": {
-    "disclaimer": "https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "XFree86 License 1.0",
-  "scancode_key": "xfree86-1.0",
-  "spdxid": "LicenseRef-scancode-xfree86-1.0",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "XFree86 License 1.0",
+    "scancode_key": "xfree86-1.0",
+    "spdxid": "LicenseRef-scancode-xfree86-1.0",
+    "aliases": [
+        "xfree86-1.0"
+    ]
 }
diff --git a/var/licenses/LicenseRef-scancode-zpl-1.0.json b/var/licenses/LicenseRef-scancode-zpl-1.0.json
index 65ec6ae..37eee82 100644
--- a/var/licenses/LicenseRef-scancode-zpl-1.0.json
+++ b/var/licenses/LicenseRef-scancode-zpl-1.0.json
@@ -1,11 +1,12 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Zope Public License 1.0",
-  "scancode_key": "zpl-1.0",
-  "spdxid": "LicenseRef-scancode-zpl-1.0",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Zope Public License 1.0",
+    "scancode_key": "zpl-1.0",
+    "spdxid": "LicenseRef-scancode-zpl-1.0",
+    "aliases": [
+        "zpl-1.0"
+    ]
 }
diff --git a/var/licenses/Linux-syscall-note.json b/var/licenses/Linux-syscall-note.json
index 30e2391..283a273 100644
--- a/var/licenses/Linux-syscall-note.json
+++ b/var/licenses/Linux-syscall-note.json
@@ -7,6 +7,7 @@
     "scancode_key": "linux-syscall-exception-gpl",
     "spdxid": "Linux-syscall-note",
     "aliases": [
+        "linux-syscall-exception-gpl"
     ],
     "compatibility_as": "Classpath-exception-2.0"
 }
diff --git a/var/licenses/MIT-Modern-Variant.json b/var/licenses/MIT-Modern-Variant.json
index 7f888a8..03561d2 100644
--- a/var/licenses/MIT-Modern-Variant.json
+++ b/var/licenses/MIT-Modern-Variant.json
@@ -11,6 +11,7 @@
         "MIT-Modern-Variant",
         "scancode://mit-modern",
         "MIT Modern Variant",
-        "MIT License Modern Variant"
+        "MIT License Modern Variant",
+        "mit-modern"
     ]
 }
diff --git a/var/licenses/MIT-Wu.json b/var/licenses/MIT-Wu.json
index 1821841..d138b87 100644
--- a/var/licenses/MIT-Wu.json
+++ b/var/licenses/MIT-Wu.json
@@ -8,5 +8,6 @@
     "compatibility_as": "MIT",
     "spdxid": "MIT-Wu",
     "aliases": [
+        "mit-addition"
     ]
 }
diff --git a/var/licenses/MIT-advertising.json b/var/licenses/MIT-advertising.json
index a066539..92a4219 100644
--- a/var/licenses/MIT-advertising.json
+++ b/var/licenses/MIT-advertising.json
@@ -1,20 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Enlightenment License (e16)",
-  "scancode_key": "enlightenment", 
-  "spdxid": "MIT-advertising",
-  "aliases": [
-   "MIT-advertising",
-   "MIT License (with advertising)",
-   "MIT with advertising",
-   "MIT advertising License",
-   "MIT ADVERTISING LICENSE",
-   "MIT ADVERTISING License",
-   "MIT-advertising License",
-   "MIT-ADVERTISING LICENSE",
-   "MIT-ADVERTISING License"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Enlightenment License (e16)",
+    "scancode_key": "enlightenment", 
+    "spdxid": "MIT-advertising",
+    "aliases": [
+        "MIT-advertising",
+        "MIT License (with advertising)",
+        "MIT with advertising",
+        "MIT advertising License",
+        "MIT ADVERTISING LICENSE",
+        "MIT ADVERTISING License",
+        "MIT-advertising License",
+        "MIT-ADVERTISING LICENSE",
+        "MIT-ADVERTISING License",
+        "enlightenment"
+    ]
 }
diff --git a/var/licenses/MITNFA.json b/var/licenses/MITNFA.json
index af52d1e..d0cebcd 100644
--- a/var/licenses/MITNFA.json
+++ b/var/licenses/MITNFA.json
@@ -13,6 +13,7 @@
    "MIT +no-false-attribs License",
    "scancode://mit-no-false-attribs",
    "MIT no false attribution License",
-   "scancode:mit-no-false-attribs"
+   "scancode:mit-no-false-attribs",
+   "mit-no-false-attribs"
   ]
 }
diff --git a/var/licenses/MPL-1.0.json b/var/licenses/MPL-1.0.json
index eb90fef..89f49e3 100644
--- a/var/licenses/MPL-1.0.json
+++ b/var/licenses/MPL-1.0.json
@@ -1,21 +1,22 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Mozilla Public License 1.0",
-  "scancode_key": "mpl-1.0", 
-  "spdxid": "MPL-1.0",
-  "aliases": [
-   "MPL-1.0",
-   "Mozilla Public License 1.0",
-   "Mozilla Public License, Version 1.0",
-   "License :: OSI Approved :: Mozilla Public License 1.0 (MPL)",
-   "Mozilla Public License Version 1.0",
-   "scancode://mpl-1.0",
-   "Mozilla Public License 1.0 (MPL)",
-   "MPLv1.0",
-   "scancode:mpl-1.0",
-   "osi:MPL-1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Mozilla Public License 1.0",
+    "scancode_key": "mpl-1.0", 
+    "spdxid": "MPL-1.0",
+    "aliases": [
+        "MPL-1.0",
+        "Mozilla Public License 1.0",
+        "Mozilla Public License, Version 1.0",
+        "License :: OSI Approved :: Mozilla Public License 1.0 (MPL)",
+        "Mozilla Public License Version 1.0",
+        "scancode://mpl-1.0",
+        "Mozilla Public License 1.0 (MPL)",
+        "MPLv1.0",
+        "scancode:mpl-1.0",
+        "osi:MPL-1.0",
+        "mpl-1.0"
+    ]
 }
diff --git a/var/licenses/MPL-1.1.json b/var/licenses/MPL-1.1.json
index 3939764..efcae98 100644
--- a/var/licenses/MPL-1.1.json
+++ b/var/licenses/MPL-1.1.json
@@ -20,7 +20,7 @@
    "MOZILLA PUBLIC LICENSE 1.1",
    "MOZILLA PUBLIC LICENSE Version 1.1",
    "Mozilla Public License (MPL) version 1.1",
-   "scancode:dpl-1.1",
+   "mpl-1.1",
    "scancode:monetdb-1.1",
    "osi:MPL-1.1"
   ]
diff --git a/var/licenses/MPL-2.0-no-copyleft-exception.json b/var/licenses/MPL-2.0-no-copyleft-exception.json
index 8983b44..136f566 100644
--- a/var/licenses/MPL-2.0-no-copyleft-exception.json
+++ b/var/licenses/MPL-2.0-no-copyleft-exception.json
@@ -1,15 +1,16 @@
 {
-  "meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Mozilla Public License 2.0 (no copyleft exception)",
-  "scancode_key": "mpl-2.0-no-copyleft-exception",
-  "spdxid": "MPL-2.0-no-copyleft-exception",
-  "aliases": [
-    "MPL-2.0-no-copyleft-exception",
-    "Mozilla Public License 2.0 (no copyleft exception)",
-    "scancode://mpl-2.0-no-copyleft-exception",
-    "MPL 2.0 with no copyleft exception"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Mozilla Public License 2.0 (no copyleft exception)",
+    "scancode_key": "mpl-2.0-no-copyleft-exception",
+    "spdxid": "MPL-2.0-no-copyleft-exception",
+    "aliases": [
+        "MPL-2.0-no-copyleft-exception",
+        "Mozilla Public License 2.0 (no copyleft exception)",
+        "scancode://mpl-2.0-no-copyleft-exception",
+        "MPL 2.0 with no copyleft exception",
+        "mpl-2.0-no-copyleft-exception"
+    ]
 }
diff --git a/var/licenses/MPL-2.0.json b/var/licenses/MPL-2.0.json
index 3a780d9..dc4e833 100644
--- a/var/licenses/MPL-2.0.json
+++ b/var/licenses/MPL-2.0.json
@@ -1,32 +1,32 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Mozilla Public License 2.0",
-  "scancode_key": "mpl-2.0", 
-  "spdxid": "MPL-2.0",
-  "aliases": [
-   "Mozilla Public License 2.0",
-   "mpl-2.0",
-   "mozilla2.0",
-   "Mozilla Public License, Version 2.0",
-   "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-   "Mozilla Public License Version 2.0",
-   "scancode://mpl-2.0",
-   "MPL 2.0",
-   "Mozilla Public License, v. 2.0",
-   "Mozilla Public License version 2.0",
-   "Mozilla Public License (Version 2.0)",
-   "Mozilla Public License v2.0",
-   "Mozilla License Version 2.0",
-   "Mozilla Public Licence 2.0",
-   "Mozilla Public License 2.0 (MPL 2.0)",
-   "MPLv2.0",
-   "MPL-2",
-   "scancode:mpl-2.0",
-   "osi:MPL-2.0",
-      "MPLv2",
-      "MPL-2.0+"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Mozilla Public License 2.0",
+    "scancode_key": "mpl-2.0", 
+    "spdxid": "MPL-2.0",
+    "aliases": [
+        "Mozilla Public License 2.0",
+        "mpl-2.0",
+        "mozilla2.0",
+        "Mozilla Public License, Version 2.0",
+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+        "Mozilla Public License Version 2.0",
+        "scancode://mpl-2.0",
+        "MPL 2.0",
+        "Mozilla Public License, v. 2.0",
+        "Mozilla Public License version 2.0",
+        "Mozilla Public License (Version 2.0)",
+        "Mozilla Public License v2.0",
+        "Mozilla License Version 2.0",
+        "Mozilla Public Licence 2.0",
+        "Mozilla Public License 2.0 (MPL 2.0)",
+        "MPLv2.0",
+        "MPL-2",
+        "scancode:mpl-2.0",
+        "osi:MPL-2.0",
+        "MPLv2",
+        "MPL-2.0+"
+    ]
 }
diff --git a/var/licenses/NCSA.json b/var/licenses/NCSA.json
index 883a143..e3edcea 100644
--- a/var/licenses/NCSA.json
+++ b/var/licenses/NCSA.json
@@ -1,24 +1,24 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "University of Illinois/NCSA Open Source License",
-  "scancode_key": "uoi-ncsa",
-  "spdxid": "NCSA",
-  "aliases": [
-   "NCSA",
-   "University of Illinois/NCSA Open Source License",
-   "ncsa",
-   "UIUC/NCSA",
-   "NCSA License",
-   "uoi-ncsa",
-   "The University of Illinois/NCSA Open Source License",
-   "License :: OSI Approved :: University of Illinois/NCSA Open Source License",
-   "scancode://uoi-ncsa",
-   "NCSA Open Source License",
-   "NCSA LICENSE",
-   "scancode:uoi-ncsa",
-   "osi:NCSA"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "University of Illinois/NCSA Open Source License",
+    "scancode_key": "uoi-ncsa",
+    "spdxid": "NCSA",
+    "aliases": [
+        "NCSA",
+        "University of Illinois/NCSA Open Source License",
+        "ncsa",
+        "UIUC/NCSA",
+        "NCSA License",
+        "uoi-ncsa",
+        "The University of Illinois/NCSA Open Source License",
+        "License :: OSI Approved :: University of Illinois/NCSA Open Source License",
+        "scancode://uoi-ncsa",
+        "NCSA Open Source License",
+        "NCSA LICENSE",
+        "scancode:uoi-ncsa",
+        "osi:NCSA"
+    ]
 }
diff --git a/var/licenses/NTP.json b/var/licenses/NTP.json
index 50be4a4..a1fc0ad 100644
--- a/var/licenses/NTP.json
+++ b/var/licenses/NTP.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "MIT Old Style no advertising",
-  "scancode_key": "ntpl", 
-  "spdxid": "NTP",
-  "aliases": [
-   "NTP",
-   "NTP License",
-   "NTP License (NTP)",
-   "scancode://ntpl",
-   "scancode:network-time-protocol",
-   "scancode:ntpl",
-   "osi:NTP"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "MIT Old Style no advertising",
+    "scancode_key": "ntpl", 
+    "spdxid": "NTP",
+    "aliases": [
+        "NTP",
+        "NTP License",
+        "NTP License (NTP)",
+        "scancode://ntpl",
+        "scancode:network-time-protocol",
+        "scancode:ntpl",
+        "osi:NTP",
+        "ntpl"
+    ]
 }
diff --git a/var/licenses/ODC-By-1.0.json b/var/licenses/ODC-By-1.0.json
index 56ce565..2a803b8 100644
--- a/var/licenses/ODC-By-1.0.json
+++ b/var/licenses/ODC-By-1.0.json
@@ -1,24 +1,25 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Open Data Commons Attribution License v1.0",
-  "scancode_key": "odc-by-1.0", 
-  "spdxid": "ODC-By-1.0",
-  "aliases": [
-   "ODC-By-1.0",
-   "ODC By License 1.0",
-   "ODC-BY-1.0",
-   "Open Data Commons Attribution License 1.0",
-   "Open Data Commons Attribution License v1.0",
-   "scancode://odc-by-1.0",
-   "ODC By, Version 1.0",
-   "ODC By, 1.0",
-   "ODC By License, Version 1.0",
-   "ODC By License, 1.0",
-   "ODC Attribution License",
-   "ODC-By",
-   "scancode:odc-by-1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Open Data Commons Attribution License v1.0",
+    "scancode_key": "odc-by-1.0", 
+    "spdxid": "ODC-By-1.0",
+    "aliases": [
+        "ODC-By-1.0",
+        "ODC By License 1.0",
+        "ODC-BY-1.0",
+        "Open Data Commons Attribution License 1.0",
+        "Open Data Commons Attribution License v1.0",
+        "scancode://odc-by-1.0",
+        "ODC By, Version 1.0",
+        "ODC By, 1.0",
+        "ODC By License, Version 1.0",
+        "ODC By License, 1.0",
+        "ODC Attribution License",
+        "ODC-By",
+        "scancode:odc-by-1.0",
+        "odc-by-1.0"
+    ]
 }
diff --git a/var/licenses/OFL-1.0.json b/var/licenses/OFL-1.0.json
index 3b178dd..5f379d5 100644
--- a/var/licenses/OFL-1.0.json
+++ b/var/licenses/OFL-1.0.json
@@ -1,19 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SIL Open Font License 1.0",
-  "scancode_key": "ofl-1.0",
-  "spdxid": "OFL-1.0",
-  "aliases": [
-   "OFL-1.0",
-   "SIL Open Font License 1.0",
-   "SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005",
-   "scancode://ofl-1.0",
-   "OFL 1.0",
-   "OFL, Version 1.0",
-   "SIL OPEN FONT LICENSE Version 1.0",
-   "scancode:ofl-1.0-no-rfn"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SIL Open Font License 1.0",
+    "scancode_key": "ofl-1.0",
+    "spdxid": "OFL-1.0",
+    "aliases": [
+        "OFL-1.0",
+        "SIL Open Font License 1.0",
+        "SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005",
+        "scancode://ofl-1.0",
+        "OFL 1.0",
+        "OFL, Version 1.0",
+        "SIL OPEN FONT LICENSE Version 1.0",
+        "ofl-1.0"
+    ]
 }
diff --git a/var/licenses/OFL-1.1.json b/var/licenses/OFL-1.1.json
index 93fcbbb..9760903 100644
--- a/var/licenses/OFL-1.1.json
+++ b/var/licenses/OFL-1.1.json
@@ -1,24 +1,24 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SIL Open Font License 1.1",
-  "scancode_key": "ofl-1.1",
-  "spdxid": "OFL-1.1",
-  "aliases": [
-   "OFL-1.1",
-   "ofl-1.1",
-   "SIL Open Font License 1.1",
-   "Open Font License 1.1",
-   "SIL Open Font License, Version 1.1",
-   "SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007",
-   "scancode://ofl-1.1",
-   "OFL, Version 1.1",
-   "OFL 1.1",
-   "SIL OPEN FONT LICENSE Version 1.1",
-   "scancode:ofl-1.1",
-   "osi:OFL-1.1",
-   "SIL Open Font License 1.1 (OFL-1.1)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SIL Open Font License 1.1",
+    "scancode_key": "ofl-1.1",
+    "spdxid": "OFL-1.1",
+    "aliases": [
+        "OFL-1.1",
+        "ofl-1.1",
+        "SIL Open Font License 1.1",
+        "Open Font License 1.1",
+        "SIL Open Font License, Version 1.1",
+        "SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007",
+        "scancode://ofl-1.1",
+        "OFL, Version 1.1",
+        "OFL 1.1",
+        "SIL OPEN FONT LICENSE Version 1.1",
+        "scancode:ofl-1.1",
+        "osi:OFL-1.1",
+        "SIL Open Font License 1.1 (OFL-1.1)"
+    ]
 }
diff --git a/var/licenses/OML.json b/var/licenses/OML.json
index a5d2a10..bc74615 100644
--- a/var/licenses/OML.json
+++ b/var/licenses/OML.json
@@ -1,17 +1,18 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "FastCGI DevKit",
-  "scancode_key": "fastcgi-devkit", 
-  "spdxid": "OML",
-  "aliases": [
-   "OML",
-   "Open Market License",
-   "scancode://fastcgi-devkit",
-   "FastCGI DevKit",
-   "OM License",
-   "scancode:fastcgi-devkit"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "FastCGI DevKit",
+    "scancode_key": "fastcgi-devkit", 
+    "spdxid": "OML",
+    "aliases": [
+        "OML",
+        "Open Market License",
+        "scancode://fastcgi-devkit",
+        "FastCGI DevKit",
+        "OM License",
+        "scancode:fastcgi-devkit",
+        "fastcgi-devkit"
+    ]
 }
diff --git a/var/licenses/OpenSSL.json b/var/licenses/OpenSSL.json
index cef8c72..35f6831 100644
--- a/var/licenses/OpenSSL.json
+++ b/var/licenses/OpenSSL.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "OpenSSL/SSLeay License",
-  "scancode_key": "openssl-ssleay",
-  "spdxid": "OpenSSL",
-  "aliases": [
-   "OpenSSL",
-   "OpenSSL License",
-   "scancode://openssl-ssleay",
-   "OpenSSL/SSLeay License",
-   "scancode://openssl",
-   "LicenseRef-scancode-openssl",
-   "OpenSSL license"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "OpenSSL/SSLeay License",
+    "scancode_key": "openssl-ssleay",
+    "spdxid": "OpenSSL",
+    "aliases": [
+        "OpenSSL",
+        "OpenSSL License",
+        "scancode://openssl-ssleay",
+        "OpenSSL/SSLeay License",
+        "scancode://openssl",
+        "LicenseRef-scancode-openssl",
+        "OpenSSL license",
+        "openssl-ssleay"
+    ]
 }
diff --git a/var/licenses/Plexus.json b/var/licenses/Plexus.json
index 0221791..948a204 100644
--- a/var/licenses/Plexus.json
+++ b/var/licenses/Plexus.json
@@ -1,16 +1,17 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Plexus Classworlds License",
-  "scancode_key": "classworlds", 
-  "spdxid": "Plexus",
-  "aliases": [
-   "Plexus",
-   "Plexus Classworlds License",
-   "Plexus License",
-   "PLEXUS LICENSE",
-   "scancode:classworlds"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Plexus Classworlds License",
+    "scancode_key": "classworlds", 
+    "spdxid": "Plexus",
+    "aliases": [
+        "Plexus",
+        "Plexus Classworlds License",
+        "Plexus License",
+        "PLEXUS LICENSE",
+        "scancode:classworlds",
+        "classworlds"
+    ]
 }
diff --git a/var/licenses/PostgreSQL.json b/var/licenses/PostgreSQL.json
index 3de35de..44deb16 100644
--- a/var/licenses/PostgreSQL.json
+++ b/var/licenses/PostgreSQL.json
@@ -1,20 +1,20 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "PostgreSQL License",
-  "scancode_key": "postgresql",
-  "spdxid": "PostgreSQL",
-  "aliases": [
-   "PostgreSQL",
-   "PostgreSQL License",
-   "postgresql",
-   "The PostgreSQL Licence",
-   "scancode://postgresql",
-   "License: PostgreSQL",
-   "POSTGRESQL License",
-   "scancode:postgresql",
-   "osi:PostgreSQL"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "PostgreSQL License",
+    "scancode_key": "postgresql",
+    "spdxid": "PostgreSQL",
+    "aliases": [
+        "PostgreSQL",
+        "PostgreSQL License",
+        "postgresql",
+        "The PostgreSQL Licence",
+        "scancode://postgresql",
+        "License: PostgreSQL",
+        "POSTGRESQL License",
+        "scancode:postgresql",
+        "osi:PostgreSQL"
+    ]
 }
diff --git a/var/licenses/Python-2.0.1.json b/var/licenses/Python-2.0.1.json
index b5df9e7..ef86caf 100644
--- a/var/licenses/Python-2.0.1.json
+++ b/var/licenses/Python-2.0.1.json
@@ -1,11 +1,12 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Python Software Foundation License v2.0.1",
-  "scancode_key": "python-2.0.1", 
-  "spdxid": "Python-2.0.1",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Python Software Foundation License v2.0.1",
+    "scancode_key": "python-2.0.1", 
+    "spdxid": "Python-2.0.1",
+    "aliases": [
+        "python-2.0.1"
+    ]
 }
diff --git a/var/licenses/RSA-MD.json b/var/licenses/RSA-MD.json
index f143d28..f6ef8a2 100644
--- a/var/licenses/RSA-MD.json
+++ b/var/licenses/RSA-MD.json
@@ -1,22 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "RSA Data Security MD5",
-  "scancode_key": "rsa-md5",
-  "spdxid": "RSA-MD",
-  "aliases": [
-   "RSA-MD",
-   "RSA Message-Digest License ",
-   "RSA MD License",
-   "RSA Message-Digest License",
-   "scancode://rsa-md5",
-   "RSA-MD5 License",
-   "RSA MD LICENSE",
-   "RSA-MD License",
-   "RSA-MD LICENSE",
-   "RSA Data Security MD4",
-   "scancode:rsa-md4"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "RSA Data Security MD5",
+    "scancode_key": "rsa-md5",
+    "spdxid": "RSA-MD",
+    "aliases": [
+        "RSA-MD",
+        "RSA Message-Digest License ",
+        "RSA MD License",
+        "RSA Message-Digest License",
+        "scancode://rsa-md5",
+        "RSA-MD5 License",
+        "RSA MD LICENSE",
+        "RSA-MD License",
+        "RSA-MD LICENSE",
+        "rsa-md5"
+    ]
 }
diff --git a/var/licenses/SAX-PD.json b/var/licenses/SAX-PD.json
index 476ad6a..37f99fe 100644
--- a/var/licenses/SAX-PD.json
+++ b/var/licenses/SAX-PD.json
@@ -1,21 +1,22 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SAX Public Domain Notice",
-  "scancode_key": "sax-pd",
-  "spdxid": "SAX-PD",
-  "aliases": [
-   "SAX-PD",
-   "SAX Public Domain Notice",
-   "Sax Public Domain Notice",
-   "scancode://sax-pd",
-   "http://www.spdx.org/licenses/SAX-PD",
-   "for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)",
-   "http://www.saxproject.org/copying.html",
-   "https://spdx.org/licenses/sax-pd",
-   "http://www.xmlpull.org/v1/download/unpacked/LICENSE.txt",
-   "scancode:sax-pd"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SAX Public Domain Notice",
+    "scancode_key": "sax-pd",
+    "spdxid": "SAX-PD",
+    "aliases": [
+        "SAX-PD",
+        "SAX Public Domain Notice",
+        "Sax Public Domain Notice",
+        "scancode://sax-pd",
+        "http://www.spdx.org/licenses/SAX-PD",
+        "for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)",
+        "http://www.saxproject.org/copying.html",
+        "https://spdx.org/licenses/sax-pd",
+        "http://www.xmlpull.org/v1/download/unpacked/LICENSE.txt",
+        "scancode:sax-pd",
+        "sax-pd"
+    ]
 }
diff --git a/var/licenses/SGI-B-2.0.json b/var/licenses/SGI-B-2.0.json
index 43da209..2239029 100644
--- a/var/licenses/SGI-B-2.0.json
+++ b/var/licenses/SGI-B-2.0.json
@@ -1,26 +1,27 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SGI Free Software License B v2.0",
-  "scancode_key": "sgi-freeb-2.0",
-  "spdxid": "SGI-B-2.0",
-  "aliases": [
-   "SGI-B-2.0",
-   "SGI Free Software License B v2.0",
-   "SGI Free Software License B 2.0",
-   "SGI B License 2.0",
-   "SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)",
-   "scancode://sgi-freeb-2.0",
-   "SGI B, Version 2.0",
-   "SGI B, 2.0",
-   "SGI-B, Version 2.0",
-   "SGI-B, 2.0",
-   "SGI B License, Version 2.0",
-   "SGI-B License, Version 2.0",
-   "SGI-B License, 2.0",
-   "SGI Free Software License B, version 2.0",
-   "scancode:sgi-freeb-2.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SGI Free Software License B v2.0",
+    "scancode_key": "sgi-freeb-2.0",
+    "spdxid": "SGI-B-2.0",
+    "aliases": [
+        "SGI-B-2.0",
+        "SGI Free Software License B v2.0",
+        "SGI Free Software License B 2.0",
+        "SGI B License 2.0",
+        "SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)",
+        "scancode://sgi-freeb-2.0",
+        "SGI B, Version 2.0",
+        "SGI B, 2.0",
+        "SGI-B, Version 2.0",
+        "SGI-B, 2.0",
+        "SGI B License, Version 2.0",
+        "SGI-B License, Version 2.0",
+        "SGI-B License, 2.0",
+        "SGI Free Software License B, version 2.0",
+        "scancode:sgi-freeb-2.0",
+        "sgi-freeb-2.0"
+    ]
 }
diff --git a/var/licenses/SSPL-1.0.json b/var/licenses/SSPL-1.0.json
index 79a7da6..f5019a8 100644
--- a/var/licenses/SSPL-1.0.json
+++ b/var/licenses/SSPL-1.0.json
@@ -1,23 +1,24 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Server Side Public License (SSPL) 1.0",
-  "scancode_key": "mongodb-sspl-1.0",
-  "spdxid": "SSPL-1.0",
-  "aliases": [
-   "SSPL-1.0",
-   "Server Side Public License Version 1",
-   "Server Side Public License 1.0",
-   "Server Side Public License, v 1",
-   "scancode://mongodb-sspl-1.0",
-   "SSPL 1.0",
-   "Server Side Public License",
-   "SSPL 1",
-   "Server Side Public License, Version 1.0",
-   "Server Side Public License v1.0",
-   "Server Side Public License VERSION 1",
-   "scancode:mongodb-sspl-1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Server Side Public License (SSPL) 1.0",
+    "scancode_key": "mongodb-sspl-1.0",
+    "spdxid": "SSPL-1.0",
+    "aliases": [
+        "SSPL-1.0",
+        "Server Side Public License Version 1",
+        "Server Side Public License 1.0",
+        "Server Side Public License, v 1",
+        "scancode://mongodb-sspl-1.0",
+        "SSPL 1.0",
+        "Server Side Public License",
+        "SSPL 1",
+        "Server Side Public License, Version 1.0",
+        "Server Side Public License v1.0",
+        "Server Side Public License VERSION 1",
+        "scancode:mongodb-sspl-1.0",
+        "mongodb-sspl-1.0"
+    ]
 }
diff --git a/var/licenses/SWL.json b/var/licenses/SWL.json
index 4f75e85..e940538 100644
--- a/var/licenses/SWL.json
+++ b/var/licenses/SWL.json
@@ -1,20 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Scheme Widget Library (SWL) Software License Agreement",
-  "scancode_key": "swl",
-  "spdxid": "SWL",
-  "aliases": [
-   "SWL",
-   "Scheme Widget Library (SWL) Software License Agreement",
-   "Scheme Widget Library Software License Agreement",
-   "scancode://swl",
-   "Scheme Widget Library (SWL) Software License",
-   "SWL License",
-   "SWL license",
-   "under SWL",
-   "scancode:swl"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Scheme Widget Library (SWL) Software License Agreement",
+    "scancode_key": "swl",
+    "spdxid": "SWL",
+    "aliases": [
+        "SWL",
+        "Scheme Widget Library (SWL) Software License Agreement",
+        "Scheme Widget Library Software License Agreement",
+        "scancode://swl",
+        "Scheme Widget Library (SWL) Software License",
+        "SWL License",
+        "SWL license",
+        "under SWL",
+        "scancode:swl",
+        "swl"
+    ]
 }
diff --git a/var/licenses/Sendmail.json b/var/licenses/Sendmail.json
index 1c6742f..6439b1c 100644
--- a/var/licenses/Sendmail.json
+++ b/var/licenses/Sendmail.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Sendmail License",
-  "scancode_key": "sendmail",
-  "spdxid": "Sendmail",
-  "aliases": [
-   "Sendmail",
-   "Sendmail License",
-   "SENDMAIL LICENSE (version 2004)",
-   "SENDMAIL LICENSE (version 2012)",
-   "SENDMAIL LICENSE (version 1998)",
-   "scancode://sendmail",
-   "scancode:sendmail"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Sendmail License",
+    "scancode_key": "sendmail",
+    "spdxid": "Sendmail",
+    "aliases": [
+        "Sendmail",
+        "Sendmail License",
+        "SENDMAIL LICENSE (version 2004)",
+        "SENDMAIL LICENSE (version 2012)",
+        "SENDMAIL LICENSE (version 1998)",
+        "scancode://sendmail",
+        "scancode:sendmail",
+        "sendmail"
+    ]
 }
diff --git a/var/licenses/Sleepycat.json b/var/licenses/Sleepycat.json
index 7f0b6eb..1f5b668 100644
--- a/var/licenses/Sleepycat.json
+++ b/var/licenses/Sleepycat.json
@@ -17,6 +17,7 @@
         "scancode://sleepycat",
         "Berkeley DB License",
         "scancode:sleepycat",
-        "osi:Sleepycat"
+        "osi:Sleepycat",
+        "sleepycat"
     ]
 }
diff --git a/var/licenses/SunPro.json b/var/licenses/SunPro.json
index 33b7e77..a7d351a 100644
--- a/var/licenses/SunPro.json
+++ b/var/licenses/SunPro.json
@@ -1,11 +1,12 @@
 {
-"meta": {
-    "disclaimer": "https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SunPro Attribution License",
-  "scancode_key": "sunpro",
-  "spdxid": "SunPro",
-  "aliases": [
-  ]
+    "meta": {
+        "disclaimer": "https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SunPro Attribution License",
+    "scancode_key": "sunpro",
+    "spdxid": "SunPro",
+    "aliases": [
+        "sunpro"
+    ]
 }
diff --git a/var/licenses/TCL.json b/var/licenses/TCL.json
index 8c22e34..41d8019 100644
--- a/var/licenses/TCL.json
+++ b/var/licenses/TCL.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "TCL/TK License",
-  "scancode_key": "tcl",
-  "spdxid": "TCL",
-  "aliases": [
-   "TCL",
-   "TCL/TK License",
-   "TCL License",
-   "scancode://tcl",
-   "scancode://ttcl",
-   "LicenseRef-scancode-ttcl",
-   "scancode:tcl"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "TCL/TK License",
+    "scancode_key": "tcl",
+    "spdxid": "TCL",
+    "aliases": [
+        "TCL",
+        "TCL/TK License",
+        "TCL License",
+        "scancode://tcl",
+        "scancode://ttcl",
+        "LicenseRef-scancode-ttcl",
+        "scancode:tcl",
+        "tcl"
+    ]
 }
diff --git a/var/licenses/TU-Berlin-1.0.json b/var/licenses/TU-Berlin-1.0.json
index e2f8f48..676cfbb 100644
--- a/var/licenses/TU-Berlin-1.0.json
+++ b/var/licenses/TU-Berlin-1.0.json
@@ -1,21 +1,22 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Technische Universitaet Berlin Attribution License 1.0",
-  "scancode_key": "tu-berlin",
-  "spdxid": "TU-Berlin-1.0",
-  "aliases": [
-   "TU-Berlin-1.0",
-   "Technische Universitaet Berlin License 1.0",
-   "TU Berlin License 1.0",
-   "TU Berlin, Version 1.0",
-   "TU Berlin 1.0",
-   "TU-Berlin, Version 1.0",
-   "TU-Berlin 1.0",
-   "TU Berlin License, Version 1.0",
-   "TU-Berlin License, Version 1.0",
-   "TU-Berlin License, 1.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Technische Universitaet Berlin Attribution License 1.0",
+    "scancode_key": "tu-berlin",
+    "spdxid": "TU-Berlin-1.0",
+    "aliases": [
+        "TU-Berlin-1.0",
+        "Technische Universitaet Berlin License 1.0",
+        "TU Berlin License 1.0",
+        "TU Berlin, Version 1.0",
+        "TU Berlin 1.0",
+        "TU-Berlin, Version 1.0",
+        "TU-Berlin 1.0",
+        "TU Berlin License, Version 1.0",
+        "TU-Berlin License, Version 1.0",
+        "TU-Berlin License, 1.0",
+        "tu-berlin"
+    ]
 }
diff --git a/var/licenses/TU-Berlin-2.0.json b/var/licenses/TU-Berlin-2.0.json
index bd2f82d..bc8f84d 100644
--- a/var/licenses/TU-Berlin-2.0.json
+++ b/var/licenses/TU-Berlin-2.0.json
@@ -1,23 +1,24 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Technische Universitaet Berlin License 2.0",
-  "scancode_key": "tu-berlin-2.0",
-  "spdxid": "TU-Berlin-2.0",
-  "aliases": [
-   "TU-Berlin-2.0",
-   "Technische Universitaet Berlin License 2.0",
-   "TU Berlin License 2.0",
-   "scancode://tu-berlin-2.0",
-   "TU Berlin, Version 2.0",
-   "TU Berlin 2.0",
-   "TU-Berlin, Version 2.0",
-   "TU-Berlin 2.0",
-   "TU Berlin License, Version 2.0",
-   "TU-Berlin License, Version 2.0",
-   "TU-Berlin License, 2.0",
-   "scancode:tu-berlin-2.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Technische Universitaet Berlin License 2.0",
+    "scancode_key": "tu-berlin-2.0",
+    "spdxid": "TU-Berlin-2.0",
+    "aliases": [
+        "TU-Berlin-2.0",
+        "Technische Universitaet Berlin License 2.0",
+        "TU Berlin License 2.0",
+        "scancode://tu-berlin-2.0",
+        "TU Berlin, Version 2.0",
+        "TU Berlin 2.0",
+        "TU-Berlin, Version 2.0",
+        "TU-Berlin 2.0",
+        "TU Berlin License, Version 2.0",
+        "TU-Berlin License, Version 2.0",
+        "TU-Berlin License, 2.0",
+        "scancode:tu-berlin-2.0",
+        "tu-berlin-2.0"
+    ]
 }
diff --git a/var/licenses/UnixCrypt.json b/var/licenses/UnixCrypt.json
index de68156..04e40b6 100644
--- a/var/licenses/UnixCrypt.json
+++ b/var/licenses/UnixCrypt.json
@@ -5,7 +5,9 @@
     },
     "name": "UnixCrypt License",
     "scancode_key": "unixcrypt",
-    "compatibility_as": "MIT",    "spdxid": "UnixCrypt",
+    "compatibility_as": "MIT",
+    "spdxid": "UnixCrypt",
     "aliases": [
+        "unixcrypt"
     ]
 }
diff --git a/var/licenses/Unlicense.json b/var/licenses/Unlicense.json
index 3470f64..8dd1ae6 100644
--- a/var/licenses/Unlicense.json
+++ b/var/licenses/Unlicense.json
@@ -1,18 +1,18 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Unlicense",
-  "scancode_key": "unlicense",
-  "spdxid": "Unlicense",
-  "aliases": [
-   "The Unlicense",
-   "unlicense",
-   "scancode://unlicense",
-   "Unlicense 1",
-   "scancode:unlicense",
-   "The Unlicense (Unlicense)",
-   "The Unlincence"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Unlicense",
+    "scancode_key": "unlicense",
+    "spdxid": "Unlicense",
+    "aliases": [
+        "The Unlicense",
+        "unlicense",
+        "scancode://unlicense",
+        "Unlicense 1",
+        "scancode:unlicense",
+        "The Unlicense (Unlicense)",
+        "The Unlincence"
+    ]
 }
diff --git a/var/licenses/W3C-19980720.json b/var/licenses/W3C-19980720.json
index e0dc584..bed5753 100644
--- a/var/licenses/W3C-19980720.json
+++ b/var/licenses/W3C-19980720.json
@@ -13,6 +13,7 @@
         "scancode://w3c-software-19980720",
         "W3C-SOFTWARE-19980720",
         "http://www.w3.org/Consortium/Legal/copyright-software-19980720",
-        "scancode:w3c-software-19980720"
+        "scancode:w3c-software-19980720",
+        "w3c-software-19980720"
     ]
 }
diff --git a/var/licenses/W3C-20150513.json b/var/licenses/W3C-20150513.json
index 28f0eb9..01f0433 100644
--- a/var/licenses/W3C-20150513.json
+++ b/var/licenses/W3C-20150513.json
@@ -17,6 +17,7 @@
         "W3C 20150513",
         "W3C License, Version 20150513",
         "W3C License, 20150513",
-        "scancode:w3c-software-doc-20150513"
+        "scancode:w3c-software-doc-20150513",
+        "w3c-software-doc-20150513"
     ]
 }
diff --git a/var/licenses/W3C.json b/var/licenses/W3C.json
index b7bb7e6..da976d2 100644
--- a/var/licenses/W3C.json
+++ b/var/licenses/W3C.json
@@ -18,6 +18,7 @@
         "W3C Software Notice and License 20021231",
         "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231",
         "scancode:w3c",
-        "osi:W3C"
+        "osi:W3C",
+        "w3c"
     ]
 }
diff --git a/var/licenses/WTFPL.json b/var/licenses/WTFPL.json
index 7fd7dcf..756eedc 100644
--- a/var/licenses/WTFPL.json
+++ b/var/licenses/WTFPL.json
@@ -1,29 +1,30 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "WTFPL 2.0",
-  "scancode_key": "wtfpl-2.0",
-  "spdxid": "WTFPL",
-  "aliases": [
-   "WTFPL",
-   "Do What The F*ck You Want To Public License",
-   "wtfpl",
-   "WTF Public License 2.0",
-   "WTFPL-2.0",
-   "WTFPL-2",
-   "scancode://wtfpl-2.0",
-   "WTFPL 2.0",
-   "Do What The Fuck You Want To Public License (WTFPL) 2",
-   "DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE",
-   "DO WHAT THE F#*@ YOU WANT TO PUBLIC LICENSE",
-   "DO WHAT YOU WANT TO PUBLIC LICENSE, Version 1",
-   "DO WHAT YOU WANT TO PUBLIC LICENSE, Version 2.0",
-   "Do What The Fuck You Want To Public License, Version 2",
-   "Do What you Want",
-   "http://www.wtfpl.net/about/",
-   "http://sam.zoy.org/wtfpl/",
-   "scancode:wtfpl-2.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "WTFPL 2.0",
+    "scancode_key": "wtfpl-2.0",
+    "spdxid": "WTFPL",
+    "aliases": [
+        "WTFPL",
+        "Do What The F*ck You Want To Public License",
+        "wtfpl",
+        "WTF Public License 2.0",
+        "WTFPL-2.0",
+        "WTFPL-2",
+        "scancode://wtfpl-2.0",
+        "WTFPL 2.0",
+        "Do What The Fuck You Want To Public License (WTFPL) 2",
+        "DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE",
+        "DO WHAT THE F#*@ YOU WANT TO PUBLIC LICENSE",
+        "DO WHAT YOU WANT TO PUBLIC LICENSE, Version 1",
+        "DO WHAT YOU WANT TO PUBLIC LICENSE, Version 2.0",
+        "Do What The Fuck You Want To Public License, Version 2",
+        "Do What you Want",
+        "http://www.wtfpl.net/about/",
+        "http://sam.zoy.org/wtfpl/",
+        "scancode:wtfpl-2.0",
+        "wtfpl-2.0"
+    ]
 }
diff --git a/var/licenses/X11-distribute-modifications-variant.json b/var/licenses/X11-distribute-modifications-variant.json
index 0c2050e..eaab69e 100644
--- a/var/licenses/X11-distribute-modifications-variant.json
+++ b/var/licenses/X11-distribute-modifications-variant.json
@@ -1,12 +1,13 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "X11-Style (FSF)",
-  "scancode_key": "x11-fsf",
-  "spdxid": "X11-distribute-modifications-variant",
-  "aliases": [
-      "X11-Style (FSF)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "X11-Style (FSF)",
+    "scancode_key": "x11-fsf",
+    "spdxid": "X11-distribute-modifications-variant",
+    "aliases": [
+        "X11-Style (FSF)",
+        "x11-fsf"
+    ]
 }
diff --git a/var/licenses/X11.json b/var/licenses/X11.json
index 7aa6d5d..0db10f1 100644
--- a/var/licenses/X11.json
+++ b/var/licenses/X11.json
@@ -1,25 +1,26 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "X11 License",
-  "scancode_key": "x11-xconsortium", 
-  "spdxid": "X11",
-  "aliases": [
-   "X11",
-   "X11 License",
-   "scancode://x11-xconsortium",
-   "X11-Style (X Consortium)",
-   "scancode://x11",
-   "X License",
-   "MIT/X Consortium",
-   "X/MIT License",
-   "MIT/X11",
-   "MIT variant (X11)",
-   "scancode:x11-xconsortium",
-   "MIT-X-Consortium",
-   "MIT-X11",
-   "X-Consortium"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "X11 License",
+    "scancode_key": "x11-xconsortium", 
+    "spdxid": "X11",
+    "aliases": [
+        "X11",
+        "X11 License",
+        "scancode://x11-xconsortium",
+        "X11-Style (X Consortium)",
+        "scancode://x11",
+        "X License",
+        "MIT/X Consortium",
+        "X/MIT License",
+        "MIT/X11",
+        "MIT variant (X11)",
+        "scancode:x11-xconsortium",
+        "MIT-X-Consortium",
+        "MIT-X11",
+        "X-Consortium",
+        "x11-xconsortium"
+    ]
 }
diff --git a/var/licenses/XFree86-1.1.json b/var/licenses/XFree86-1.1.json
index 97f567e..9270a22 100644
--- a/var/licenses/XFree86-1.1.json
+++ b/var/licenses/XFree86-1.1.json
@@ -11,6 +11,7 @@
         "XFree86 License 1.1",
         "XFree86 1.1 License",
         "scancode://xfree86-1.1",
-        "scancode:xfree86-1.1"
+        "scancode:xfree86-1.1",
+        "xfree86-1.1"
     ]
 }
diff --git a/var/licenses/Xfig.json b/var/licenses/Xfig.json
index 186bf1d..7a4c983 100644
--- a/var/licenses/Xfig.json
+++ b/var/licenses/Xfig.json
@@ -8,5 +8,6 @@
     "compatibility_as": "MIT",
     "spdxid": "Xfig",
     "aliases": [
+        "mit-xfig"
     ]
 }
diff --git a/var/licenses/ZPL-1.1.json b/var/licenses/ZPL-1.1.json
index 363d0bd..a9eaf05 100644
--- a/var/licenses/ZPL-1.1.json
+++ b/var/licenses/ZPL-1.1.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Zope Public License 1.1",
-  "scancode_key": "zpl-1.1",
-  "spdxid": "ZPL-1.1",
-  "aliases": [
-   "ZPL-1.1",
-   "Zope Public License 1.1",
-   "scancode://zpl-1.1",
-   "ZPL 1.1",
-   "ZPL, Version 1.1",
-   "Zope Public License (ZPL) Version 1.1",
-   "scancode:zpl-1.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Zope Public License 1.1",
+    "scancode_key": "zpl-1.1",
+    "spdxid": "ZPL-1.1",
+    "aliases": [
+        "ZPL-1.1",
+        "Zope Public License 1.1",
+        "scancode://zpl-1.1",
+        "ZPL 1.1",
+        "ZPL, Version 1.1",
+        "Zope Public License (ZPL) Version 1.1",
+        "scancode:zpl-1.1",
+        "zpl-1.1"
+    ]
 }
diff --git a/var/licenses/ZPL-2.0.json b/var/licenses/ZPL-2.0.json
index 243216c..e691eee 100644
--- a/var/licenses/ZPL-2.0.json
+++ b/var/licenses/ZPL-2.0.json
@@ -1,20 +1,21 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Zope Public License 2.0",
-  "scancode_key": "zpl-2.0",
-  "spdxid": "ZPL-2.0",
-  "aliases": [
-   "ZPL-2.0",
-   "Zope Public License 2.0",
-   "The Zope Public License, Version 2.0",
-   "Zope-2.0",
-   "Zope Public License (ZPL) Version 2.0",
-   "scancode://zpl-2.0",
-   "ZPL 2.0",
-   "scancode:zpl-2.0",
-   "osi:ZPL-2.0"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Zope Public License 2.0",
+    "scancode_key": "zpl-2.0",
+    "spdxid": "ZPL-2.0",
+    "aliases": [
+        "ZPL-2.0",
+        "Zope Public License 2.0",
+        "The Zope Public License, Version 2.0",
+        "Zope-2.0",
+        "Zope Public License (ZPL) Version 2.0",
+        "scancode://zpl-2.0",
+        "ZPL 2.0",
+        "scancode:zpl-2.0",
+        "osi:ZPL-2.0",
+        "zpl-2.0"
+    ]
 }
diff --git a/var/licenses/ZPL-2.1.json b/var/licenses/ZPL-2.1.json
index ba92af3..fac1702 100644
--- a/var/licenses/ZPL-2.1.json
+++ b/var/licenses/ZPL-2.1.json
@@ -1,19 +1,20 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "Zope Public License 2.1",
-  "scancode_key": "zpl-2.1",
-  "spdxid": "ZPL-2.1",
-  "aliases": [
-   "ZPL-2.1",
-   "Zope Public License 2.1",
-   "Zope Public License (ZPL) Version 2.1",
-   "scancode://zpl-2.1",
-   "ZPL 2.1",
-   "ZPL, Version 2.1",
-   "osi:ZPL-2.1",
-   "scancode:zpl-2.1"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "Zope Public License 2.1",
+    "scancode_key": "zpl-2.1",
+    "spdxid": "ZPL-2.1",
+    "aliases": [
+        "ZPL-2.1",
+        "Zope Public License 2.1",
+        "Zope Public License (ZPL) Version 2.1",
+        "scancode://zpl-2.1",
+        "ZPL 2.1",
+        "ZPL, Version 2.1",
+        "osi:ZPL-2.1",
+        "scancode:zpl-2.1",
+        "zpl-2.1"
+    ]
 }
diff --git a/var/licenses/blessing.json b/var/licenses/blessing.json
index 782c247..3ae2b95 100644
--- a/var/licenses/blessing.json
+++ b/var/licenses/blessing.json
@@ -1,15 +1,15 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "SQLite Blessing",
-  "scancode_key": "blessing",
-  "spdxid": "blessing",
-  "aliases": [
-   "blessing",
-   "SQLite Blessing",
-   "scancode://blessing",
-   "scancode:blessing"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "SQLite Blessing",
+    "scancode_key": "blessing",
+    "spdxid": "blessing",
+    "aliases": [
+        "blessing",
+        "SQLite Blessing",
+        "scancode://blessing",
+        "scancode:blessing"
+    ]
 }
diff --git a/var/licenses/bzip2-1.0.6.json b/var/licenses/bzip2-1.0.6.json
index e893edd..dd82181 100644
--- a/var/licenses/bzip2-1.0.6.json
+++ b/var/licenses/bzip2-1.0.6.json
@@ -14,6 +14,7 @@
         "scancode://bzip2-libbzip-2010",
         "bzip2 License 2010",
         "libzip2 version 1.0.6",
-        "scancode:bzip2-libbzip-2010"
+        "scancode:bzip2-libbzip-2010",
+        "bzip2-libbzip-2010"
   ]
 }
diff --git a/var/licenses/dtoa.json b/var/licenses/dtoa.json
index 70d2afc..a5f6147 100644
--- a/var/licenses/dtoa.json
+++ b/var/licenses/dtoa.json
@@ -8,5 +8,6 @@
     "compatibility_as": "X11",
     "spdxid": "dtoa",
     "aliases": [
+        "x11-lucent"
     ]
 }
diff --git a/var/licenses/libpng-2.0.json b/var/licenses/libpng-2.0.json
index 5ad8d75..0cc7f3c 100644
--- a/var/licenses/libpng-2.0.json
+++ b/var/licenses/libpng-2.0.json
@@ -1,18 +1,19 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "PNG Reference Library License version 2",
-  "scancode_key": "libpng-v2", 
-  "spdxid": "libpng-2.0",
-  "aliases": [
-   "libpng-2.0",
-   "PNG Reference Library version 2",
-   "PNG Reference Library License 2.0",
-   "scancode://libpng-v2",
-   "LIbpng License v2",
-   "PNG Reference Library License 2",
-   "scancode:libpng-v2"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "PNG Reference Library License version 2",
+    "scancode_key": "libpng-v2", 
+    "spdxid": "libpng-2.0",
+    "aliases": [
+        "libpng-2.0",
+        "PNG Reference Library version 2",
+        "PNG Reference Library License 2.0",
+        "scancode://libpng-v2",
+        "LIbpng License v2",
+        "PNG Reference Library License 2",
+        "scancode:libpng-v2",
+        "libpng-v2"
+    ]
 }
diff --git a/var/licenses/libtiff.json b/var/licenses/libtiff.json
index fe34594..2023444 100644
--- a/var/licenses/libtiff.json
+++ b/var/licenses/libtiff.json
@@ -1,15 +1,16 @@
 {
-"meta": {
-    "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
-    "comment": ""
-  },
-  "name": "X11-Style (Tiff)",
-  "scancode_key": "x11-tiff", 
-  "spdxid": "libtiff",
-  "aliases": [
-   "libtiff",
-   "libtiff License",
-   "scancode://x11-tiff",
-   "X11-Style (Tiff)"
-  ]
+    "meta": {
+        "disclaimer": "https:https://raw.githubusercontent.com/hesa/foss-licenses/main/var/disclaimer.md",
+        "comment": ""
+    },
+    "name": "X11-Style (Tiff)",
+    "scancode_key": "x11-tiff", 
+    "spdxid": "libtiff",
+    "aliases": [
+        "libtiff",
+        "libtiff License",
+        "scancode://x11-tiff",
+        "X11-Style (Tiff)",
+        "x11-tiff"
+    ]
 }
diff --git a/var/licenses/xpp.json b/var/licenses/xpp.json
index b31e243..5ffdb68 100644
--- a/var/licenses/xpp.json
+++ b/var/licenses/xpp.json
@@ -14,6 +14,7 @@
         "xpp License",
         "XPP LICENSE",
         "under XPP",
-        "scancode:indiana-extreme-1.2"
+        "scancode:indiana-extreme-1.2",
+        "indiana-extreme-1.2"
   ]
 }


Test patch:
diff --git a/tests/licenses/BSD-3-Clause.json b/tests/licenses/BSD-3-Clause.json
index 6ea77c0..4c318f5 100644
--- a/tests/licenses/BSD-3-Clause.json
+++ b/tests/licenses/BSD-3-Clause.json
@@ -4,7 +4,7 @@
 	"comment": "Update meta information. Add alias (3-BSD)"
     },
     "spdxid": "BSD-3-Clause",
-    "aliases": [ "BSD3", "3-BSD"],
+    "aliases": [ "BSD3", "3-BSD", "bsd-new" ],
     "scancode_key": "bsd-new",
     "name": "The 3-Clause BSD License"
 }
diff --git a/tests/python/test_ldb.py b/tests/python/test_ldb.py
index 2c0303c..db1c6c9 100644
--- a/tests/python/test_ldb.py
+++ b/tests/python/test_ldb.py
@@ -22,7 +22,7 @@ def test_supported():
 def test_alias_list():
     # list of all aliases
     aliases = fl.alias_list()
-    assert len(aliases) == 10
+    assert len(aliases) == 11
 
 def test_alias_list_gpl():
     # list of all aliases with license with GPL
diff --git a/tests/shell/sanity-check.sh b/tests/shell/sanity-check.sh
index 9977bd0..e4a6227 100755
--- a/tests/shell/sanity-check.sh
+++ b/tests/shell/sanity-check.sh
@@ -239,7 +239,7 @@ check_presence LGPL-2.1-or-later " -e 2 -e later" " -e 3"
 check_presence LGPL-3.0-or-later " -e 3 -e later" " -e 2"
 
 check_presence LicenseRef-scancode-boost-original " -i -e original " ""
-check_presence LicenseRef-scancode-docbook " -i -e dmit " ""
+check_presence LicenseRef-scancode-docbook " -i -e dmit -e docbook " ""
 check_presence LicenseRef-scancode-g10-permissive " -i -e  g10 " ""
 check_presence LicenseRef-scancode-indiana-extreme " -i -e indiana " " -e 1.2"
 check_presence LicenseRef-scancode-iso-8879 " -i 8879 " ""
@@ -256,10 +256,10 @@ check_presence LLVM-exception " -i -e llvm  " ""
 
 check_presence MIT " -i -e MIT -e Expat" " -i -e 0 -e we -e advert -e modern "
 check_presence MIT-0 " -e 0 -i -e \"no attribution\"" " -i -e we -e advert -e modern -e wu"
-check_presence MIT-advertising " -e 0 -i -e advertising" " -i -e \"no advertising\" -e wu -e 0 -e modern"
+check_presence MIT-advertising " -e 0 -i -e advertising -e enlighten" " -i -e \"no advertising\" -e wu -e 0 -e modern"
 check_presence MIT-Modern-Variant " -i -e modern" " -i -e advertising -e 0 -e wu"
 check_presence MIT-open-group " -i -e opengroup -e open-group -e open\ group " " -i -e advertising -e modern -e 0 "
-check_presence MIT-Wu " -i -e wu " " -i -e advertising -e modern -e 0 "
+check_presence MIT-Wu " -i -e wu -e addition " " -i -e advertising -e modern -e 0 "
 check_presence MITNFA " -i -e  false -e nfa " " -i -e advertising -e modern -e 0 -e wu "
 
 check_presence MPL-1.0 " -e 1.0" "-e 2 -e 1.1"
@@ -291,7 +291,7 @@ check_presence SunPro " -i -e SunPro " ""
 check_presence SWL " -i -e SWL -e Scheme\ Widget" ""
 
 check_presence TCL " -i -e tcl " ""
-check_presence TU-Berlin-1.0 " -e 1" " -e 2"
+check_presence TU-Berlin-1.0 " -e 1 -e berlin" " -e 2"
 check_presence TU-Berlin-2.0 " -e 2" " -e 1"
 
 check_presence UnixCrypt " -i -e unixcrypt" ""