diff --git a/include/management/snapshot/class_SnapshotAttribute.inc b/include/management/snapshot/class_SnapshotAttribute.inc
index 55acc30956187c23482d59ae2adaff980fe3709f..17c22fd8ed7fe54f390d1b31f8978d159f8c5cd2 100644
--- a/include/management/snapshot/class_SnapshotAttribute.inc
+++ b/include/management/snapshot/class_SnapshotAttribute.inc
@@ -34,7 +34,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
     $this->setInLdap(FALSE);
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if (is_object($this->plugin)) {
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index 326dcf38f59f7720b99af106889d9d2852c4df0c..19644d559c3b6820eb09728c60f615f74aa74d4b 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -51,7 +51,7 @@ class BaseSelectorAttribute extends Attribute
     trigger_error('method setManagedAttributes is not supported for BaseSelectorAttribute');
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if (is_object($this->plugin)) {
diff --git a/include/simpleplugin/attributes/class_CompositeAttribute.inc b/include/simpleplugin/attributes/class_CompositeAttribute.inc
index e8408a3d77938ad6add057f4ce3ffebb1f71e600..64570f480ff10fce474dde56c1920fc436f98840 100644
--- a/include/simpleplugin/attributes/class_CompositeAttribute.inc
+++ b/include/simpleplugin/attributes/class_CompositeAttribute.inc
@@ -80,7 +80,7 @@ class CompositeAttribute extends Attribute
     unset($attribute);
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     foreach ($this->attributes as &$attribute) {
diff --git a/include/simpleplugin/attributes/class_FlagsAttribute.inc b/include/simpleplugin/attributes/class_FlagsAttribute.inc
index 7132e01d4c488c0e8cab05b92ca8b539a2f77a5d..8d5a30755edc865b551c61ef6aa10f618083b5eb 100644
--- a/include/simpleplugin/attributes/class_FlagsAttribute.inc
+++ b/include/simpleplugin/attributes/class_FlagsAttribute.inc
@@ -38,7 +38,7 @@ class FlagsAttribute extends StringAttribute
     $this->flags = $flags;
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if (is_object($this->plugin)) {
diff --git a/include/simpleplugin/attributes/class_ObjectSelectAttribute.inc b/include/simpleplugin/attributes/class_ObjectSelectAttribute.inc
index 39420edd3cb25038d0d31c747782138f0837e0d5..bbdd4f7873c7b42500a0e842ba6f4459cd874806 100644
--- a/include/simpleplugin/attributes/class_ObjectSelectAttribute.inc
+++ b/include/simpleplugin/attributes/class_ObjectSelectAttribute.inc
@@ -43,7 +43,7 @@ class ObjectSelectAttribute extends SelectAttribute
     $this->objectFilter = $objectFilter;
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if (is_object($this->plugin)) {
diff --git a/include/simpleplugin/attributes/class_SelectAttribute.inc b/include/simpleplugin/attributes/class_SelectAttribute.inc
index a7a8a971b1c839beea30e177bac5d15670799dc3..b55e36da2f7ec97f5849b60a463faa6fabb076c1 100644
--- a/include/simpleplugin/attributes/class_SelectAttribute.inc
+++ b/include/simpleplugin/attributes/class_SelectAttribute.inc
@@ -240,7 +240,7 @@ class SelectAttribute extends Attribute
     $this->size = $size;
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if ($this->isTemplate() && !in_array('%askme%', $this->choices)) {
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index e9952106ea21902e0a2d971b9fdb6ff391e492da..268f3a5aa6c9d3a10e0280258eacb3d3ecf0732f 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -349,7 +349,7 @@ class SetAttribute extends Attribute
    *
    *  \param simplePlugin &$plugin The parent plugin
    */
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     if ($this->attribute !== FALSE) {
diff --git a/include/simpleplugin/attributes/dialog/class_ObjectAttribute.inc b/include/simpleplugin/attributes/dialog/class_ObjectAttribute.inc
index 5984a72af8000dd18c1b0fd9ceccadab7fcdb0aa..713619534bb29147ecf82e6e14deab441bdff336 100644
--- a/include/simpleplugin/attributes/dialog/class_ObjectAttribute.inc
+++ b/include/simpleplugin/attributes/dialog/class_ObjectAttribute.inc
@@ -37,7 +37,7 @@ class ObjectAttribute extends DialogButtonAttribute
     $this->objectType   = $objectType;
   }
 
-  function setParent (simplePlugin &$plugin)
+  function setParent (&$plugin)
   {
     parent::setParent($plugin);
     $infos = objects::infos($this->objectType);
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 6daa9f195d9a0c0ffd44b1f9c0f2710a7266602b..516807ebdb4593b07b83af21d6f6e89c41b3800c 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -115,7 +115,7 @@ class Attribute
    *
    *  \param SimpleTab &$plugin The parent plugin
    */
-  function setParent (SimpleTab &$plugin)
+  function setParent (&$plugin)
   {
     $this->plugin = $plugin;
     $this->manageAttributes($this->getValue());
diff --git a/plugins/personal/generic/class_UserPasswordAttribute.inc b/plugins/personal/generic/class_UserPasswordAttribute.inc
index 2373a5638402e1101e89e6a01edfbd5e1b47c016..9337e4951499c71444a27ceebf61dbc7357f1c76 100644
--- a/plugins/personal/generic/class_UserPasswordAttribute.inc
+++ b/plugins/personal/generic/class_UserPasswordAttribute.inc
@@ -69,7 +69,7 @@ class UserPasswordAttribute extends CompositeAttribute
     $this->attributes[4]->setTemplatable(FALSE);
   }
 
-  public function setParent (simplePlugin &$plugin)
+  public function setParent (&$plugin)
   {
     global $config;
     parent::setParent($plugin);