diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/plugins/export/ExportCodegen.php
index 805089d58f4a..52c9a29a64c8 100644
--- a/libraries/plugins/export/ExportCodegen.php
+++ b/libraries/plugins/export/ExportCodegen.php
@@ -86,12 +86,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new HiddenPropertyItem("structure_or_data");
         $generalOptions->addProperty($leaf);
diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/plugins/export/ExportCsv.php
index 662531b04b1f..5548365879a9 100644
--- a/libraries/plugins/export/ExportCsv.php
+++ b/libraries/plugins/export/ExportCsv.php
@@ -50,12 +50,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create leaf items and add them to the group
         $leaf = new TextPropertyItem(
             "separator",
diff --git a/libraries/plugins/export/ExportExcel.php b/libraries/plugins/export/ExportExcel.php
index 1927d93becb2..63f10b32372a 100644
--- a/libraries/plugins/export/ExportExcel.php
+++ b/libraries/plugins/export/ExportExcel.php
@@ -40,12 +40,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new TextPropertyItem(
             'null',
diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/plugins/export/ExportHtmlword.php
index 070595bd18ee..b0467f690490 100644
--- a/libraries/plugins/export/ExportHtmlword.php
+++ b/libraries/plugins/export/ExportHtmlword.php
@@ -51,13 +51,14 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // what to dump (structure/data/both)
-        $dumpWhat = new OptionsPropertyMainGroup();
-        $dumpWhat->setName("dump_what");
-        $dumpWhat->setText(__('Dump table'));
+        $dumpWhat = new OptionsPropertyMainGroup(
+            "dump_what", __('Dump table')
+        );
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
@@ -72,9 +73,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($dumpWhat);
 
         // data options main group
-        $dataOptions = new OptionsPropertyMainGroup();
-        $dataOptions->setName("dump_what");
-        $dataOptions->setText(__('Data dump options'));
+        $dataOptions = new OptionsPropertyMainGroup(
+            "dump_what", __('Data dump options')
+        );
         $dataOptions->setForce('structure');
         // create primary items and add them to the group
         $leaf = new TextPropertyItem(
diff --git a/libraries/plugins/export/ExportJson.php b/libraries/plugins/export/ExportJson.php
index 87fb258788cf..1c2b6618b61c 100644
--- a/libraries/plugins/export/ExportJson.php
+++ b/libraries/plugins/export/ExportJson.php
@@ -48,12 +48,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new HiddenPropertyItem("structure_or_data");
         $generalOptions->addProperty($leaf);
diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/plugins/export/ExportLatex.php
index 01012d248b49..f68dba88f840 100644
--- a/libraries/plugins/export/ExportLatex.php
+++ b/libraries/plugins/export/ExportLatex.php
@@ -74,12 +74,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
             "caption",
@@ -90,9 +90,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($generalOptions);
 
         // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup();
-        $dumpWhat->setName("dump_what");
-        $dumpWhat->setText(__('Dump table'));
+        $dumpWhat = new OptionsPropertyMainGroup(
+            "dump_what", __('Dump table')
+        );
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
@@ -108,9 +108,9 @@ protected function setProperties()
 
         // structure options main group
         if (!$hide_structure) {
-            $structureOptions = new OptionsPropertyMainGroup();
-            $structureOptions->setName("structure");
-            $structureOptions->setText(__('Object creation options'));
+            $structureOptions = new OptionsPropertyMainGroup(
+                "structure", __('Object creation options')
+            );
             $structureOptions->setForce('data');
             // create primary items and add them to the group
             $leaf = new TextPropertyItem(
@@ -155,9 +155,9 @@ protected function setProperties()
         }
 
         // data options main group
-        $dataOptions = new OptionsPropertyMainGroup();
-        $dataOptions->setName("data");
-        $dataOptions->setText(__('Data dump options'));
+        $dataOptions = new OptionsPropertyMainGroup(
+            "data", __('Data dump options')
+        );
         $dataOptions->setForce('structure');
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/plugins/export/ExportMediawiki.php
index 2fd586b1abe6..085b956cd09d 100644
--- a/libraries/plugins/export/ExportMediawiki.php
+++ b/libraries/plugins/export/ExportMediawiki.php
@@ -49,18 +49,19 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
-        $generalOptions->setText(__('Dump table'));
+        $generalOptions = new OptionsPropertyMainGroup(
+            "general_opts", __('Dump table')
+        );
 
         // what to dump (structure/data/both)
-        $subgroup = new OptionsPropertySubgroup();
-        $subgroup->setName("dump_table");
-        $subgroup->setText("Dump table");
+        $subgroup = new OptionsPropertySubgroup(
+            "dump_table", __("Dump table")
+        );
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
             array(
diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php
index ead1c96d0560..8ee621c515b1 100644
--- a/libraries/plugins/export/ExportOds.php
+++ b/libraries/plugins/export/ExportOds.php
@@ -55,12 +55,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new TextPropertyItem(
             "null",
diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php
index 792581a52f04..152619cecda3 100644
--- a/libraries/plugins/export/ExportOdt.php
+++ b/libraries/plugins/export/ExportOdt.php
@@ -64,13 +64,14 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup();
-        $dumpWhat->setName("general_opts");
-        $dumpWhat->setText(__('Dump table'));
+        $dumpWhat = new OptionsPropertyMainGroup(
+            "general_opts", __('Dump table')
+        );
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
@@ -86,9 +87,9 @@ protected function setProperties()
 
         // structure options main group
         if (!$hide_structure) {
-            $structureOptions = new OptionsPropertyMainGroup();
-            $structureOptions->setName("structure");
-            $structureOptions->setText(__('Object creation options'));
+            $structureOptions = new OptionsPropertyMainGroup(
+                "structure", __('Object creation options')
+            );
             $structureOptions->setForce('data');
             // create primary items and add them to the group
             if (!empty($GLOBALS['cfgRelation']['relation'])) {
@@ -115,9 +116,9 @@ protected function setProperties()
         }
 
         // data options main group
-        $dataOptions = new OptionsPropertyMainGroup();
-        $dataOptions->setName("data");
-        $dataOptions->setText(__('Data dump options'));
+        $dataOptions = new OptionsPropertyMainGroup(
+            "data", __('Data dump options')
+        );
         $dataOptions->setForce('structure');
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/plugins/export/ExportPdf.php
index 3c46d6ddd841..b0e59c72e989 100644
--- a/libraries/plugins/export/ExportPdf.php
+++ b/libraries/plugins/export/ExportPdf.php
@@ -88,12 +88,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new TextPropertyItem(
             "report_title",
@@ -104,9 +104,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($generalOptions);
 
         // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup();
-        $dumpWhat->setName("dump_what");
-        $dumpWhat->setText(__('Dump table'));
+        $dumpWhat = new OptionsPropertyMainGroup(
+            "dump_what", __('Dump table')
+        );
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
             array(
diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/plugins/export/ExportPhparray.php
index 85edd8207b15..4a48f10e181c 100644
--- a/libraries/plugins/export/ExportPhparray.php
+++ b/libraries/plugins/export/ExportPhparray.php
@@ -48,12 +48,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new HiddenPropertyItem("structure_or_data");
         $generalOptions->addProperty($leaf);
diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
index c9173b5baf94..0ed8bf9d063d 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/plugins/export/ExportSql.php
@@ -76,16 +76,15 @@ protected function setProperties()
             // create the root group that will be the options field for
             // $exportPluginProperties
             // this will be shown as "Format specific options"
-            $exportSpecificOptions = new OptionsPropertyRootGroup();
-            $exportSpecificOptions->setName("Format Specific Options");
+            $exportSpecificOptions = new OptionsPropertyRootGroup(
+                "Format Specific Options"
+            );
 
             // general options main group
-            $generalOptions = new OptionsPropertyMainGroup();
-            $generalOptions->setName("general_opts");
+            $generalOptions = new OptionsPropertyMainGroup("general_opts");
 
             // comments
-            $subgroup = new OptionsPropertySubgroup();
-            $subgroup->setName("include_comments");
+            $subgroup = new OptionsPropertySubgroup("include_comments");
             $leaf = new BoolPropertyItem(
                 'include_comments',
                 __(
@@ -194,9 +193,9 @@ protected function setProperties()
             }
 
             // what to dump (structure/data/both)
-            $subgroup = new OptionsPropertySubgroup();
-            $subgroup->setName("dump_table");
-            $subgroup->setText("Dump table");
+            $subgroup = new OptionsPropertySubgroup(
+                "dump_table", __("Dump table")
+            );
             $leaf = new RadioPropertyItem('structure_or_data');
             $leaf->setValues(
                 array(
@@ -213,9 +212,9 @@ protected function setProperties()
 
             // structure options main group
             if (!$hide_structure) {
-                $structureOptions = new OptionsPropertyMainGroup();
-                $structureOptions->setName("structure");
-                $structureOptions->setText(__('Object creation options'));
+                $structureOptions = new OptionsPropertyMainGroup(
+                    "structure", __('Object creation options')
+                );
                 $structureOptions->setForce('data');
 
                 // begin SQL Statements
@@ -331,9 +330,9 @@ protected function setProperties()
             }
 
             // begin Data options
-            $dataOptions = new OptionsPropertyMainGroup();
-            $dataOptions->setName("data");
-            $dataOptions->setText(__('Data creation options'));
+            $dataOptions = new OptionsPropertyMainGroup(
+                "data", __('Data creation options')
+            );
             $dataOptions->setForce('structure');
             $leaf = new BoolPropertyItem(
                 "truncate",
diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/plugins/export/ExportTexytext.php
index 04ac42c2156d..93f96bdc2d5f 100644
--- a/libraries/plugins/export/ExportTexytext.php
+++ b/libraries/plugins/export/ExportTexytext.php
@@ -50,13 +50,14 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup();
-        $dumpWhat->setName("general_opts");
-        $dumpWhat->setText(__('Dump table'));
+        $dumpWhat = new OptionsPropertyMainGroup(
+            "general_opts", __('Dump table')
+        );
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
@@ -71,9 +72,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($dumpWhat);
 
         // data options main group
-        $dataOptions = new OptionsPropertyMainGroup();
-        $dataOptions->setName("data");
-        $dataOptions->setText(__('Data dump options'));
+        $dataOptions = new OptionsPropertyMainGroup(
+            "data", __('Data dump options')
+        );
         $dataOptions->setForce('structure');
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
diff --git a/libraries/plugins/export/ExportXml.php b/libraries/plugins/export/ExportXml.php
index 1ed9723ec1f1..f8e9839ab38c 100644
--- a/libraries/plugins/export/ExportXml.php
+++ b/libraries/plugins/export/ExportXml.php
@@ -80,12 +80,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new HiddenPropertyItem("structure_or_data");
         $generalOptions->addProperty($leaf);
@@ -93,9 +93,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($generalOptions);
 
         // export structure main group
-        $structure = new OptionsPropertyMainGroup();
-        $structure->setName("structure");
-        $structure->setText(__('Object creation options (all are recommended)'));
+        $structure = new OptionsPropertyMainGroup(
+            "structure", __('Object creation options (all are recommended)')
+        );
 
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
@@ -131,9 +131,9 @@ protected function setProperties()
         $exportSpecificOptions->addProperty($structure);
 
         // data main group
-        $data = new OptionsPropertyMainGroup();
-        $data->setName("data");
-        $data->setText(__('Data dump options'));
+        $data = new OptionsPropertyMainGroup(
+            "data", __('Data dump options')
+        );
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
             "export_contents",
diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/plugins/export/ExportYaml.php
index eb8ca91ea787..6689b864a8b0 100644
--- a/libraries/plugins/export/ExportYaml.php
+++ b/libraries/plugins/export/ExportYaml.php
@@ -49,12 +49,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new HiddenPropertyItem("structure_or_data");
         $generalOptions->addProperty($leaf);
diff --git a/libraries/plugins/export/README b/libraries/plugins/export/README
index 01af40693c38..1bb8843c0f02 100644
--- a/libraries/plugins/export/README
+++ b/libraries/plugins/export/README
@@ -75,12 +75,14 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
+            "general_opts"
+        );
 
         // optional :
         // create primary items and add them to the group
@@ -90,8 +92,9 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
         // size - size of text element
         // len  - maximal size of input
         // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem();
-        $leaf->setName("structure_or_data");
+        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
+            "structure_or_data"
+        );
         $leaf->setValues(
             array(
                 'structure' => __('structure'),
diff --git a/libraries/plugins/import/AbstractImportCsv.php b/libraries/plugins/import/AbstractImportCsv.php
index a2fc816e0860..96489075a47b 100644
--- a/libraries/plugins/import/AbstractImportCsv.php
+++ b/libraries/plugins/import/AbstractImportCsv.php
@@ -37,12 +37,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $importPluginProperties
         // this will be shown as "Format specific options"
-        $importSpecificOptions = new OptionsPropertyRootGroup();
-        $importSpecificOptions->setName("Format Specific Options");
+        $importSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
 
         // create common items and add them to the group
         $leaf = new BoolPropertyItem(
diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php
index ea7bd3855d73..6111b6fb6acd 100644
--- a/libraries/plugins/import/ImportOds.php
+++ b/libraries/plugins/import/ImportOds.php
@@ -59,12 +59,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $importPluginProperties
         // this will be shown as "Format specific options"
-        $importSpecificOptions = new OptionsPropertyRootGroup();
-        $importSpecificOptions->setName("Format Specific Options");
+        $importSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new OptionsPropertyMainGroup("general_opts");
         // create primary items and add them to the group
         $leaf = new BoolPropertyItem(
             "col_names",
diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php
index 7866e4b75e13..8926830ed77a 100644
--- a/libraries/plugins/import/ImportSql.php
+++ b/libraries/plugins/import/ImportSql.php
@@ -56,12 +56,12 @@ protected function setProperties()
             // create the root group that will be the options field for
             // $importPluginProperties
             // this will be shown as "Format specific options"
-            $importSpecificOptions = new OptionsPropertyRootGroup();
-            $importSpecificOptions->setName("Format Specific Options");
+            $importSpecificOptions = new OptionsPropertyRootGroup(
+                "Format Specific Options"
+            );
 
             // general options main group
-            $generalOptions = new OptionsPropertyMainGroup();
-            $generalOptions->setName("general_opts");
+            $generalOptions = new OptionsPropertyMainGroup("general_opts");
             // create primary items and add them to the group
             $leaf = new SelectPropertyItem(
                 "compatibility",
diff --git a/libraries/plugins/import/README b/libraries/plugins/import/README
index 6bbfefae3d76..509df5120fd2 100644
--- a/libraries/plugins/import/README
+++ b/libraries/plugins/import/README
@@ -55,12 +55,15 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
         // create the root group that will be the options field for
         // $importPluginProperties
         // this will be shown as "Format specific options"
-        $importSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup();
-        $importSpecificOptions->setName("Format Specific Options");
+        $importSpecificOptions = new
+        PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup();
-        $generalOptions->setName("general_opts");
+        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
+            "general_opts"
+        );
 
         // optional :
         // create primary items and add them to the group
@@ -70,8 +73,9 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
         // size - size of text element
         // len  - maximal size of input
         // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem();
-        $leaf->setName("structure_or_data");
+        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
+            "structure_or_data"
+        );
         $leaf->setValues(
             array(
                 'structure' => __('structure'),
diff --git a/libraries/plugins/schema/SchemaDia.php b/libraries/plugins/schema/SchemaDia.php
index facd20dcd370..ae5b05a06fa7 100644
--- a/libraries/plugins/schema/SchemaDia.php
+++ b/libraries/plugins/schema/SchemaDia.php
@@ -46,12 +46,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $schemaPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup();
-        $specificOptions->setName("general_opts");
+        $specificOptions = new OptionsPropertyMainGroup("general_opts");
         // add options common to all plugins
         $this->addCommonOptions($specificOptions);
 
diff --git a/libraries/plugins/schema/SchemaEps.php b/libraries/plugins/schema/SchemaEps.php
index 474b8199ba79..59ce74669a80 100644
--- a/libraries/plugins/schema/SchemaEps.php
+++ b/libraries/plugins/schema/SchemaEps.php
@@ -47,12 +47,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $schemaPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup();
-        $specificOptions->setName("general_opts");
+        $specificOptions = new OptionsPropertyMainGroup("general_opts");
         // add options common to all plugins
         $this->addCommonOptions($specificOptions);
 
diff --git a/libraries/plugins/schema/SchemaPdf.php b/libraries/plugins/schema/SchemaPdf.php
index ef8db2e08167..b49ee5bcf164 100644
--- a/libraries/plugins/schema/SchemaPdf.php
+++ b/libraries/plugins/schema/SchemaPdf.php
@@ -47,12 +47,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $schemaPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup();
-        $specificOptions->setName("general_opts");
+        $specificOptions = new OptionsPropertyMainGroup("general_opts");
         // add options common to all plugins
         $this->addCommonOptions($specificOptions);
 
diff --git a/libraries/plugins/schema/SchemaSvg.php b/libraries/plugins/schema/SchemaSvg.php
index 2f35ad006b40..df87548418f4 100644
--- a/libraries/plugins/schema/SchemaSvg.php
+++ b/libraries/plugins/schema/SchemaSvg.php
@@ -46,12 +46,12 @@ protected function setProperties()
         // create the root group that will be the options field for
         // $schemaPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup();
-        $exportSpecificOptions->setName("Format Specific Options");
+        $exportSpecificOptions = new OptionsPropertyRootGroup(
+            "Format Specific Options"
+        );
 
         // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup();
-        $specificOptions->setName("general_opts");
+        $specificOptions = new OptionsPropertyMainGroup("general_opts");
         // add options common to all plugins
         $this->addCommonOptions($specificOptions);