diff --git a/curations/git/github/elastic/kibana.yaml b/curations/git/github/elastic/kibana.yaml
index 63b54f4bdd8c..fa28bd2f11c2 100644
--- a/curations/git/github/elastic/kibana.yaml
+++ b/curations/git/github/elastic/kibana.yaml
@@ -6,7 +6,7 @@ coordinates:
 revisions:
   e13d5b1fed429df03e29af259ffccd6453250947:
     licensed:
-      declared: Apache-2.0 AND OTHER
+      declared: Apache-2.0 AND LicenseRef-scancode-elastic-license-2018
   7bdb99203c3b0d113668b9a96b1daaa920d654a2:
     licensed:
-      declared: Apache-2.0 AND OTHER
+      declared: Apache-2.0 AND LicenseRef-scancode-elastic-license-2018
diff --git a/curations/git/github/facebook/facebook-objc-sdk.yaml b/curations/git/github/facebook/facebook-objc-sdk.yaml
index 11f4c23e2988..4b5ba1f9b7e0 100644
--- a/curations/git/github/facebook/facebook-objc-sdk.yaml
+++ b/curations/git/github/facebook/facebook-objc-sdk.yaml
@@ -6,4 +6,4 @@ coordinates:
 revisions:
   cf9e0d837f9596223b05cb25faf0edf54d6347a2:
     licensed:
-      declared: OTHER
+      declared: LicenseRef-scancode-facebook-software-license
diff --git a/curations/git/github/g-truc/glm.yaml b/curations/git/github/g-truc/glm.yaml
index 8a350d72401f..6fa820293e72 100644
--- a/curations/git/github/g-truc/glm.yaml
+++ b/curations/git/github/g-truc/glm.yaml
@@ -6,4 +6,4 @@ coordinates:
 revisions:
   9749727c2db4742369219e1d452f43e918734b4e:
     licensed:
-      declared: MIT OR OTHER
+      declared: LicenseRef-scancode-happy-bunny OR MIT
diff --git a/curations/git/github/google/certificate-transparency-go.yaml b/curations/git/github/google/certificate-transparency-go.yaml
index 23f9e465af91..eb887eeaed9c 100644
--- a/curations/git/github/google/certificate-transparency-go.yaml
+++ b/curations/git/github/google/certificate-transparency-go.yaml
@@ -26,13 +26,13 @@ revisions:
           - Copyright 2014 Oleku Konko
         license: MIT
         path: vendor/github.com/coreos/etcd/cmd/vendor/github.com/olekukonko/tablewriter/wrap.go
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/github.com/coreos/etcd/cmd/vendor/golang.org/x/crypto/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/github.com/coreos/etcd/cmd/vendor/golang.org/x/net/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/github.com/coreos/etcd/cmd/vendor/golang.org/x/sys/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/github.com/coreos/etcd/cmd/vendor/golang.org/x/time/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/github.com/coreos/etcd/cmd/vendor/google.golang.org/grpc/PATENTS
diff --git a/curations/git/github/hashicorp/go.net.yaml b/curations/git/github/hashicorp/go.net.yaml
index 751ba18bed52..18a768e90992 100644
--- a/curations/git/github/hashicorp/go.net.yaml
+++ b/curations/git/github/hashicorp/go.net.yaml
@@ -6,4 +6,4 @@ coordinates:
 revisions:
   afc3cb3a421746fc66dd55b09a270c750cf536ce:
     licensed:
-      declared: BSD-3-Clause AND OTHER
+      declared: BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
diff --git a/curations/git/github/jetstack/cert-manager.yaml b/curations/git/github/jetstack/cert-manager.yaml
index b299e5735b59..174fccc1a136 100644
--- a/curations/git/github/jetstack/cert-manager.yaml
+++ b/curations/git/github/jetstack/cert-manager.yaml
@@ -23,13 +23,13 @@ revisions:
           - 'Copyright (c) 2007 Free Software Foundation, Inc. <http://fsf.org/>'
         license: LGPL-3.0-only WITH LGPL-3.0-linking-exception
         path: vendor/github.com/juju/ratelimit/LICENSE
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/crypto/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/net/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/sys/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/text/PATENTS
   b26bd256f124d480fcb198e1464854f41b0d0d2c:
     licensed:
