diff --git a/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
index 6f003db..a56ae4a 100644
--- a/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
+++ b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
@@ -22,7 +22,7 @@ use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
 use Joomla\Registry\Registry;
 
 /**
- * Content Component HTML Helper
+ * Weblinks Component HTML Helper
  *
  * @since  4.0.0
  */
@@ -96,7 +96,7 @@ class Icon
 	 * @param   array     $attribs  Optional attributes for the link
 	 * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
 	 *
-	 * @return  string   The HTML for the contact edit icon.
+	 * @return  string   The HTML for the weblink edit icon.
 	 *
 	 * @since   4.0.0
 	 */
diff --git a/src/components/com_weblinks/src/Service/Category.php b/src/components/com_weblinks/src/Service/Category.php
index 54f83d5..1c8f1c3 100644
--- a/src/components/com_weblinks/src/Service/Category.php
+++ b/src/components/com_weblinks/src/Service/Category.php
@@ -14,7 +14,7 @@ namespace Joomla\Component\Weblinks\Site\Service;
 use Joomla\CMS\Categories\Categories;
 
 /**
- * Content Component Category Tree
+ * Weblinks Component Category Tree
  *
  * @since  1.6
  */
diff --git a/src/components/com_weblinks/src/Service/Router.php b/src/components/com_weblinks/src/Service/Router.php
index 2469840..6a6e195 100644
--- a/src/components/com_weblinks/src/Service/Router.php
+++ b/src/components/com_weblinks/src/Service/Router.php
@@ -66,7 +66,7 @@ class Router extends RouterView
 	private $db;
 
 	/**
-	 * Content Component router constructor
+	 * Weblinks Component router constructor
 	 *
 	 * @param   SiteApplication           $app              The application object
 	 * @param   AbstractMenu              $menu             The menu object to work with
@@ -147,7 +147,7 @@ class Router extends RouterView
 	/**
 	 * Method to get the segment(s) for a weblink
 	 *
-	 * @param   string  $id     ID of the contact to retrieve the segments for
+	 * @param   string  $id     ID of the weblink to retrieve the segments for
 	 * @param   array   $query  The request that is built right now
 	 *
 	 * @return  array|string  The segments of this item
@@ -180,7 +180,7 @@ class Router extends RouterView
 	/**
 	 * Method to get the segment(s) for a form
 	 *
-	 * @param   string  $id     ID of the contact form to retrieve the segments for
+	 * @param   string  $id     ID of the weblink form to retrieve the segments for
 	 * @param   array   $query  The request that is built right now
 	 *
 	 * @return  array|string  The segments of this item
@@ -245,9 +245,9 @@ class Router extends RouterView
 	}
 
 	/**
-	 * Method to get the segment(s) for a contact
+	 * Method to get the segment(s) for a weblink
 	 *
-	 * @param   string  $segment  Segment of the contact to retrieve the ID for
+	 * @param   string  $segment  Segment of the weblink to retrieve the ID for
 	 * @param   array   $query    The request that is parsed right now
 	 *
 	 * @return  mixed   The id of this item or false