diff --git a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
index 314829378..b61f92ce6 100644
--- a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
@@ -10,6 +10,7 @@ abstract class AbstractPackageCollection extends BaseCollection {
     public function __construct($items)
     {
         foreach ($items as $name => $data) {
+            $data->set('slug', $name);
             $this->items[$name] = new Package($data, $this->type);
         }
     }
diff --git a/system/src/Grav/Common/GPM/Local/Package.php b/system/src/Grav/Common/GPM/Local/Package.php
index f60c15fae..6505a59dd 100644
--- a/system/src/Grav/Common/GPM/Local/Package.php
+++ b/system/src/Grav/Common/GPM/Local/Package.php
@@ -16,7 +16,7 @@ class Package extends BasePackage
         $this->settings = $package->toArray();
 
         $html_description = \Parsedown::instance()->line($this->description);
-        $this->data->set('slug', strtolower($this->name));
+        $this->data->set('slug', $package->slug);
         $this->data->set('description_html', $html_description);
         $this->data->set('description_plain', strip_tags($html_description));
         $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->name));
diff --git a/system/src/Grav/Console/Gpm/IndexCommand.php b/system/src/Grav/Console/Gpm/IndexCommand.php
index 12ac9a6b5..f5b3e1618 100644
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -67,9 +67,9 @@ class IndexCommand extends Command
                 // index
                     str_pad($index++ + 1, 2, '0', STR_PAD_LEFT) . ". " .
                     // package name
-                    "<cyan>" . str_pad($package->name, 15) . "</cyan> " .
+                    "<cyan>" . str_pad($package->name, 20) . "</cyan> " .
                     // slug
-                    "[" . str_pad($slug, 15, ' ', STR_PAD_BOTH) . "] " .
+                    "[" . str_pad($slug, 20, ' ', STR_PAD_BOTH) . "] " .
                     // version details
                     $this->versionDetails($package)
                 );