diff -Nru python-defaults-2.7.17/debian/changelog python-defaults-2.7.17/debian/changelog
--- python-defaults-2.7.17/debian/changelog	2020-02-08 11:18:15.000000000 +0000
+++ python-defaults-2.7.17/debian/changelog	2020-03-13 12:31:23.000000000 +0000
@@ -1,3 +1,12 @@
+python-defaults (2.7.17-2ubuntu4) focal; urgency=medium
+
+  * Correct command-not-found XB-Cnf headers LP: #1867157:
+    - Drop Extra-Commands headers, not needed
+    - Add XB- to ensure Visible-Pkgname actually is included in the binary
+      package heders
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 13 Mar 2020 12:31:23 +0000
+
 python-defaults (2.7.17-2ubuntu3) focal; urgency=medium
 
   * No-change rebuild with fixed binutils on arm64.
diff -Nru python-defaults-2.7.17/debian/control python-defaults-2.7.17/debian/control
--- python-defaults-2.7.17/debian/control	2020-01-11 15:06:30.000000000 +0000
+++ python-defaults-2.7.17/debian/control	2020-03-13 12:25:27.000000000 +0000
@@ -98,8 +98,6 @@
  .
  This package is a dependency package, which depends on Debian's Python2
  version (currently v2.7).
-XB-Cnf-Extra-Commands: python2
-XB-Cnf-Priority-Bonus: 3
 
 Package: python2-minimal
 Architecture: any
@@ -115,7 +113,7 @@
  in the boot process for some basic tasks.
  See /usr/share/doc/python2.7-minimal/README.Debian for a list of the modules
  contained in this package.
-Cnf-Visible-Pkgname: python2
+XB-Cnf-Visible-Pkgname: python2
 
 Package: python2-dev
 Architecture: any
diff -Nru python-defaults-2.7.17/debian/control.in python-defaults-2.7.17/debian/control.in
--- python-defaults-2.7.17/debian/control.in	2020-01-11 15:06:23.000000000 +0000
+++ python-defaults-2.7.17/debian/control.in	2020-03-13 12:25:30.000000000 +0000
@@ -97,8 +97,6 @@
  .
  This package is a dependency package, which depends on Debian's Python2
  version (currently v@VER@).
-XB-Cnf-Extra-Commands: python2
-XB-Cnf-Priority-Bonus: 3
 
 Package: python2-minimal
 Architecture: any
@@ -114,7 +112,7 @@
  in the boot process for some basic tasks.
  See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules
  contained in this package.
-Cnf-Visible-Pkgname: python2
+XB-Cnf-Visible-Pkgname: python2
 
 Package: python2-dev
 Architecture: any