diff --git a/app/availableplugins/FileConnector/src/Model/Table/FileProvisionersTable.php b/app/availableplugins/FileConnector/src/Model/Table/FileProvisionersTable.php
index 3a0aff846..b4ec46ea8 100644
--- a/app/availableplugins/FileConnector/src/Model/Table/FileProvisionersTable.php
+++ b/app/availableplugins/FileConnector/src/Model/Table/FileProvisionersTable.php
@@ -34,7 +34,7 @@
 use Cake\Validation\Validator;
 use App\Lib\Enum\ProvisioningEligibilityEnum;
 use App\Lib\Enum\ProvisioningStatusEnum;
-use \FileConnector\Model\Entity\FileProvisioner;
+use \FileProvisioner\Model\Entity\FileProvisioner;
 
 class FileProvisionersTable extends Table {
   use \App\Lib\Traits\ChangelogBehaviorTrait;
diff --git a/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php b/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
index c170e3ebb..82be14a59 100644
--- a/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
+++ b/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
@@ -349,7 +349,7 @@ protected function resultToEntityData(array $result): array {
    */
 
   public function retrieve(
-    \App\Model\Entity\ExternalIdentitySource $source, 
+    \App\Model\Entity\ExternalIdentitySource $source,
     string $source_key
   ): array {
     // Read the field configuration (for resultToEntity)
@@ -423,7 +423,7 @@ public function ruleIsFileReadable($entity, array $options): string|bool {
    */
 
   public function search(
-    \App\Model\Entity\ExternalIdentitySource $source, 
+    \App\Model\Entity\ExternalIdentitySource $source,
     array $searchAttrs
   ): array {
     // Read the field configuration (for resultToEntity)
diff --git a/app/src/Controller/ApiUsersController.php b/app/src/Controller/ApiUsersController.php
index 6b39a7b69..0d5859078 100644
--- a/app/src/Controller/ApiUsersController.php
+++ b/app/src/Controller/ApiUsersController.php
@@ -69,7 +69,8 @@ public function generate(string $id) {
       'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
       'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
       'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings'
+      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
+      'GroupMembers'
     ])
     ) {
       $this->render('/Standard/add-edit-view-new');
diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index 6dea67ff3..af9f0ec89 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -131,7 +131,8 @@ public function add() {
       'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
       'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
       'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings'
+      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
+      'GroupMembers'
     ])
     ) {
       $this->render('/Standard/add-edit-view-new');
@@ -437,7 +438,8 @@ public function edit(string $id) {
       'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
       'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
       'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings'
+      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
+      'GroupMembers'
     ])
     ) {
       $this->render('/Standard/add-edit-view-new');
@@ -896,7 +898,8 @@ public function view($id = null) {
       'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
       'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
       'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings'
+      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
+      'GroupMembers'
     ])
     ) {
       $this->render('/Standard/add-edit-view-new');
diff --git a/app/templates/Addresses/fields.inc b/app/templates/Addresses/fields.inc
index 7433c3c60..4c23a1b46 100644
--- a/app/templates/Addresses/fields.inc
+++ b/app/templates/Addresses/fields.inc
@@ -44,7 +44,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
diff --git a/app/templates/ApiUsers/fields.inc b/app/templates/ApiUsers/fields.inc
index f5390c24e..349916d8a 100644
--- a/app/templates/ApiUsers/fields.inc
+++ b/app/templates/ApiUsers/fields.inc
@@ -35,7 +35,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'username',  // string
-      'prefix' => 'co_' . $vv_cur_co->id . '.'
+      'fieldPrefix' => 'co_' . $vv_cur_co->id . '.'
     ]
   ]);
 
diff --git a/app/templates/CoSettings/fields.inc b/app/templates/CoSettings/fields.inc
index 0b0968ba9..8751cad6b 100644
--- a/app/templates/CoSettings/fields.inc
+++ b/app/templates/CoSettings/fields.inc
@@ -31,7 +31,7 @@ if($vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'required_fields_address',
-      'options' => ['empty' => false]
+      'fieldOptions' => ['empty' => false]
     ]]);
 
   print $this->element('form/listItem', [
@@ -57,13 +57,13 @@ if($vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'permitted_fields_name',
-      'options' => ['empty' => false]
+      'fieldOptions' => ['empty' => false]
     ]]);
 
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'required_fields_name',
-      'options' => ['empty' => false]
+      'fieldOptions' => ['empty' => false]
     ]]);
 
   print $this->element('form/listItem', [
@@ -79,7 +79,7 @@ if($vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'permitted_fields_telephone_number',
-      'options' => ['empty' => false]
+      'fieldOptions' => ['empty' => false]
     ]]);
 
   print $this->element('form/listItem', [
@@ -103,14 +103,12 @@ if($vv_action == 'edit') {
       'groupedControls' =>  [
         // each key is the fieldName of the control we are going to create
         'person_picker_email_address_type_id' => [
-          'options' => [
-            'empty' => true,
+          'fieldOptions' => [
             'label' => __d('field', 'mail'),
           ],
         ],
         'person_picker_identifier_type_id' => [
-          'options' => [
-            'empty' => true,
+          'fieldOptions' => [
             'label' => __d('field', 'identifier'),
           ],
         ],
diff --git a/app/templates/Cous/fields.inc b/app/templates/Cous/fields.inc
index bdce4df30..60089c412 100644
--- a/app/templates/Cous/fields.inc
+++ b/app/templates/Cous/fields.inc
@@ -38,8 +38,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
     print $this->element('form/listItem', [
       'arguments' => [
         'fieldName' => 'parent_id',
-        'options' => ['empty' => true],
-        'labelText' => __d('field', 'parent_id')
+        'fieldLabel' => __d('field', 'parent_id')
       ]
     ]);
   }
diff --git a/app/templates/EmailAddresses/fields.inc b/app/templates/EmailAddresses/fields.inc
index fcc811108..3c4d5065c 100644
--- a/app/templates/EmailAddresses/fields.inc
+++ b/app/templates/EmailAddresses/fields.inc
@@ -34,7 +34,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
@@ -48,7 +48,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'verified',
-      'options' => [
+      'fieldOptions' => [
         'readonly' => true
       ]
     ]]);
diff --git a/app/templates/ExternalIdentityRoles/fields.inc b/app/templates/ExternalIdentityRoles/fields.inc
index 3e1c11af2..33b5aef1a 100644
--- a/app/templates/ExternalIdentityRoles/fields.inc
+++ b/app/templates/ExternalIdentityRoles/fields.inc
@@ -29,7 +29,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'affiliation_type_id',
-      'labelText' => __d('field', 'affiliation')
+      'fieldLabel' => __d('field', 'affiliation')
     ]
   ]);
 
@@ -57,13 +57,13 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'sponsor_identifier',
-      'labelText' => __d('field', 'sponsor')
+      'fieldLabel' => __d('field', 'sponsor')
     ]
   ]);
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'manager_identifier',
-      'labelText' => __d('field', 'manager')
+      'fieldLabel' => __d('field', 'manager')
     ]
   ]);
 
diff --git a/app/templates/ExternalIdentitySources/fields.inc b/app/templates/ExternalIdentitySources/fields.inc
index 85a746c38..12d631fd0 100644
--- a/app/templates/ExternalIdentitySources/fields.inc
+++ b/app/templates/ExternalIdentitySources/fields.inc
@@ -41,7 +41,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
       ]
     ];
     if($field == 'status') {
-      $params['arguments']['options'] = [
+      $params['arguments']['fieldOptions'] = [
         'default'  => \App\Lib\Enum\SyncModeEnum::Disabled
       ];
     }
diff --git a/app/templates/GroupMembers/fields.inc b/app/templates/GroupMembers/fields.inc
index 5a2308c09..f88c6b510 100644
--- a/app/templates/GroupMembers/fields.inc
+++ b/app/templates/GroupMembers/fields.inc
@@ -36,7 +36,7 @@ if($vv_action == 'add') {
     $this->element('form/listItem', [
       'arguments' => [
         'fieldName' => '',
-        'labelText' => __d('field','name'),
+        'fieldLabel' => __d('field','name'),
         'groupmember' => $vv_selected_person
       ]
     ]);
@@ -45,7 +45,7 @@ if($vv_action == 'add') {
     print $this->element('form/listItem', [
       'arguments' => [
         'fieldName' => 'person_id',
-        'options' => [
+        'fieldOptions' => [
           'class' => 'form-control people-autocomplete',
           'placeholder' => __d('operation','autocomplete.people.placeholder'),
           'id' => 'person_id',
diff --git a/app/templates/Groups/fields.inc b/app/templates/Groups/fields.inc
index fb6282ef2..fb408df14 100644
--- a/app/templates/Groups/fields.inc
+++ b/app/templates/Groups/fields.inc
@@ -39,7 +39,7 @@ foreach(['name',
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => $field,
-      'options' => $options
+      'fieldOptions' => $options
     ]
   ]);
 }
@@ -54,7 +54,7 @@ if($vv_action != 'add') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'group_type',
-      'options' => [
+      'fieldOptions' => [
         'readonly' => true
       ]
     ]
diff --git a/app/templates/HistoryRecords/fields.inc b/app/templates/HistoryRecords/fields.inc
index df320b062..2bc8d628c 100644
--- a/app/templates/HistoryRecords/fields.inc
+++ b/app/templates/HistoryRecords/fields.inc
@@ -151,7 +151,7 @@ if($vv_action == 'add' || $vv_action == 'view') {
           'fieldName' => 'actor_person_id',
           'status' => $vv_obj->actor_person->names[0]->full_name,
           'link' => $viewLink,
-          'labelText' => __d('field', 'actor')
+          'fieldLabel' => __d('field', 'actor')
         ]
       ]);
     }
diff --git a/app/templates/IdentifierAssignments/fields.inc b/app/templates/IdentifierAssignments/fields.inc
index 7dfcb6d43..93ca8e381 100644
--- a/app/templates/IdentifierAssignments/fields.inc
+++ b/app/templates/IdentifierAssignments/fields.inc
@@ -85,7 +85,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'context',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'updateGadgets()'
       ]
     ]
@@ -94,7 +94,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'identifier_type_id',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'resetType("email-address-type-id")'
       ]
     ]
@@ -109,7 +109,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'email_address_type_id',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'resetType("identifier-type-id")'
       ]
     ]
diff --git a/app/templates/Identifiers/fields.inc b/app/templates/Identifiers/fields.inc
index eb5e9c6d2..5d0b03a34 100644
--- a/app/templates/Identifiers/fields.inc
+++ b/app/templates/Identifiers/fields.inc
@@ -34,7 +34,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
diff --git a/app/templates/Jobs/fields.inc b/app/templates/Jobs/fields.inc
index 769b51c27..bd6d9f1a7 100644
--- a/app/templates/Jobs/fields.inc
+++ b/app/templates/Jobs/fields.inc
@@ -30,7 +30,7 @@ if($vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'plugin',
-      'labelText' => __d('controller', 'Jobs', [1])
+      'fieldLabel' => __d('controller', 'Jobs', [1])
     ]
   ]);
 
diff --git a/app/templates/Names/fields.inc b/app/templates/Names/fields.inc
index 112e65923..f4a19b41d 100644
--- a/app/templates/Names/fields.inc
+++ b/app/templates/Names/fields.inc
@@ -41,7 +41,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
@@ -63,7 +63,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'description',
-      'options' => [
+      'fieldOptions' => [
         'readonly' => $vv_obj->primary_name
       ]
     ]]);
diff --git a/app/templates/People/fields.inc b/app/templates/People/fields.inc
index d16a99e31..016c50412 100644
--- a/app/templates/People/fields.inc
+++ b/app/templates/People/fields.inc
@@ -36,7 +36,7 @@ if($vv_action == 'add') {
       print $this->element('form/listItem', [
         'arguments' => [
           'fieldName' => 'names.0.'.$f,
-          'options' => [
+          'fieldOptions' => [
             'required' => in_array($f, $vv_required_name_fields)
           ],
           'fieldType' => 'string'
@@ -47,7 +47,7 @@ if($vv_action == 'add') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'names.0.type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_name_type
       ],
       'fieldType' => 'string'
diff --git a/app/templates/PersonRoles/fields.inc b/app/templates/PersonRoles/fields.inc
index 7265f1031..3a103add4 100644
--- a/app/templates/PersonRoles/fields.inc
+++ b/app/templates/PersonRoles/fields.inc
@@ -35,16 +35,13 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' =>'affiliation_type_id',
-      'labelText' => __d('field', 'affiliation')
+      'fieldLabel' => __d('field', 'affiliation')
     ]
   ]);
 
   print $this->element('form/listItem', [
     'arguments' => [
-      'fieldName' =>'status',
-      'options' => [
-        'empty' => false
-      ]
+      'fieldName' =>'status'
     ]
   ]);
 
@@ -77,7 +74,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
         'fieldName' => $f.'_person_id',
         'status' => $fname,
         'link' => $flink,
-        'labelText' => __d('field', $f)
+        'fieldLabel' => __d('field', $f)
       ]
     ]);
   }
diff --git a/app/templates/Pipelines/fields.inc b/app/templates/Pipelines/fields.inc
index a9ee9794f..58a956008 100644
--- a/app/templates/Pipelines/fields.inc
+++ b/app/templates/Pipelines/fields.inc
@@ -66,7 +66,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'match_strategy',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'updateGadgets()'
       ],
       'fieldType' => 'select'
diff --git a/app/templates/Pronouns/fields.inc b/app/templates/Pronouns/fields.inc
index aa57d4a69..0104a3b7f 100644
--- a/app/templates/Pronouns/fields.inc
+++ b/app/templates/Pronouns/fields.inc
@@ -34,7 +34,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
diff --git a/app/templates/ProvisioningTargets/fields.inc b/app/templates/ProvisioningTargets/fields.inc
index 0162116d2..682bbd11e 100644
--- a/app/templates/ProvisioningTargets/fields.inc
+++ b/app/templates/ProvisioningTargets/fields.inc
@@ -57,7 +57,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'description',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'updateGadgets()',
         'default'  => \App\Lib\Enum\ProvisionerModeEnum::QueueOnError
       ]
@@ -66,7 +66,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'description',
-      'options' => [
+      'fieldOptions' => [
         'default' => 900
       ]
     ]]);
diff --git a/app/templates/TelephoneNumbers/fields.inc b/app/templates/TelephoneNumbers/fields.inc
index 7161577a5..fe47db851 100644
--- a/app/templates/TelephoneNumbers/fields.inc
+++ b/app/templates/TelephoneNumbers/fields.inc
@@ -41,7 +41,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
diff --git a/app/templates/Types/fields.inc b/app/templates/Types/fields.inc
index 476167f6e..d235049c1 100644
--- a/app/templates/Types/fields.inc
+++ b/app/templates/Types/fields.inc
@@ -51,7 +51,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'attribute',
-      'options' => [
+      'fieldOptions' => [
         'onChange' => 'updateGadgets()',
         'readonly' => $vv_action == 'edit'
       ]
diff --git a/app/templates/Urls/fields.inc b/app/templates/Urls/fields.inc
index 4e45ab386..4d48a815a 100644
--- a/app/templates/Urls/fields.inc
+++ b/app/templates/Urls/fields.inc
@@ -34,7 +34,7 @@ if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => 'type_id',
-      'options' => [
+      'fieldOptions' => [
         'default' => $vv_default_type
       ]
     ]]);
diff --git a/app/templates/element/form/fieldDiv.php b/app/templates/element/form/fieldDiv.php
index ecec7e2e4..2f383ca68 100644
--- a/app/templates/element/form/fieldDiv.php
+++ b/app/templates/element/form/fieldDiv.php
@@ -35,7 +35,7 @@
   print $this->element('form/nameDiv');
 
   // Info Div
-  if(isset($vv_field_arguments['prefix'])) {
+  if(isset($vv_field_arguments['fieldPrefix'])) {
     print $this->element('form/infoDiv/withPrefix');
   } elseif(isset($vv_field_arguments['status'])) {
     print $this->element('form/infoDiv/status');
diff --git a/app/templates/element/form/infoDiv/withPrefix.php b/app/templates/element/form/infoDiv/withPrefix.php
index c5a80d0a7..0881534b5 100644
--- a/app/templates/element/form/infoDiv/withPrefix.php
+++ b/app/templates/element/form/infoDiv/withPrefix.php
@@ -31,7 +31,7 @@
 <div class="field-info">
   <div class="input-group mb-3">
     <div class="input-group-prepend">
-      <span class="input-group-text" id="basic-addon3"><?= $vv_field_arguments['prefix'] ?></span>
+      <span class="input-group-text" id="basic-addon3"><?= $vv_field_arguments['fieldPrefix'] ?></span>
     </div>
     <?= $this->Fieeld->formField(...$vv_field_arguments)?>
   </div>
diff --git a/app/templates/element/form/nameDiv.php b/app/templates/element/form/nameDiv.php
index 8cc7a49f9..daa8295c7 100644
--- a/app/templates/element/form/nameDiv.php
+++ b/app/templates/element/form/nameDiv.php
@@ -29,7 +29,7 @@
 /*
  * Parameters
  * string $fieldName
- * string $labelText
+ * string $fieldLabel
  * bool   $labelIsTextOnly
  */
 
@@ -57,7 +57,7 @@
 }
 
 [$label, $desc] = $this->Fieeld->calculateLabelAndDescription($fn);
-$label = $vv_field_arguments['labelText'] ?? $label;
+$label = $vv_field_arguments['fieldLabel'] ?? $label;
 
 // Extra class required for the grouped controls elements
 if(isset($groupedControls)) {