diff --git a/curations/git/github/jooq/jooq.yaml b/curations/git/github/jooq/jooq.yaml
index 6d343fabafc5..161e62cbe764 100644
--- a/curations/git/github/jooq/jooq.yaml
+++ b/curations/git/github/jooq/jooq.yaml
@@ -6,4 +6,6 @@ coordinates:
 revisions:
   962cfecf363fda90646c415c53c4d00a36bb1049:
     licensed:
+      # OTHER for commerical license
+      # https://web.archive.org/web/20190711002348/http://www.jooq.org/legal/180607_jOOQ_License_and_Maintenance_Agreement.pdf
       declared: Apache-2.0 OR OTHER
diff --git a/curations/git/github/jruby/jruby.yaml b/curations/git/github/jruby/jruby.yaml
index 275b7474aa50..71964a0e98d3 100644
--- a/curations/git/github/jruby/jruby.yaml
+++ b/curations/git/github/jruby/jruby.yaml
@@ -30,13 +30,13 @@ revisions:
           - Copyright (c) 2002-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
         license: EPL-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later
         path: core/src/main/java/org/jruby/internal/runtime/methods/NullMethod.java
-      - license: OTHER
+      - license: LicenseRef-scancode-public-domain
         path: core/src/main/java/org/jruby/util/MurmurHash.java
       - license: (EPL-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND OTHER
         path: core/src/main/java/org/jruby/util/collections/ConcurrentWeakHashMap.java
       - license: OTHER
         path: core/src/main/java/org/jruby/util/collections/NonBlockingHashMapLong.java
-      - license: OTHER
+      - license: LicenseRef-scancode-public-domain
         path: core/src/test/java/org/jruby/util/MurmurHashTest.java
       - attributions:
           - Copyright (c) 2008-2010 Wayne Meissner
@@ -81,7 +81,6 @@ revisions:
         path: maven/jruby/src/templates/osgi_all_inclusive/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
       - license: CPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later
         path: maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
-
     licensed:
       declared: EPL-2.0 OR GPL-2.0 OR LGPL-2.1
 
diff --git a/curations/git/github/krb5/krb5.yaml b/curations/git/github/krb5/krb5.yaml
index c8eb89903725..18e1fa779524 100644
--- a/curations/git/github/krb5/krb5.yaml
+++ b/curations/git/github/krb5/krb5.yaml
@@ -6,7 +6,7 @@ coordinates:
 revisions:
   40d24000786643a012e23f67ffeb4402fa2b4821:
     licensed:
-      declared: OTHER
+      declared: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance AND CC-BY-3.0
   97e3c42b2a89a2ec60eb93d3f974769e3e3cbdc5:
     files:
       - attributions:
@@ -124,4 +124,4 @@ revisions:
         path: src/util/support/gettimeofday.c
   a6566760ec7c5fb8eca6ae3a6f2729d5002b03e0:
     licensed:
-      declared: OTHER
+      declared: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance AND CC-BY-3.0
diff --git a/curations/git/github/kubernetes-sigs/controller-runtime.yaml b/curations/git/github/kubernetes-sigs/controller-runtime.yaml
index cb29bcec875c..c122b6939c5e 100644
--- a/curations/git/github/kubernetes-sigs/controller-runtime.yaml
+++ b/curations/git/github/kubernetes-sigs/controller-runtime.yaml
@@ -6,15 +6,15 @@ coordinates:
 revisions:
   12d98582e72927b6cd0123e2b4e819f9341ce62c:
     files:
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/crypto/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/net/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/sys/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/text/PATENTS
-      - license: OTHER
+      - license: LicenseRef-scancode-google-patent-license-golang
         path: vendor/golang.org/x/time/PATENTS
   8348079b5c466abd1eabac09d01cd194fe6602af:
     licensed:
diff --git a/curations/git/github/lodash/lodash.yaml b/curations/git/github/lodash/lodash.yaml
index 2cfc7e8c3cdf..5ebdef7e9579 100644
--- a/curations/git/github/lodash/lodash.yaml
+++ b/curations/git/github/lodash/lodash.yaml
@@ -17,7 +17,7 @@ revisions:
         path: lib/main/build-site.js
       - license: NONE
         path: .github/CONTRIBUTING.md
-      - license: OTHER
+      - license: LicenseRef-scancode-json-pd
         path: vendor/json-js/json2.js
       - license: NONE
         path: vendor/firebug-lite/skin/xp/shadowAlpha.png
diff --git a/curations/git/github/lz4/lz4.yaml b/curations/git/github/lz4/lz4.yaml
index 9074a5c5c9ef..658095e492a2 100644
--- a/curations/git/github/lz4/lz4.yaml
+++ b/curations/git/github/lz4/lz4.yaml
@@ -6,34 +6,34 @@ coordinates:
 revisions:
   3e99d07bc09e1b82ee6191527bb3e555052c55ac:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   5ff839680134437dbf4678f3d0c7b371d84f4964:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   641b453d9db536ee020851bfcb1dc39f61006f0a:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   69dbafc1c4806f6c05e28c01117799087f498a2f:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   8301a21773ef61656225e264f4f06ae14462bca7:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   9141ada8de016b201520c009cbfff527b8c3c119:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   b3692db46d2b23a7c0af2d5e69988c94f126e10a:
     licensed:
       declared: BSD-2-Clause AND GPL-2.0-or-later
   c04df7e1b5fb1e4ffa796d2b3d2dea208f7116da:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   d44371841a2f1728a3f36839fd4b7e872d0927d3:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   d86dc916771c126afb797637dda9f6421c0cb998:
     licensed:
-      declared: BSD-2-Clause AND GPL-2.0-only
+      declared: BSD-2-Clause AND GPL-2.0-or-later
   dfed9fa1d77f0434306d377c4da1f7191d3ba08a:
     described:
       facets:
@@ -42,7 +42,7 @@ revisions:
         tests:
           - tests
     files:
-      - license: BSD-2-Clause AND GPL-2.0-only
+      - license: BSD-2-Clause AND GPL-2.0-or-later
         path: LICENSE
       - license: CC0-1.0
         path: contrib/cmake_unofficial/CMakeLists.txt
diff --git a/curations/git/github/majaeger/corert.yaml b/curations/git/github/majaeger/corert.yaml
index bbf3cc96a670..a67a26cebe12 100644
--- a/curations/git/github/majaeger/corert.yaml
+++ b/curations/git/github/majaeger/corert.yaml
@@ -6,4 +6,4 @@ coordinates:
 revisions:
   c46f46f5ac01bc89b658a520dd413cf2566e42da:
     licensed:
-      declared: MIT AND OTHER
+      declared: MIT AND LicenseRef-scancode-ms-patent-promise
diff --git a/curations/git/github/mwaterfall/mwfeedparser.yaml b/curations/git/github/mwaterfall/mwfeedparser.yaml
index 830bdfab7492..b872b421cd11 100644
--- a/curations/git/github/mwaterfall/mwfeedparser.yaml
+++ b/curations/git/github/mwaterfall/mwfeedparser.yaml
@@ -6,4 +6,4 @@ coordinates:
 revisions:
   b85b10c5da72e241729e32857064746393237a95:
     licensed:
-      declared: OTHER
+      declared: LicenseRef-scancode-waterfall-feed-parser