diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 97c8dba3a..240ab72f9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,6 @@
 7.6.5
+ - fixed #8800: Errors in POD of Asset-related mix-in modules (Bernd Kalbfuß-Zimmermann)
+ - fixed: Products imported into the Shelf have bad URLs
 
 7.6.4
  - Survey now will show progress and time limit.
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 45dcd25ce..8c7af54dd 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -50,6 +50,8 @@ Package to manipulate items in WebGUI's asset system.
 
 An asset is the basic class of content in WebGUI. This handles security, urls, and other basic information common to all content items.
 
+The following modules are mixed in via declaration of the same package: AssetBranch.pm, AssetClipboard.pm, AssetExportHtml.pm, AssetLineage.pm, AssetMetaData.pm, AssetPackage.pm, AssetTrash.pm, AssetVersioning.pm.
+
 A lineage is a concatenated series of sequence numbers, each six digits long, that explain an asset's position in its familiy tree. Lineage describes who the asset's ancestors are, how many ancestors the asset has in its family tree (lineage length), and the asset's position (rank) amongst its siblings. In addition, lineage provides enough information about an asset to generate a list of its siblings and descendants.
 
  use WebGUI::Asset;
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 5ca75cb77..300cdf855 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -18,7 +18,7 @@ use strict;
 
 =head1 NAME
 
-Package WebGUI::Asset
+Package WebGUI::Asset (AssetBranch)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index c20298d91..6805bc329 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -18,7 +18,7 @@ use strict;
 
 =head1 NAME
 
-Package WebGUI::AssetClipboard
+Package WebGUI::Asset (AssetClipboard)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 9d725ac7f..12d91dd39 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -26,7 +26,7 @@ use URI::URL;
 
 =head1 NAME
 
-Package WebGUI::AssetExportHtml
+Package WebGUI::Asset (AssetExportHtml)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index a5c2e50cd..8891ec89d 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -19,7 +19,7 @@ use Carp qw( croak );
 
 =head1 NAME
 
-Package WebGUI::AssetLineage
+Package WebGUI::Asset (AssetLineage)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetMetaData.pm b/lib/WebGUI/AssetMetaData.pm
index 8ba18a263..51e4d6d2e 100644
--- a/lib/WebGUI/AssetMetaData.pm
+++ b/lib/WebGUI/AssetMetaData.pm
@@ -18,7 +18,7 @@ use strict;
 
 =head1 NAME
 
-Package WebGUI::Asset
+Package WebGUI::Asset (AssetMetaData)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index ae1cdded6..07dc7b21a 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -20,7 +20,7 @@ use WebGUI::Storage;
 
 =head1 NAME
 
-Package WebGUI::Asset
+Package WebGUI::Asset (AssetPackage)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 9c1ce8526..72e8e4f4f 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -19,7 +19,7 @@ use WebGUI::Asset::Shortcut;
 
 =head1 NAME
 
-Package WebGUI::Asset
+Package WebGUI::Asset (AssetTrash)
 
 =head1 DESCRIPTION
 
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index 723d110e7..f76f3b399 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -21,7 +21,7 @@ use WebGUI::Search::Index;
 
 =head1 NAME
 
-Package WebGUI::AssetVersioning
+Package WebGUI::Asset (AssetVersioning)
 
 =head1 DESCRIPTION