diff --git a/packages.cpp b/packages.cpp
index b5b58168a..b35ff9131 100644
--- a/packages.cpp
+++ b/packages.cpp
@@ -24,7 +24,7 @@
 namespace Plasma
 {
 
-PlasmoidStructure::PlasmoidStructure()
+PlasmoidPackage::PlasmoidPackage()
     : Plasma::PackageStructure(QString("Plasmoid"))
 {
     addDirectoryDefinition("images", "images", i18n("Images"));
@@ -52,7 +52,7 @@ PlasmoidStructure::PlasmoidStructure()
     setRequired("mainscript", true);
 }
 
-ThemePackageStructure::ThemePackageStructure()
+ThemePackage::ThemePackage()
     : Plasma::PackageStructure(QString("Plasma Theme"))
 {
     addDirectoryDefinition("dialogs", "dialogs/", i18n("Images for dialogs"));
diff --git a/packages_p.h b/packages_p.h
index 799202669..09b8c1811 100644
--- a/packages_p.h
+++ b/packages_p.h
@@ -25,16 +25,16 @@
 namespace Plasma
 {
 
-class PlasmoidStructure : public PackageStructure
+class PlasmoidPackage : public PackageStructure
 {
 public:
-    explicit PlasmoidStructure();
+    explicit PlasmoidPackage();
 };
 
-class ThemePackageStructure : public PackageStructure
+class ThemePackage : public PackageStructure
 {
 public:
-    explicit ThemePackageStructure();
+    explicit ThemePackage();
 };
 
 } // namespace Plasma
diff --git a/theme.cpp b/theme.cpp
index 4b871a54d..3f9b79606 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -115,7 +115,7 @@ Theme::~Theme()
 
 PackageStructure Theme::packageStructure()
 {
-    return ThemePackageStructure();
+    return ThemePackage();
 }
 
 void Theme::setApplication(const QString &appname)