diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out
index 59f7435722b..833cb9c0fe9 100644
--- a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out
@@ -2,10 +2,10 @@
 The package will not build sanely due to these errors:
 Error: [impossible-dep] The package has an impossible version range for a dependency on an internal library: pkg:internal >1.0 && <2.0. This version range does not include the current package, and must be removed as the current package's library will always be used.
 These warnings may cause trouble when distributing the package:
-Warning: [trailing.zero(*.0)-upper-bounds] On library, these packages have upper bounds with trailing zeros:
+Warning: [tz-upper-bounds] On library, these packages have upper bounds with trailing zeros:
   - pkg
-Please avoid trailing zeros for upper bounds. There is more information at https://pvp.haskell.org/
-Warning: [greater.than(>)-lower-bounds] On library, these packages have greater than (>) lower bounds:
+Please avoid trailing zeros for upper bounds.
+Warning: [gt-lower-bounds] On library, these packages have greater than (>) lower bounds:
   - pkg
-Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/
+Please use greater than or equals (>=) for lower bounds.
 Error: Hackage would reject this package.
diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out
index be4c499fac0..52680032f6d 100644
--- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out
@@ -1,5 +1,5 @@
 # cabal check
 These warnings may cause trouble when distributing the package:
-Warning: [less.than.equals(<=)-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
+Warning: [le-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
   - base
-Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/
+Please use less than (<) for upper bounds.
diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out
index baf3b85f40f..7ba9b6f27d4 100644
--- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out
@@ -3,6 +3,6 @@ These warnings may cause trouble when distributing the package:
 Warning: [missing-upper-bounds] On executable 'prova', these packages miss upper bounds:
   - acme-box
 Please add them. There is more information at https://pvp.haskell.org/
-Warning: [trailing.zero(*.0)-upper-bounds] On library, these packages have upper bounds with trailing zeros:
+Warning: [tz-upper-bounds] On library, these packages have upper bounds with trailing zeros:
   - text
-Please avoid trailing zeros for upper bounds. There is more information at https://pvp.haskell.org/
+Please avoid trailing zeros for upper bounds.
diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out
index 304dc862f76..603ff161043 100644
--- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out
@@ -3,9 +3,9 @@ These warnings may cause trouble when distributing the package:
 Warning: [missing-upper-bounds] On library 'int-lib', these packages miss upper bounds:
   - text
 Please add them. There is more information at https://pvp.haskell.org/
-Warning: [less.than.equals(<=)-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
+Warning: [le-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
   - base
-Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/
-Warning: [greater.than(>)-lower-bounds] On library 'int-lib', these packages have greater than (>) lower bounds:
+Please use less than (<) for upper bounds.
+Warning: [gt-lower-bounds] On library 'int-lib', these packages have greater than (>) lower bounds:
   - text
-Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/
+Please use greater than or equals (>=) for lower bounds.
diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out
index ff081197a29..a8e84640cdb 100644
--- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out
@@ -1,8 +1,8 @@
 # cabal check
 These warnings may cause trouble when distributing the package:
-Warning: [less.than.equals(<=)-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
+Warning: [le-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
   - base
-Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/
-Warning: [greater.than(>)-lower-bounds] On library, these packages have greater than (>) lower bounds:
+Please use less than (<) for upper bounds.
+Warning: [gt-lower-bounds] On library, these packages have greater than (>) lower bounds:
   - base
-Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/
+Please use greater than or equals (>=) for lower bounds.
diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out
index 1732b3fccd9..59e0cefd25c 100644
--- a/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out
@@ -1,8 +1,8 @@
 # cabal check
 These warnings may cause trouble when distributing the package:
-Warning: [greater.than(>)-lower-bounds] On custom-setup, these packages have greater than (>) lower bounds:
+Warning: [gt-lower-bounds] On custom-setup, these packages have greater than (>) lower bounds:
   - base
-Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/
+Please use greater than or equals (>=) for lower bounds.
 The following errors will cause portability problems on other environments:
 Error: [missing-bounds-setup] The dependency 'setup-depends: 'base' does not specify an upper bound on the version number. Each major release of the 'base' package changes the API in various ways and most packages will need some changes to compile with it. If you are not sure what upper bound to use then use the next major version.
 Error: Hackage would reject this package.
diff --git a/cabal-testsuite/PackageTests/Check/PackageFiles/VersionBounds/cabal.out b/cabal-testsuite/PackageTests/Check/PackageFiles/VersionBounds/cabal.out
index 4352ab832e7..6368896bc4c 100644
--- a/cabal-testsuite/PackageTests/Check/PackageFiles/VersionBounds/cabal.out
+++ b/cabal-testsuite/PackageTests/Check/PackageFiles/VersionBounds/cabal.out
@@ -6,13 +6,13 @@ Warning: [missing-upper-bounds] On library, these packages miss upper bounds:
   - or-exclusive-minimums-missing-upper
   - or-inclusive-maximums-missing-upper
 Please add them. There is more information at https://pvp.haskell.org/
-Warning: [less.than.equals(<=)-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
+Warning: [le-upper-bounds] On library, these packages have less than or equals (<=) upper bounds:
   - inclusive-maximums
   - and-inclusive-maximums
   - or-inclusive-maximums-missing-upper
-Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/
-Warning: [greater.than(>)-lower-bounds] On library, these packages have greater than (>) lower bounds:
+Please use less than (<) for upper bounds.
+Warning: [gt-lower-bounds] On library, these packages have greater than (>) lower bounds:
   - exclusive-minimums-missing-upper
   - and-exclusive-minimums
   - or-exclusive-minimums-missing-upper
-Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/
+Please use greater than or equals (>=) for lower bounds.