diff --git a/jorobo.dist.ini b/jorobo.dist.ini
index ebe2f8d..ce50583 100644
--- a/jorobo.dist.ini
+++ b/jorobo.dist.ini
@@ -29,7 +29,8 @@ files = php,js
 exclude =
 text = "
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - ##YEAR## Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/controller.php b/src/administrator/components/com_weblinks/controller.php
index 9b3f4fa..04508d3 100644
--- a/src/administrator/components/com_weblinks/controller.php
+++ b/src/administrator/components/com_weblinks/controller.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/controllers/weblink.php b/src/administrator/components/com_weblinks/controllers/weblink.php
index 4404eeb..1438d03 100644
--- a/src/administrator/components/com_weblinks/controllers/weblink.php
+++ b/src/administrator/components/com_weblinks/controllers/weblink.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/controllers/weblinks.php b/src/administrator/components/com_weblinks/controllers/weblinks.php
index cd1fa3c..fc21ecc 100644
--- a/src/administrator/components/com_weblinks/controllers/weblinks.php
+++ b/src/administrator/components/com_weblinks/controllers/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/helpers/weblinks.php b/src/administrator/components/com_weblinks/helpers/weblinks.php
index f82ee5c..82eea0f 100644
--- a/src/administrator/components/com_weblinks/helpers/weblinks.php
+++ b/src/administrator/components/com_weblinks/helpers/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/models/weblink.php b/src/administrator/components/com_weblinks/models/weblink.php
index 5bca24a..e8aae01 100644
--- a/src/administrator/components/com_weblinks/models/weblink.php
+++ b/src/administrator/components/com_weblinks/models/weblink.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/models/weblinks.php b/src/administrator/components/com_weblinks/models/weblinks.php
index 35126a6..4e8f224 100644
--- a/src/administrator/components/com_weblinks/models/weblinks.php
+++ b/src/administrator/components/com_weblinks/models/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/script.php b/src/administrator/components/com_weblinks/script.php
index dedcea5..cdbf529 100644
--- a/src/administrator/components/com_weblinks/script.php
+++ b/src/administrator/components/com_weblinks/script.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php
index f0ea9e7..f229a62 100644
--- a/src/administrator/components/com_weblinks/tables/weblink.php
+++ b/src/administrator/components/com_weblinks/tables/weblink.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
index 01cf763..14906d7 100644
--- a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
+++ b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
index 88261d4..e381684 100644
--- a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
+++ b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
index 633ba04..b6c01e0 100644
--- a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
+++ b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblink/view.html.php b/src/administrator/components/com_weblinks/views/weblink/view.html.php
index 7dadb1d..b107124 100644
--- a/src/administrator/components/com_weblinks/views/weblink/view.html.php
+++ b/src/administrator/components/com_weblinks/views/weblink/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
index f37919f..b1e70cc 100644
--- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
+++ b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
index 8fe7261..0d0f97f 100644
--- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
+++ b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php
index 135a043..58485f5 100644
--- a/src/administrator/components/com_weblinks/views/weblinks/view.html.php
+++ b/src/administrator/components/com_weblinks/views/weblinks/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/administrator/components/com_weblinks/weblinks.php b/src/administrator/components/com_weblinks/weblinks.php
index a2f6148..a11fb6f 100644
--- a/src/administrator/components/com_weblinks/weblinks.php
+++ b/src/administrator/components/com_weblinks/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/controller.php b/src/components/com_weblinks/controller.php
index 419171b..af99110 100644
--- a/src/components/com_weblinks/controller.php
+++ b/src/components/com_weblinks/controller.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/controllers/weblink.php b/src/components/com_weblinks/controllers/weblink.php
index fab6f0b..8a935fd 100644
--- a/src/components/com_weblinks/controllers/weblink.php
+++ b/src/components/com_weblinks/controllers/weblink.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/helpers/association.php b/src/components/com_weblinks/helpers/association.php
index c5d9f39..b5651f8 100644
--- a/src/components/com_weblinks/helpers/association.php
+++ b/src/components/com_weblinks/helpers/association.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/helpers/category.php b/src/components/com_weblinks/helpers/category.php
index a6781c7..83ea9a4 100644
--- a/src/components/com_weblinks/helpers/category.php
+++ b/src/components/com_weblinks/helpers/category.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/helpers/icon.php b/src/components/com_weblinks/helpers/icon.php
index 2d1ffe2..49912fb 100644
--- a/src/components/com_weblinks/helpers/icon.php
+++ b/src/components/com_weblinks/helpers/icon.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/helpers/route.php b/src/components/com_weblinks/helpers/route.php
index 2776337..67d4502 100644
--- a/src/components/com_weblinks/helpers/route.php
+++ b/src/components/com_weblinks/helpers/route.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/models/categories.php b/src/components/com_weblinks/models/categories.php
index e9f3246..e6e6b3e 100644
--- a/src/components/com_weblinks/models/categories.php
+++ b/src/components/com_weblinks/models/categories.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/models/category.php b/src/components/com_weblinks/models/category.php
index f4edfc6..d905935 100644
--- a/src/components/com_weblinks/models/category.php
+++ b/src/components/com_weblinks/models/category.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/models/form.php b/src/components/com_weblinks/models/form.php
index e689d82..5bf9147 100644
--- a/src/components/com_weblinks/models/form.php
+++ b/src/components/com_weblinks/models/form.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/models/weblink.php b/src/components/com_weblinks/models/weblink.php
index ada5553..10e4d43 100644
--- a/src/components/com_weblinks/models/weblink.php
+++ b/src/components/com_weblinks/models/weblink.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/router.php b/src/components/com_weblinks/router.php
index 05f7823..2481afc 100644
--- a/src/components/com_weblinks/router.php
+++ b/src/components/com_weblinks/router.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/categories/tmpl/default.php b/src/components/com_weblinks/views/categories/tmpl/default.php
index bd1ccec..2f3cb2d 100644
--- a/src/components/com_weblinks/views/categories/tmpl/default.php
+++ b/src/components/com_weblinks/views/categories/tmpl/default.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/categories/tmpl/default_items.php b/src/components/com_weblinks/views/categories/tmpl/default_items.php
index cf5f922..5bb8068 100644
--- a/src/components/com_weblinks/views/categories/tmpl/default_items.php
+++ b/src/components/com_weblinks/views/categories/tmpl/default_items.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/categories/view.html.php b/src/components/com_weblinks/views/categories/view.html.php
index bd7ae3a..bf5276b 100644
--- a/src/components/com_weblinks/views/categories/view.html.php
+++ b/src/components/com_weblinks/views/categories/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/category/tmpl/default.php b/src/components/com_weblinks/views/category/tmpl/default.php
index ae6ae72..d42430f 100644
--- a/src/components/com_weblinks/views/category/tmpl/default.php
+++ b/src/components/com_weblinks/views/category/tmpl/default.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/category/tmpl/default_children.php b/src/components/com_weblinks/views/category/tmpl/default_children.php
index 14f9505..333220b 100644
--- a/src/components/com_weblinks/views/category/tmpl/default_children.php
+++ b/src/components/com_weblinks/views/category/tmpl/default_children.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php
index 4e41a1b..c8030ff 100644
--- a/src/components/com_weblinks/views/category/tmpl/default_items.php
+++ b/src/components/com_weblinks/views/category/tmpl/default_items.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/category/view.feed.php b/src/components/com_weblinks/views/category/view.feed.php
index 5afd7df..cc1c239 100644
--- a/src/components/com_weblinks/views/category/view.feed.php
+++ b/src/components/com_weblinks/views/category/view.feed.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/category/view.html.php b/src/components/com_weblinks/views/category/view.html.php
index 82b6ea7..e8bb350 100644
--- a/src/components/com_weblinks/views/category/view.html.php
+++ b/src/components/com_weblinks/views/category/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/form/tmpl/edit.php b/src/components/com_weblinks/views/form/tmpl/edit.php
index 38232a8..7229f8c 100644
--- a/src/components/com_weblinks/views/form/tmpl/edit.php
+++ b/src/components/com_weblinks/views/form/tmpl/edit.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/form/view.html.php b/src/components/com_weblinks/views/form/view.html.php
index f045e7a..46b2052 100644
--- a/src/components/com_weblinks/views/form/view.html.php
+++ b/src/components/com_weblinks/views/form/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/views/weblink/view.html.php b/src/components/com_weblinks/views/weblink/view.html.php
index ff97630..2153d42 100644
--- a/src/components/com_weblinks/views/weblink/view.html.php
+++ b/src/components/com_weblinks/views/weblink/view.html.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/components/com_weblinks/weblinks.php b/src/components/com_weblinks/weblinks.php
index d13d7fc..938ca2b 100644
--- a/src/components/com_weblinks/weblinks.php
+++ b/src/components/com_weblinks/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/modules/mod_weblinks/helper.php b/src/modules/mod_weblinks/helper.php
index f9da8a4..1b415d7 100644
--- a/src/modules/mod_weblinks/helper.php
+++ b/src/modules/mod_weblinks/helper.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/modules/mod_weblinks/mod_weblinks.php b/src/modules/mod_weblinks/mod_weblinks.php
index 3fd6bf2..6b981f9 100644
--- a/src/modules/mod_weblinks/mod_weblinks.php
+++ b/src/modules/mod_weblinks/mod_weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/modules/mod_weblinks/tmpl/default.php b/src/modules/mod_weblinks/tmpl/default.php
index f2312a0..888b05b 100644
--- a/src/modules/mod_weblinks/tmpl/default.php
+++ b/src/modules/mod_weblinks/tmpl/default.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/plugins/finder/weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php
index 607e77e..5b3173c 100644
--- a/src/plugins/finder/weblinks/weblinks.php
+++ b/src/plugins/finder/weblinks/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/src/plugins/search/weblinks/weblinks.php b/src/plugins/search/weblinks/weblinks.php
index 7f8f5db..39f2e2d 100644
--- a/src/plugins/search/weblinks/weblinks.php
+++ b/src/plugins/search/weblinks/weblinks.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package     Weblinks
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt