diff --git a/app/src/Controller/ApiUsersController.php b/app/src/Controller/ApiUsersController.php
index 0d5859078..aa871b09b 100644
--- a/app/src/Controller/ApiUsersController.php
+++ b/app/src/Controller/ApiUsersController.php
@@ -64,19 +64,6 @@ public function generate(string $id) {
     $this->set('vv_title', $title);
 
     // Let the view render
-    if(in_array($this->name, [
-      'Cous', 'ApiUsers', 'CoSettings', 'Cos', 'Addresses', 'EmailAddresses',
-      'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
-      'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
-      'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
-      'GroupMembers'
-    ])
-    ) {
-      $this->render('/Standard/add-edit-view-new');
-    } else {
-      // Let the view render
-      $this->render('/Standard/add-edit-view');
-    }
+    $this->render('/Standard/add-edit-view');
   }
 }
\ No newline at end of file
diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index af9f0ec89..4bde4ebaf 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -126,20 +126,7 @@ public function add() {
     $this->set('vv_subtitle', $subtitle);
 
     // Let the view render
-    if(in_array($this->name, [
-      'Cous', 'ApiUsers', 'CoSettings', 'Cos', 'Addresses', 'EmailAddresses',
-      'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
-      'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
-      'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
-      'GroupMembers'
-    ])
-    ) {
-      $this->render('/Standard/add-edit-view-new');
-    } else {
-      // Let the view render
-      $this->render('/Standard/add-edit-view');
-    }
+    $this->render('/Standard/add-edit-view');
   }
   
   /**
@@ -433,20 +420,8 @@ public function edit(string $id) {
     $this->set('vv_supertitle', $supertitle);
     $this->set('vv_subtitle', $subtitle);
 
-    if(in_array($this->name, [
-      'Cous', 'CoSettings', 'ApiUsers', 'Cos', 'Addresses', 'EmailAddresses',
-      'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
-      'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
-      'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
-      'GroupMembers'
-    ])
-    ) {
-      $this->render('/Standard/add-edit-view-new');
-    } else {
-      // Let the view render
-      $this->render('/Standard/add-edit-view');
-    }
+    // Let the view render
+    $this->render('/Standard/add-edit-view');
   }
   
   /**
@@ -891,21 +866,8 @@ public function view($id = null) {
     $this->set('vv_title', $title);
     $this->set('vv_supertitle', $supertitle);
     $this->set('vv_subtitle', $subtitle);
-    
+
     // Let the view render
-    if(in_array($this->name, [
-      'Cous', 'ApiUsers', 'CoSettings', 'Cos', 'Addresses', 'EmailAddresses',
-      'Groups', 'Servers', 'Types', 'Urls', 'Identifiers', 'HistoryRecords',
-      'TelephoneNumbers', 'Names', 'AdHocAttributes', 'PersonRoles', 'ExternalIdentities',
-      'ExternalIdentityRoles', 'ExternalIdentitySources', 'ExternalIdentitySourceRecords',
-      'IdentifierAssignments', 'Jobs', 'JobHistoryRecords', 'People', 'GroupNestings',
-      'GroupMembers'
-    ])
-    ) {
-      $this->render('/Standard/add-edit-view-new');
-    } else {
-      // Let the view render
-      $this->render('/Standard/add-edit-view');
-    }
+    $this->render('/Standard/add-edit-view');
   }
 }
\ No newline at end of file
diff --git a/app/src/View/Helper/FieeldHelper.php b/app/src/View/Helper/FieeldHelper.php
deleted file mode 100644
index 39288877f..000000000
--- a/app/src/View/Helper/FieeldHelper.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/**
- * COmanage Registry Field Helper
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX can we merge this with Match so we only maintain one file?
-declare(strict_types = 1);
-
-namespace App\View\Helper;
-
-use Cake\I18n\FrozenTime;
-use Cake\Utility\Inflector;
-use Cake\View\Helper;
-use App\Lib\Enum\DateTypeEnum;
-use App\Lib\Util\StringUtilities;
-
-class FieeldHelper extends Helper {
-  public $helpers = ['Form', 'Html', 'Url', 'Alert'];
-
-  // Is this read-only or read-write?
-  protected bool $editable = true;
-  
-  // Our current model name
-  protected ?string $modelName = null;
-  
-  // The plugin we are rendering within, if set
-  protected ?string $pluginName = null;
-
-  // The list of required fields
-  protected array $reqFields = [];
-
-  // The field types
-  protected array $fieldTypes = [];
-
-  // The current entity, if edit or view
-  protected ?object $entity = null;
-
-  // The current action
-  protected ?string $action = null;
-
-
-  /**
-   * Constructor hook method.
-   *
-   * @param   array  $config The configuration settings provided to this helper.
-   *
-   * @return void
-   */
-  public function initialize(array $config): void
-  {
-    parent::initialize($config);
-
-    $this->reqFields = $this->getView()->get('vv_required_fields');
-    $this->modelName = $this->getView()->getName();
-    $this->action = $this->getView()->get('vv_action');
-    $this->editable = \in_array($this->action, ['add', 'edit']);
-    $this->pluginName = $this->getView()->getPlugin();
-    $this->entity = $this->getView()->get('vv_obj');
-    $this->fieldTypes = $this->getView()->get('vv_field_types');
-  }
-
-  /**
-   * We autogenerate field labels and descriptions from the field name.
-   *
-   * @param   string  $fieldName
-   *
-   * @return array
-   */
-  public function calculateLabelAndDescription(string $fieldName): array
-  {
-    $desc = null;
-    $label = null;
-
-    // First, try to autogenerate the field label (if we weren't given one).
-    $pluginDomain = (!empty($this->getPluginName())
-      ? Inflector::underscore($this->getPluginName())
-      : null);
-
-    $modelName = $this->getModelName();
-    // We try to automagically determine if a description for the field exists by
-    // looking for the corresponding .desc language translation.
-    // We autogenerate field labels and descriptions from the field name.
-
-    // We loop over the field generation logic twice, first for a plugin
-    // context (if set) and then generally (if no plugin localization was found).
-
-    // We use $core as the variable for this loop, so the rest of the code
-    // is easier to read (!$core = plugin)
-    for($core = 0;$core < 2;$core++) {
-      if(!$core && empty($this->pluginName)) {
-        // No plugin set, go to the core field checks
-        continue;
-      }
-
-      // Is there a model specific key? For plugins, this will be in field.Model.Field
-
-      $key = (!$core ? 'field.' : '') . "$modelName.$fieldName";
-      $label = __d(($core ? 'field' : $pluginDomain), $key);
-
-      if($label === $key) {
-        // Model-specific label isn't found, try again for a general label
-
-        $f = null;
-
-        if(preg_match('/^(.*?)_id$/', $fieldName, $f)) {
-          // Map foreign keys (foo_id) to the controller label
-          $key = (!$core ? 'controller.' : '') . Inflector::camelize(Inflector::pluralize($f[1]));
-          $label = __d(($core ? 'controller' : $pluginDomain), $key, [1]);
-
-          if($key !== $label) {
-            break;
-          }
-        }
-
-        // Look up the key
-        $key = (!$core ? 'field.' : '') . $fieldName;
-        $label = __d(($core ? 'field' : $pluginDomain), $key);
-
-        if($key !== $label) {
-          break;
-        }
-      } else {
-        // If we found a key, break the loop
-        break;
-      }
-    }
-    // We try to automagically determine if a description for the field exists by
-    // looking for the corresponding .desc language translation.
-
-    for($core = 0;$core < 2;$core++) {
-      if(!$core && empty($this->pluginName)) {
-        // No plugin set, just go to the core field checks
-        continue;
-      }
-
-      $key = (!$core ? 'field.' : '') . "$modelName.$fieldName.desc";
-      $desc = __d(($core ? 'field' : $pluginDomain), $key);
-
-      // If the description is the literal key we just generated, there is no description
-      if($desc === $key) {
-        $desc = null;
-      } else {
-        break;
-      }
-    }
-
-    return [$label, $desc];
-  }
-
-  /**
-   * Emit a date/time form control.
-   * This is a wrapper function for $this->control()
-   *
-   * @param   string       $fieldName    Form field
-   * @param   string       $dateType     Standard, DateOnly, FromTime, ThroughTime
-   * @param   array|null   $queryParams  Request Query parameters used by the filtering Blocks to get the date values
-   * @param   string|null  $label
-   *
-   * @return string HTML element
-   * @since  COmanage Registry v5.0.0
-   */
-
-  public function dateField(string $fieldName,
-                            string $dateType=DateTypeEnum::Standard,
-                            array $queryParams=null,
-                            string $label=null): string
-  {
-    // Initialize
-    $dateFormat = $dateType === DateTypeEnum::DateOnly ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss';
-    $dateTitle = $dateType === DateTypeEnum::DateOnly ? 'datepicker.enterDate' : 'datepicker.enterDateTime';
-    $datePattern = $dateType === DateTypeEnum::DateOnly ? '\d{4}-\d{2}-\d{2}' : '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}';
-    $date_object = null;
-
-    if(isset($queryParams)) {
-      if(!empty($queryParams[$fieldName])) {
-        $date_object = FrozenTime::parse($queryParams[$fieldName]);
-      }
-    } else {
-      // This is an entity view. We are getting the data from the object
-      $entity = $this->getView()->get('vv_obj');
-      $date_object = $entity->$fieldName;
-    }
-
-    // Create the options array for the (text input) form control
-    $coptions = [];
-
-    // A datetime field will be rendered as a plain text input with adjacent date and time pickers
-    // that will interact with the field value. Allowing direct access to the input field is for
-    // accessibility purposes.
-
-    // ACTION VIEW
-    if($this->action == 'view') {
-      // return the date as plaintext
-      $element = $this->getView()->element('form/notSetDiv');
-      if ($date_object !== null) {
-        // Adjust the time back to the user's timezone
-        $element = '<time>' . $date_object->i18nFormat($dateFormat) . '</time>';
-      }
-
-      // Return this to the generic control() function
-      return $element;
-    }
-
-    // Special-case the very common "valid_from" and "valid_through" fields, so we won't need
-    // to specify their types in fields.inc.
-    $pickerType = match ($fieldName) {
-      'valid_from' => DateTypeEnum::FromTime,
-      'valid_through' => DateTypeEnum::ThroughTime,
-      default => $dateType
-    };
-
-    // Append the timezone to the label
-    $coptions['class'] = 'form-control datepicker';
-    $coptions['placeholder'] = $dateFormat;
-    if(!empty($label)) {
-      $coptions['label'] = $label;
-    }
-    $coptions['pattern'] = $datePattern;
-    $coptions['title'] = __d('field', $dateTitle);
-
-    $coptions['id'] = str_replace('_', '-', $fieldName);
-
-
-    // Default the picker date to today
-    $now = FrozenTime::now();
-    $pickerDate = $now->i18nFormat($dateFormat);
-
-    // Get the existing values, if present
-    if($date_object !== null) {
-      // Adjust the time back to the user's timezone
-      $coptions['value'] = $date_object->i18nFormat($dateFormat);
-      $pickerDate = $date_object->i18nFormat($dateFormat);
-    }
-
-    // Set the date picker floor year value (-100 years)()
-    $pickerDateFT = new FrozenTime($pickerDate);
-    $pickerDateFT = $pickerDateFT->subYears(100);
-    $pickerFloor = $pickerDateFT->i18nFormat($dateFormat);
-
-    $date_picker_args = [
-      'fieldName' => $fieldName,
-      'pickerDate' => $pickerDate,
-      'pickerType' => $pickerType,
-      'pickerFloor' => $pickerFloor,
-    ];
-
-    // Create a text field to hold our value and call the datePicker
-    return $this->Form->text($fieldName, $coptions) . $this->getView()->element('datePicker', $date_picker_args);
-  }
-
-  /**
-   * Create the actual Form element
-   *
-   * @param   string       $fieldName     Form field
-   * @param   array|null   $fieldOptions  The second parameter of the Form->control helper. List of element options
-   * @param   string|null  $fieldLabel    Custom label thext
-   * @param   string       $fieldPrefix   If the field has a specil prefix provide the value
-   * @param   string|null  $fieldType     Field type to override the one calculated from the schema
-   *
-   * @return string  HTML element
-   * @since  COmanage Registry v5.0.0
-   */
-  public function formField(string $fieldName,
-                            array  $fieldOptions = null,
-                            string $fieldLabel = null,
-                            string $fieldPrefix = '',
-                            string $fieldType = null): string
-  {
-    $fieldArgs = $fieldOptions ?? [];
-    $fieldArgs['label'] = $fieldOptions['label'] ?? false;
-    $fieldArgs['readonly'] = !$this->editable
-                             || (isset($fieldOptions['readonly']) && $fieldOptions['readonly'])
-                             || ($fieldName == 'plugin' && $this->action == 'edit');
-
-    // Selects, Checkboxes, and Radio Buttons use "disabled"
-    $fieldArgs['disabled'] = $fieldArgs['readonly'];
-    $fieldArgs['required'] = $this->isReqField($fieldName)
-                             || (isset($fieldOptions['required']) && $fieldOptions['required']);
-
-    // Cause any select (except status) to render with a blank option, even
-    // if the field is required. This makes it clear when a value needs to be set.
-    // Note this will be ignored for non-select controls.
-    $fieldArgs['empty'] = !\in_array($fieldName, ['status', 'sync_status_on_delete'], true)
-                          || (isset($fieldOptions['empty']) && $fieldOptions['empty']);
-
-    // Remove prefix from field value
-    if(!empty($fieldPrefix) && !empty($this->getEntity()->$fieldName)) {
-      $vv_obj = $this->getView()->get('vv_obj');
-      $fieldValue = $vv_obj->$fieldName;
-      $fieldValueTemp = str_replace($fieldPrefix, '', $fieldValue);
-      $vv_obj->$fieldName = $fieldValueTemp;
-      $this->getView()->set('vv_obj', $vv_obj);
-    }
-
-    // Get the field type from the map of fields (e.g. 'boolean', 'string', 'timestamp')
-    $fieldType = $fieldType ?? $this->getFieldType($fieldName);
-    // Generate the form control or pass along the markup generated in a wrapper function
-    return match($fieldType) {
-      // A boolean field is a checkbox. Set the label and class to improve rendering
-      // and accessibility.
-      'boolean'   => $this->Form->control($fieldName, [
-                                            // First import and then overwrite
-                                            ...$fieldArgs,
-                                            'label' => $fieldLabel,
-                                            'class' => 'form-check-input',
-                                          ]),
-      'date'      => $this->dateField($fieldName, DateTypeEnum::DateOnly),
-      'datetime',
-      'timestamp' => $this->dateField($fieldName),
-      default     => $this->Form->control($fieldName, $fieldArgs)
-    };
-  }
-
-  /**
-   * Emit a source control for an MVEA that has a source_foo_id field pointing
-   * to an External Identity attribute.
-   *
-   * @param   Entity  $entity  Entity to emit control for
-   *
-   * @return string             Source Link
-   * @since  COmanage Registry v5.0.0
-   */
-  public function sourceLink($entity): string
-  {
-    // eg: Identifiers
-    // eg: source_identifier_id, or source_external_identity_role_id
-    $sourceFK = $this->getView()->get('vv_source_fk');
-    // e.g.: source_identifier - we need to construct this from the $sourceFK
-    $sourceEntityName = substr($sourceFK, 0, strlen($sourceFK) - 3);
-    // In most cases, $sourceModelName = $modelName, but not for PersonRoles
-    $sourceModelName = substr(StringUtilities::foreignKeyToClassName($sourceFK), 6);
-
-    $link = '';
-    if (!empty($entity->$sourceFK)) {
-      $link .= $this->Html->Link(
-        title: __d('controller', $sourceModelName, [1]),
-        url:   [
-                 'controller' => $sourceModelName,
-                 'action'     => 'view',
-                 $entity->$sourceFK
-               ]
-      );
-    }
-
-    if (!empty($entity->$sourceEntityName)) {
-      $link .= ', ' . $this->Html->Link(
-          title: __d('controller', 'ExternalIdentities', [1]),
-          url:   [
-                   'controller' => 'external_identities',
-                   'action'     => 'view',
-                   $entity->$sourceEntityName->external_identity_id
-                 ]
-        );
-    }
-    return $link;
-  }
-
-  /**
-   * @return bool
-   */
-  public function isEditable(): bool
-  {
-    return $this->editable;
-  }
-
-  /**
-   * @return string|null
-   */
-  public function getPluginName(): ?string
-  {
-    return $this->pluginName;
-  }
-
-  /**
-   * @return string|null
-   */
-  public function getModelName(): ?string
-  {
-    return $this->modelName;
-  }
-
-  /**
-   * @return object|null
-   */
-  public function getEntity(): ?object
-  {
-    return $this->entity;
-  }
-
-  /**
-   * @return array
-   */
-  public function getReqFields(): array
-  {
-    return $this->reqFields;
-  }
-
-  /**
-   * @param   string  $field
-   *
-   * @return bool
-   */
-  public function isReqField(string $field): bool
-  {
-    return \in_array($field, $this->reqFields, true);
-  }
-
-
-  /**
-   * @return array
-   */
-  public function getFieldTypes(): array
-  {
-    return $this->fieldTypes;
-  }
-
-  /**
-   * @param   string  $field
-   *
-   * @return string|null
-   */
-  public function getFieldType(string $field): ?string
-  {
-    return $this->fieldTypes[$field] ?? null;
-  }
-
-
-}
\ No newline at end of file
diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
index 1b26ac583..d74b45af1 100644
--- a/app/src/View/Helper/FieldHelper.php
+++ b/app/src/View/Helper/FieldHelper.php
@@ -38,172 +38,154 @@
 
 class FieldHelper extends Helper {
   public $helpers = ['Form', 'Html', 'Url', 'Alert'];
-  
+
   // Is this read-only or read-write?
-  protected $editable = true;
+  protected bool $editable = true;
   
   // Our current model name
-  protected $modelName = null;
+  protected ?string $modelName = null;
   
   // The plugin we are rendering within, if set
-  protected $pluginName = null;
-  
+  protected ?string $pluginName = null;
+
   // The list of required fields
-  protected $reqFields = [];
-  
+  protected array $reqFields = [];
+
+  // The field types
+  protected array $fieldTypes = [];
+
   // The current entity, if edit or view
-  protected $entity = null;
+  protected ?object $entity = null;
 
   // The current action
-  protected $action = null;
+  protected ?string $action = null;
+
 
   /**
-   * Emit an informational banner.
+   * Constructor hook method.
    *
-   * @since  COmanage Registry v6.0.0
-   * @param  string $info Information string
-   * @return string       HTML for banner
+   * @param   array  $config The configuration settings provided to this helper.
+   *
+   * @return void
    */
-  
-  public function banner(string $info): string {
-    return '<li class="alert-banner">' .
-      $this->Alert->alert($info, 'warning')
-    . '</li>';
+  public function initialize(array $config): void
+  {
+    parent::initialize($config);
+
+    $this->reqFields = $this->getView()->get('vv_required_fields');
+    $this->modelName = $this->getView()->getName();
+    $this->action = $this->getView()->get('vv_action');
+    $this->editable = \in_array($this->action, ['add', 'edit']);
+    $this->pluginName = $this->getView()->getPlugin();
+    $this->entity = $this->getView()->get('vv_obj');
+    $this->fieldTypes = $this->getView()->get('vv_field_types');
   }
 
   /**
-   * Emit a form control.
+   * We autogenerate field labels and descriptions from the field name.
    *
-   * @param   string       $fieldName        Form field
-   * @param   array        $options          FormHelper control options
-   * @param   string|null  $labelText        Label text (fieldName language key used by default)
-   * @param   string|null  $ctrlCode         Control code passed in from wrapper functions
-   * @param   string       $cssClass         Start li css class passed in from wrapper functions
-   * @param   string       $beforeField      Markup to be placed before/above the field
-   * @param   string       $afterField       Markup to be placed after/below the field
-   * @param   string       $prefix           Field prefix - used for API Usernames
-   * @param   bool         $labelIsTextOnly  For fields that should not include <label> markup
-   * @param   string|null  $controlType
+   * @param   string  $fieldName
    *
-   * @return string  HTML for control
-   * @since  COmanage Registry v5.0.0
+   * @return array
    */
-  
-  public function control(string $fieldName,
-                          array  $options = [],
-                          string $labelText = null,
-                          string $ctrlCode = null,
-                          string $cssClass = '',
-                          string $beforeField = '',
-                          string $afterField = '',
-                          string $prefix = '',
-                          bool   $labelIsTextOnly = false,
-                          string $controlType = null): string {
-    // Specify a class on the <li> form control wrapper
-    $liClass = $cssClass;
-    // Get the field type from the map of fields (e.g. 'boolean', 'string', 'timestamp')
-    $fieldMap = $this->getView()->get('vv_field_types');
-    $fieldType = $controlType ?: $fieldMap[$fieldName];
+  public function calculateLabelAndDescription(string $fieldName): array
+  {
+    $desc = null;
+    $label = null;
 
-    // Generate the form control or pass along the markup generated in a wrapper function
-    $controlCode = $this->formControl($fieldName,
-                                      $options,
-                                      $labelText ,
-                                      $ctrlCode,
-                                      $prefix,
-                                      $controlType);
-    
-    $vv_obj = $this->getView()->get('vv_obj');
-
-    if($fieldName == 'plugin' && $this->action == 'edit') {
-      return $this->statusControl($fieldName, 
-                                  $vv_obj->$fieldName, 
-                                  [
-                                    'label' => __d('operation', 'configure.plugin'),
-                                    'url' => [
-                                      'plugin'      => null,
-                                      'controller'  => StringUtilities::entityToClassname($vv_obj),
-                                      'action'      => 'configure',
-                                      $vv_obj->id
-                                    ]
-                                  ], 
-                                  $labelText);
-    }
-    
-    // If an attribute is frozen, inject a special link to unfreeze it, since
-    // the attribute is read only and the admin can't simply uncheck the setting
-    if($fieldName == 'frozen' && $vv_obj->frozen) {
-      return $this->statusControl($fieldName, 
-                                  __d('field', 'frozen'), 
-                                  [
-                                    'label' => __d('operation', 'unfreeze'),
-                                    'url' => [
-                                      'plugin'      => null,
-                                      'controller'  => StringUtilities::entityToClassname($vv_obj),
-                                      'action'      => 'unfreeze',
-                                      $vv_obj->id
-                                    ]
-                                  ], 
-                                  $labelText);
-    }
+    // First, try to autogenerate the field label (if we weren't given one).
+    $pluginDomain = (!empty($this->getPluginName())
+      ? Inflector::underscore($this->getPluginName())
+      : null);
+
+    $modelName = $this->getModelName();
+    // We try to automagically determine if a description for the field exists by
+    // looking for the corresponding .desc language translation.
+    // We autogenerate field labels and descriptions from the field name.
+
+    // We loop over the field generation logic twice, first for a plugin
+    // context (if set) and then generally (if no plugin localization was found).
+
+    // We use $core as the variable for this loop, so the rest of the code
+    // is easier to read (!$core = plugin)
+    for($core = 0;$core < 2;$core++) {
+      if(!$core && empty($this->pluginName)) {
+        // No plugin set, go to the core field checks
+        continue;
+      }
+
+      // Is there a model specific key? For plugins, this will be in field.Model.Field
 
-    // Required fields are usually determined by the model validator, but for
-    // related models the view (currently) has to pass the field as required in
-    // $options. For fields of the form model.0.field, if $options['required']
-    // is true we'll update the set of required fields so the * renders correctly.
-    
-    if(isset($options['required'])
-       && $options['required']
-       && preg_match('/(\w+).(\d+).(\w+)/', $fieldName, $matches)) {
-      if(!in_array($matches[3], $this->reqFields)) {
-        $this->reqFields[] = $matches[3];
+      $key = (!$core ? 'field.' : '') . "$modelName.$fieldName";
+      $label = __d(($core ? 'field' : $pluginDomain), $key);
+
+      if($label === $key) {
+        // Model-specific label isn't found, try again for a general label
+
+        $f = null;
+
+        if(preg_match('/^(.*?)_id$/', $fieldName, $f)) {
+          // Map foreign keys (foo_id) to the controller label
+          $key = (!$core ? 'controller.' : '') . Inflector::camelize(Inflector::pluralize($f[1]));
+          $label = __d(($core ? 'controller' : $pluginDomain), $key, [1]);
+
+          if($key !== $label) {
+            break;
+          }
+        }
+
+        // Look up the key
+        $key = (!$core ? 'field.' : '') . $fieldName;
+        $label = __d(($core ? 'field' : $pluginDomain), $key);
+
+        if($key !== $label) {
+          break;
+        }
+      } else {
+        // If we found a key, break the loop
+        break;
       }
     }
-    
-    return $this->startLine($liClass)
-           . $this->formNameDiv($fieldName, $labelText, $fieldType, $labelIsTextOnly)
-           . ( !empty($prefix) ?
-                 $this->formInfoWithPrefixDiv($controlCode, $prefix, $beforeField, $afterField) :
-                 $this->formInfoDiv($controlCode, $beforeField, $afterField) )
-           . $this->endLine();
-  }
+    // We try to automagically determine if a description for the field exists by
+    // looking for the corresponding .desc language translation.
 
-  /**
-   * Emit a date/time form control.
-   * This is a wrapper function for $this->control()
-   *
-   * @param   string      $fieldName    Form field
-   * @param   string      $dateType     Standard, DateOnly, FromTime, ThroughTime
-   * @param   array|null  $queryParams  Request Query parameters used by the filtering Blocks to get the date values
-   *
-   * @return string  HTML for control
-   * @since  COmanage Registry v5.0.0
-   */
-  
-  public function dateControl(string $fieldName, string $dateType=DateTypeEnum::Standard, array $queryParams = null): string
-  {
-    $dateFieldConfig = $this->dateField($fieldName, $dateType, $queryParams);
-    return $this->control(fieldName:       $fieldName,
-                          options:         $dateFieldConfig['coptions'],
-                          ctrlCode:        $dateFieldConfig['controlCode'],
-                          cssClass:        $dateFieldConfig['cssClass'],
-                          labelIsTextOnly: $dateFieldConfig['labelIsTextOnly']);
+    for($core = 0;$core < 2;$core++) {
+      if(!$core && empty($this->pluginName)) {
+        // No plugin set, just go to the core field checks
+        continue;
+      }
+
+      $key = (!$core ? 'field.' : '') . "$modelName.$fieldName.desc";
+      $desc = __d(($core ? 'field' : $pluginDomain), $key);
 
+      // If the description is the literal key we just generated, there is no description
+      if($desc === $key) {
+        $desc = null;
+      } else {
+        break;
+      }
+    }
+
+    return [$label, $desc];
   }
 
   /**
    * Emit a date/time form control.
    * This is a wrapper function for $this->control()
    *
-   * @param   string      $fieldName    Form field
-   * @param   string      $dateType     Standard, DateOnly, FromTime, ThroughTime
-   * @param   array|null  $queryParams  Request Query parameters used by the filtering Blocks to get the date values
+   * @param   string       $fieldName    Form field
+   * @param   string       $dateType     Standard, DateOnly, FromTime, ThroughTime
+   * @param   array|null   $queryParams  Request Query parameters used by the filtering Blocks to get the date values
+   * @param   string|null  $label
    *
-   * @return array HTML for control
+   * @return string HTML element
    * @since  COmanage Registry v5.0.0
    */
 
-  public function dateField(string $fieldName, string $dateType=DateTypeEnum::Standard, array $queryParams = null): array
+  public function dateField(string $fieldName,
+                            string $dateType=DateTypeEnum::Standard,
+                            array $queryParams=null,
+                            string $label=null): string
   {
     // Initialize
     $dateFormat = $dateType === DateTypeEnum::DateOnly ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss';
@@ -231,18 +213,14 @@ public function dateField(string $fieldName, string $dateType=DateTypeEnum::Stan
     // ACTION VIEW
     if($this->action == 'view') {
       // return the date as plaintext
-      $controlCode = $this->notSetElement();
+      $element = $this->getView()->element('form/notSetDiv');
       if ($date_object !== null) {
         // Adjust the time back to the user's timezone
-        $controlCode = '<time>' . $date_object->i18nFormat($dateFormat) . '</time>';
+        $element = '<time>' . $date_object->i18nFormat($dateFormat) . '</time>';
       }
 
       // Return this to the generic control() function
-      return ['controlCode' => $controlCode,
-              'coptions' => [],
-              'cssClass' => '',
-              'labelIsTextOnly' => true];
-      return $this->control($fieldName, $coptions, ctrlCode: $controlCode, labelIsTextOnly: true);
+      return $element;
     }
 
     // Special-case the very common "valid_from" and "valid_through" fields, so we won't need
@@ -289,604 +267,184 @@ public function dateField(string $fieldName, string $dateType=DateTypeEnum::Stan
     ];
 
     // Create a text field to hold our value and call the datePicker
-    $controlCode = $this->Form->text($fieldName, $coptions) . $this->getView()->element('datePicker', $date_picker_args);
-
-    // Specify a class on the <li> form control wrapper
-    $liClass = 'fields-datepicker';
-    // Pass everything to the generic control() function
-    return ['controlCode' => $controlCode,
-            'coptions' => $coptions,
-            'labelIsTextOnly' => false,
-            'cssClass' => $liClass];
-  }
-  
-  /**
-   * End a set of form controls.
-   *
-   * @since  COmanage Registry v5.0.0
-   * @return string Control Set end HTML
-   */
-  
-  public function endControlSet(): string {
-    $this->modelName = null;
-    
-    return "</ul>\n";
-  }
-  
-  /**
-   * End a form line.
-   *
-   * @since  COmanage Registry v5.0.0
-   * @return string Line end HTML
-   */
-  
-  protected function endLine(): string {
-    return "</div></li>\n";
+    return $this->Form->text($fieldName, $coptions) . $this->getView()->element('datePicker', $date_picker_args);
   }
 
   /**
    * Create the actual Form element
    *
-   * @param   string       $fieldName  Form field
-   * @param   array        $options    FormHelper control options
-   *                                   By setting the options you are requesting a select field
-   * @param   string|null  $labelText  Label text (fieldName language key used by default)
-   * @param   string|null  $ctrlCode   Control code passed in from wrapper functions
-   * @param   string       $prefix     Field prefix - used for API Usernames
-   * @param   string|null  $controlType
+   * @param   string       $fieldName     Form field
+   * @param   array|null   $fieldOptions  The second parameter of the Form->control helper. List of element options
+   * @param   string|null  $fieldLabel    Custom label thext
+   * @param   string       $fieldPrefix   If the field has a specil prefix provide the value
+   * @param   string|null  $fieldType     Field type to override the one calculated from the schema
    *
-   * @return string  HTML for control
+   * @return string  HTML element
    * @since  COmanage Registry v5.0.0
    */
-  protected function formControl(string $fieldName,
-                                 array  $options = [],
-                                 string $labelText = null,
-                                 string $ctrlCode = null,
-                                 string $prefix = '',
-                                 string $controlType = null): string {
-    $coptions = $options;
-    $coptions['label'] = $options['label'] ?? false;
-    $coptions['readonly'] =
-      !$this->editable
-      || (isset($options['readonly']) && $options['readonly'])
-      // Plugins can't be changed after the parent object is instantiated
-      || ($fieldName == 'plugin' && $this->action == 'edit');
+  public function formField(string $fieldName,
+                            array  $fieldOptions = null,
+                            string $fieldLabel = null,
+                            string $fieldPrefix = '',
+                            string $fieldType = null): string
+  {
+    $fieldArgs = $fieldOptions ?? [];
+    $fieldArgs['label'] = $fieldOptions['label'] ?? false;
+    $fieldArgs['readonly'] = !$this->editable
+                             || (isset($fieldOptions['readonly']) && $fieldOptions['readonly'])
+                             || ($fieldName == 'plugin' && $this->action == 'edit');
+
     // Selects, Checkboxes, and Radio Buttons use "disabled"
-    $coptions['disabled'] = $coptions['readonly'];
+    $fieldArgs['disabled'] = $fieldArgs['readonly'];
+    $fieldArgs['required'] = $this->isReqField($fieldName)
+                             || (isset($fieldOptions['required']) && $fieldOptions['required']);
 
-    // Get the field type from the map of fields (e.g. 'boolean', 'string', 'timestamp')
-    $fieldMap = $this->getView()->get('vv_field_types');
-    $fieldType = $controlType ?: $fieldMap[$fieldName];
+    // Cause any select (except status) to render with a blank option, even
+    // if the field is required. This makes it clear when a value needs to be set.
+    // Note this will be ignored for non-select controls.
+    $fieldArgs['empty'] = !\in_array($fieldName, ['status', 'sync_status_on_delete'], true)
+                          || (isset($fieldOptions['empty']) && $fieldOptions['empty']);
 
     // Remove prefix from field value
-    if(!empty($prefix) && !empty($this->getView()->get('vv_obj')->$fieldName)) {
+    if(!empty($fieldPrefix) && !empty($this->getEntity()->$fieldName)) {
       $vv_obj = $this->getView()->get('vv_obj');
       $fieldValue = $vv_obj->$fieldName;
-      $fieldValueTemp = str_replace($prefix, '', $fieldValue);
+      $fieldValueTemp = str_replace($fieldPrefix, '', $fieldValue);
       $vv_obj->$fieldName = $fieldValueTemp;
       $this->getView()->set('vv_obj', $vv_obj);
     }
 
-    if($fieldName != 'status'
-      && !isset($options['empty'])
-      && (!isset($options['suppressBlank']) || !$options['suppressBlank'])) {
-      // Cause any select (except status) to render with a blank option, even
-      // if the field is required. This makes it clear when a value need to be set.
-      // Note this will be ignored for non-select controls.
-      $coptions['empty'] = true;
-    }
-
-    // A boolean field is a checkbox. Set the label and class to improve rendering
-    // and accessibility.
-    if($fieldType == 'boolean') {
-      $coptions['label'] = $labelText;
-      $coptions['class'] = 'form-check-input';
-    }
-
+    // Get the field type from the map of fields (e.g. 'boolean', 'string', 'timestamp')
+    $fieldType = $fieldType ?? $this->getFieldType($fieldName);
     // Generate the form control or pass along the markup generated in a wrapper function
-    return empty($ctrlCode) ? $this->Form->control($fieldName, $coptions) : $ctrlCode;
-
-  }
-
-  /**
-   * Generate a form info (control, value) box.
-   *
-   * @since  COmanage Registry v5.0.0
-   * @param  string  $content    Content HTML
-   * @param  string  $beforeField Markup to be placed before/above the field
-   * @param  string  $afterField  Markup to be placed after/below the field
-   * @return string              Form Info HTML
-   */
-  
-  protected function formInfoDiv(string $content, 
-                                 string $beforeField = '', 
-                                 string $afterField = ''): string {
-    $div  = '<div class="field-info">' . PHP_EOL;
-    if(!empty($beforeField)) {
-      $div .= $beforeField . PHP_EOL;
-    }
-    $div .= $content . PHP_EOL;
-    if(!empty($afterField)) {
-      $div .= $afterField . PHP_EOL;  
-    }
-    $div .= '</div>' . PHP_EOL;
-    
-    return $div;
+    return match($fieldType) {
+      // A boolean field is a checkbox. Set the label and class to improve rendering
+      // and accessibility.
+      'boolean'   => $this->Form->control($fieldName, [
+                                            // First import and then overwrite
+                                            ...$fieldArgs,
+                                            'label' => $fieldLabel,
+                                            'class' => 'form-check-input',
+                                          ]),
+      'date'      => $this->dateField($fieldName, DateTypeEnum::DateOnly),
+      'datetime',
+      'timestamp' => $this->dateField($fieldName),
+      default     => $this->Form->control($fieldName, $fieldArgs)
+    };
   }
 
   /**
-   * Create grouped control elements. By default, the elements will be placed one after the other, inline,
-   * with a direction left to right. For that need to occupy the whole row we defined the 'singleRowItem'
-   * configuration property that will add an inline Bootstrap css rule. The rule will override the default
-   * behavior
+   * Emit a source control for an MVEA that has a source_foo_id field pointing
+   * to an External Identity attribute.
    *
-   * @param   array   $fields
-   * @param   string  $pseudoFieldName
-   * @param   string  $beforeField  Markup to be placed before/above the field
-   * @param   string  $afterField   Markup to be placed after/below the field
+   * @param   Entity  $entity  Entity to emit control for
    *
-   * @return string              Form Info HTML
+   * @return string             Source Link
    * @since  COmanage Registry v5.0.0
    */
+  public function sourceLink($entity): string
+  {
+    // eg: Identifiers
+    // eg: source_identifier_id, or source_external_identity_role_id
+    $sourceFK = $this->getView()->get('vv_source_fk');
+    // e.g.: source_identifier - we need to construct this from the $sourceFK
+    $sourceEntityName = substr($sourceFK, 0, strlen($sourceFK) - 3);
+    // In most cases, $sourceModelName = $modelName, but not for PersonRoles
+    $sourceModelName = substr(StringUtilities::foreignKeyToClassName($sourceFK), 6);
 
-  public function groupedControls(array $fields,
-                                  string $pseudoFieldName,
-                                  string $beforeField = '',
-                                  string $afterField = ''): string {
-    $content = '';
-    foreach ($fields as $fieldName => $fieldOptions) {
-      $dblock = isset($fieldOptions['singleRowItem']) && $fieldOptions['singleRowItem'] ? 'd-block' : '';
-      $content .= "<div class='subfield subfield-cols {$dblock}'>" . PHP_EOL;
-      $content .= '<div class="field-col">' . PHP_EOL;
-      $content .= $this->formControl($fieldName, $fieldOptions['options'] ?? []) . PHP_EOL;
-      $content .= '</div>' . PHP_EOL;
-      $content .= '</div>' . PHP_EOL;
+    $link = '';
+    if (!empty($entity->$sourceFK)) {
+      $link .= $this->Html->Link(
+        title: __d('controller', $sourceModelName, [1]),
+        url:   [
+                 'controller' => $sourceModelName,
+                 'action'     => 'view',
+                 $entity->$sourceFK
+               ]
+      );
     }
-    $mn = $this->modelName;
-
-    return $this->startLine()
-      . $this->formNameDiv(
-        fieldName: $pseudoFieldName,
-        labelText: __d('field', $mn . '.' . $pseudoFieldName),
-        fieldType: 'string',
-        fieldNameClasses: 'field-name align-top'
-      )
-      . $this->formInfoDiv($content, $beforeField, $afterField)
-      . $this->endLine();
-  }
 
-  /**
-   * Generate a form info (control, value) box with a non editable prefix.
-   *
-   * @since  COmanage Registry v5.0.0
-   * @param  string  $content     Content HTML
-   * @param  string  $prefix      Prefix value
-   * @param  string  $beforeField Markup to be placed before/above the field
-   * @param  string  $afterField  Markup to be placed after/below the field
-   * @return string               Form Info HTML
-   */
-
-  protected function formInfoWithPrefixDiv(string $context, 
-                                           string $prefix, 
-                                           string $beforeField = '', 
-                                           string $afterField = ''): string {
-    $div  = '<div class="field-info">' . PHP_EOL;
-    if(!empty($beforeField)) {
-      $div .= $beforeField . PHP_EOL;
-    }
-    $div .= '<div class="input-group mb-3">' . PHP_EOL;
-    $div .= '<div class="input-group-prepend">' . PHP_EOL;
-    $div .= '<span class="input-group-text" id="basic-addon3">' . $prefix . '</span>';
-    $div .= '</div>' . PHP_EOL;
-    $div .= $context;
-    $div .= '</div>';
-    if(!empty($afterField)) {
-      $div .= $afterField . PHP_EOL;
+    if (!empty($entity->$sourceEntityName)) {
+      $link .= ', ' . $this->Html->Link(
+          title: __d('controller', 'ExternalIdentities', [1]),
+          url:   [
+                   'controller' => 'external_identities',
+                   'action'     => 'view',
+                   $entity->$sourceEntityName->external_identity_id
+                 ]
+        );
     }
-    $div .= '</div>';
-
-    return $div;
+    return $link;
   }
 
   /**
-   * Generate a form name (label, description) box.
-   *
-   * @param   string       $fieldName         Form field
-   * @param   string|null  $labelText         Label text (fieldName language key used by default)
-   * @param   string       $fieldType         Type of field (string, boolean, timestamp, etc.)
-   * @param   boolean      $labelIsTextOnly   True if label should be text only. Otherwise, false.
-   * @param   string|null  $fieldNameClasses  Override the field-name classes
-   * @param   string|null  $fieldTitleClasses Override the field-title classes
-   * @param   string|null  $fieldDescClasses  Override the field-description classes
-   *
-   * @return string             Form Name HTML
-   * @since  COmanage Registry v5.0.0
-   */
-  
-  protected function formNameDiv(string $fieldName,
-                                 ?string $labelText,
-                                 string $fieldType,
-                                 bool $labelIsTextOnly = false,
-                                 ?string $fieldNameClasses = null,
-                                 ?string $fieldTitleClasses = null,
-                                 ?string $fieldDescClasses = null
-  ): string {
-    $label = $labelText;
-    $desc = null;
-    
-    // We'll accept a fieldName of the form other_models.0.foo for forms that
-    // request associated data. Note, however, that model names for language
-    // keys are OtherModel, so we'll need to inflect. 
-    
-    $mn = $this->modelName;
-    $fn = $fieldName;
-    
-    if(str_contains($fieldName, '.')) {
-      // othermodels.0.field
-      
-      $bits = explode('.', $fieldName, 3);
-      $mn = Inflector::classify($bits[0]);
-      $fn = $bits[2];
-    }
-    
-    // First try to autogenerate the field label (if we weren't given one).
-    
-    $pluginDomain = (!empty($this->pluginName)
-                      ? Inflector::underscore($this->pluginName)
-                      : null);
-    
-    if(!$label) {
-      // We autogenerate field labels and descriptions from the field name.
-      
-      // We loop over the field generation logic twice, first for a plugin
-      // context (if set) and then generally (if no plugin localization was found).
-
-      // We use $core as the variable for this loop, so the rest of the code
-      // is easier to read (!$core = plugin)
-      for($core = 0;$core < 2;$core++) {
-        if(!$core && empty($this->pluginName)) {
-          // No plugin set, just go to the core field checks
-          continue;
-        }
-
-        // Is there a model specific key? For plugins, this will be in field.Model.Field
-
-        $key = (!$core ? 'field.' : '') . "$mn.$fn";
-        $label = __d(($core ? 'field' : $pluginDomain), $key);
-
-        if($label == $key) {
-          // Model specific label not found, try again for a general label
-
-          $f = null;
-
-          if(preg_match('/^(.*?)_id$/', $fn, $f)) {
-            // Map foreign keys (foo_id) to the controller label
-            $key = (!$core ? 'controller.' : '') . Inflector::camelize(Inflector::pluralize($f[1]));
-            $label = __d(($core ? 'controller' : $pluginDomain), $key, [1]);
-
-            if($key != $label) {
-              break;
-            }
-          }
-          
-          // Just look up the key
-          $key = (!$core ? 'field.' : '') . $fn;
-          $label = __d(($core ? 'field' : $pluginDomain), $key);
-
-          if($key != $label) {
-            break;
-          }
-        } else {
-          // If we found a key, break the loop
-          break;
-        }
-      }
-    }
-    
-    // We try to automagically determine if a description for the field exists by
-    // looking for the corresponding .desc language translation.
-    
-    for($core = 0;$core < 2;$core++) {
-      if(!$core && empty($this->pluginName)) {
-        // No plugin set, just go to the core field checks
-        continue;
-      }
-
-      $key = (!$core ? "field." : "") . "$mn.$fn.desc";
-      $desc = __d(($core ? 'field' : $pluginDomain), $key);
-
-      // If the description is the literal key we just generated, there is no description
-      if($desc == $key) {
-        $desc = null;
-      } else {
-        break;
-      }
-    }
-
-    return '<div class="'. ($fieldNameClasses  ?? 'field-name') . '">'
-             . '<div class="'. ($fieldTitleClasses  ?? 'field-title') . '">'
-             // Form Label
-             . (!($labelIsTextOnly) && ($fieldType != 'boolean') ? $this->Form->label($fn, $label) : $label)
-             . ($this->editable && in_array($fn, $this->reqFields) ? $this->requiredSpanElement() : '')
-             . '</div>' // field-title div
-             // Description element
-             . ($desc ? '<div class="'. ($fieldDescClasses  ?? 'field-desc') . '">' . $desc . '</div>' : '') .'
-           </div>';
-  }
-  
-  /**
-   * Emit a People Autocomplete (PrimeVue) control for selecting a person
-   *
-   * @param  string $fieldName            Field name of input field
-   * @param  array  $viewConfigParameters
-   * @param  string $personType           Type of person autocomplete to use (XXX should be an enum, and a default should be set)
-   *
-   * @return string            Source HTML
-   * @since  COmanage Registry v5.0.0
-   *
+   * @return bool
    */
-  
-  public function peopleAutocompleteControl(string $fieldName, array $viewConfigParameters = [], string $personType = 'coperson'): string {
-    if($this->action == 'view') {
-      // return the member name value as plaintext
-      $coptions = ['type' => 'text'];
-      $entity = $this->getView()->get('vv_obj');
-      $controlCode = $entity->$fieldName;
-      
-      // Return this to the generic control() function
-      return $this->control($fieldName, $coptions, ctrlCode: $controlCode, labelIsTextOnly: true);
-      
-    } else {
-      // Create the options array for the (text input) form control
-      $coptions = [];
-      $coptions['class'] = 'form-control people-autocomplete';
-      $coptions['placeholder'] = __d('operation','autocomplete.people.placeholder');
-      $coptions['id'] = $fieldName;
-      $coptions['value'] =  '';
-      
-      $entity = $this->getView()->get('vv_obj');
-      
-      // Get the existing values, if present
-      if(!empty($entity->$fieldName)) {
-        $coptions['value'] =  ''; // XXX put the ID here.
-      }
-            
-      // Create a field name for the autocomplete input
-      $autoCompleteFieldName = 'cm_autocomplete_' . $fieldName;
-      
-      // Because we use JavaScript to set the value of the hidden field,
-      // disable form-tamper checking for the autocomplete fields.
-      // XXX We ought not have to do this for the hidden field ($fieldName) at least
-      $this->Form->unlockField($fieldName);
-      $this->Form->unlockField($autoCompleteFieldName);
-      
-      $autocompleteArgs = [
-        'type' => 'field',
-        'fieldName' => $fieldName,
-        'personType' => $personType,
-        'htmlId' => $autoCompleteFieldName,
-        'viewConfigParameters' => $viewConfigParameters
-      ];
-      
-      // Create a hidden field to hold our value and emit the autocomplete widget
-      $controlCode = $this->Form->hidden($fieldName, $coptions)
-        . $this->getView()->element('peopleAutocomplete', $autocompleteArgs);
-      
-      // XXX the numeric value passed to 'autocomplete.people.desc' should be derived from config; it is the minLength value for starting autocomplete.
-      $autoCompleteDesc = '<div class="field-desc"><span class="material-icons">info</span> ' . __d('operation','autocomplete.people.desc',['2']) . '</div>';
-      
-      // Specify a class on the <li> form control wrapper
-      $liClass = 'fields-people-autocomplete';
-      
-      // Pass everything to the generic control() function
-      return $this->control(
-                         $fieldName,
-                         $coptions,
-        ctrlCode:        $controlCode,
-        cssClass:        $liClass,
-        afterField:      $autoCompleteDesc,
-        labelIsTextOnly: true
-      );
-    }
+  public function isEditable(): bool
+  {
+    return $this->editable;
   }
 
   /**
-   * Static required Span Element
-   *
-   * @return string
-   * @since  COmanage Registry v5.0.0
+   * @return string|null
    */
-  protected function requiredSpanElement(): string
+  public function getPluginName(): ?string
   {
-    return "<span class='required' aria-hidden='true'>*</span>"
-           . "<span class='visually-hidden'>{__d('field', 'required')}</span>";
+    return $this->pluginName;
   }
 
   /**
-   * Static Not Set Div Element
-   *
-   * @return string
-   * @since  COmanage Registry v5.0.0
+   * @return string|null
    */
-
-  protected function notSetElement(): string
+  public function getModelName(): ?string
   {
-    return '<div class="not-set">' . __d('information', 'notset') . '</div>';
+    return $this->modelName;
   }
 
   /**
-   * Emit a source control for an MVEA that has a source_foo_id field pointing
-   * to an External Identity attribute.
-   * 
-   * @since  COmanage Registry v5.0.0
-   * @param  Entity   $entity   Entity to emit control for
-   * @return string             Source HTML
+   * @return object|null
    */
-  
-  public function sourceControl($entity): string {
-    // eg: Identifiers
-    $modelName = StringUtilities::entityToClassName($entity);
-    // eg: source_identifier_id, or source_external_identity_role_id
-    $sourceFK = $this->getView()->get('vv_source_fk');
-    // eg: source_identifier - we need to construct this from the $sourceFK
-    $sourceEntityName = substr($sourceFK, 0, strlen($sourceFK)-3);
-    // In most cases $sourceModelName = $modelName, but not for PersonRoles
-    $sourceModelName = substr(StringUtilities::foreignKeyToClassName($sourceFK), 6);
-
-    $linkHtml = '<div>';
-
-    if(!empty($entity->$sourceFK)) {
-      $linkHtml .= $this->Html->Link(
-        title: __d('controller', $sourceModelName, [1]),
-        url: [
-          'controller'  => $sourceModelName,
-          'action'      => 'view',
-          $entity->$sourceFK
-        ]
-      );
-    }
-
-    if(!empty($entity->$sourceEntityName)) {
-      $linkHtml .= ', ' . $this->Html->Link(
-        title: __d('controller', 'ExternalIdentities', [1]),
-        url: [
-                 'controller'  => 'external_identities',
-                 'action'      => 'view',
-                 $entity->$sourceEntityName->external_identity_id
-               ]
-      );
-    }
-
-    $linkHtml .= '</div>';
-
-    return $this->startLine()
-           . $this->formNameDiv(
-                fieldName: $sourceFK,
-                labelText: __d('field', 'source'),
-                fieldType: 'string'
-             )
-           . $linkHtml
-           . $this->endLine();
+  public function getEntity(): ?object
+  {
+    return $this->entity;
   }
 
   /**
-   * Generate a status control (a read only status with an optional link button).
-   *
-   * @param   string       $fieldName        Form field
-   * @param   string       $status           Status text
-   * @param   array        $link             Link information, including 'url', 'label', 'class', 'confirm'
-   * @param   string|null  $labelText        Label text (fieldName language key used by default)
-   * @param   boolean      $labelIsTextOnly  true if <label> wrapper should not be included in the markup
-   *
-   * @return string
-   * @since  COmanage Registry v5.0.0
+   * @return array
    */
-  
-  public function statusControl(string $fieldName, 
-                                string $status, 
-                                array  $link=[], 
-                                string $labelText = null,
-                                bool   $labelIsTextOnly = false): string {
-    $linkHtml = $status;
-    
-    if($link) {
-      // Construct HTML for the requested link
-      
-      if(!empty($link['label'])) {
-        // Create a separate link after $status
-        
-        $linkHtml .= ' ' . $this->Html->link(
-          $link['label'],
-          $link['url'],
-          $link
-        );
-      } else {
-        // Make $status the link
-        
-        $linkHtml = $this->Html->link(
-          $status,
-          $link['url'],
-          // Just pass whatever other args are specified
-          $link
-        );
-      }
-    }
-     
-    return $this->startLine()
-           . $this->formNameDiv($fieldName, $labelText, 'string', $labelIsTextOnly)
-           . $this->formInfoDiv($linkHtml)
-           . $this->endLine();
+  public function getReqFields(): array
+  {
+    return $this->reqFields;
   }
 
   /**
-   * Start a set of form controls.
-   *
-   * @param   string       $modelName  Model name for form
-   * @param   string       $action     Current action
-   * @param   boolean      $editable   True if controls are read/write, false for read only
-   * @param   array        $reqFields  Array of required fields
-   * @param   null         $entity     Entity object (if set, null on add)
-   * @param   string|null  $pluginName
+   * @param   string  $field
    *
-   * @return string
-   * @since  COmanage Registry v5.0.0
+   * @return bool
    */
-  
-  public function startControlSet(string $modelName, 
-                                  string $action, 
-                                  bool $editable, 
-                                  array $reqFields,
-                                  $entity=null,
-                                  ?string $pluginName=null): string {
-    $this->editable = $editable;
-    $this->modelName = $modelName;
-    $this->pluginName = $pluginName;
-    $this->reqFields = $reqFields;
-    $this->entity = $entity;
-    $this->action = $action;
-
-    return '<ul id="' . $action . '_' . $modelName . '" class="fields form-list">' . "\n";
+  public function isReqField(string $field): bool
+  {
+    return \in_array($field, $this->reqFields, true);
   }
 
+
   /**
-   * Start a form line.
-   *
-   * @param   string|null  $class  Optional class to apply to the line
-   *
-   * @return string
-   * @since  COmanage Registry v5.0.0
+   * @return array
    */
-  
-  protected function startLine(string $class=null): string {
-    $ret = '<li';
-    
-    if($class) {
-      $ret .= ' class="' . $class . '"';
-    }
-    
-    $ret .= '><div class="field">';
-    
-    return $ret;
+  public function getFieldTypes(): array
+  {
+    return $this->fieldTypes;
   }
-  
+
   /**
-   * Emit a submit control.
+   * @param   string  $field
    *
-   * @since  COmanage Registry v5.0.0
-   * @param  string  $label Text for submit button
-   * @return string
+   * @return string|null
    */
-  
-  public function submit(string $label): string {
-    return '<li class="fields-submit">
-      <div class="field">
-        <div class="field-name">
-          <span class="required">* ' . __d('field', 'required') . '</span>
-        </div>
-        <div class="field-info">
-          ' . $this->Form->submit($label) . '
-        </div>
-      </div>  
-    </li>';
+  public function getFieldType(string $field): ?string
+  {
+    return $this->fieldTypes[$field] ?? null;
   }
+
+
 }
\ No newline at end of file
diff --git a/app/templates/Standard/add-edit-view-new.php b/app/templates/Standard/add-edit-view-new.php
deleted file mode 100644
index b1e5fdb29..000000000
--- a/app/templates/Standard/add-edit-view-new.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * COmanage Registry Generic View Template For Add/Edit/View Actions
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-declare(strict_types = 1);
-
-//$action = $this->template;
-// $this->name = Models
-$modelsName = $this->name;
-// $tablename = models
-// XXX backport to match?
-$tableName = \Cake\Utility\Inflector::tableize(\Cake\Utility\Inflector::singularize($this->name));
-
-// $vv_template_path will be set for plugins
-$templatePath = $vv_template_path ?? ROOT . DS . "templates" . DS . $modelsName;
-
-// If you're looking to set a custom $vv_title, you might be able to use
-// generateDisplayField() on the Table instead
-
-// Include subnavigation structures on add/edit/view pages
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of fields-nav.inc into fields.inc
-// When subnav exists, include on all Edit/View views and on Add views for items with a parent.
-if($vv_action == 'edit' || $vv_action == 'view' || !empty($vv_bc_parent_obj) || !empty($vv_primary_link_id)) {
-  if(file_exists($templatePath . DS . "fields-nav.inc")) {
-    include($templatePath . DS . "fields-nav.inc");
-  }  
-}
-
-if(file_exists($templatePath . DS . "fields-links.inc")) {
-  include($templatePath . DS . "fields-links.inc");
-}
-
-// $linkFilter is used for models that belong to a specific parent model (eg: co_id)
-$linkFilter = [];
-
-if(!empty($vv_primary_link) && !empty($this->request->getQuery($vv_primary_link))) {
-  $linkFilter = [$vv_primary_link => $this->request->getQuery($vv_primary_link)];
-}
-
-// $flashArgs pass banner messages to the flash element container
-$flashArgs = [];
-if(!empty($banners)) {
-  // XXX this doesn't work yet because we don't include fields.inc until later
-  //     either create a second file to include earlier, or use a function to emit
-  //     the fields (which would be more consistent with how Views render...)
-  $flashArgs['vv_banners'] = $banners;
-}
-
-// If subnavigation is present a supertitle and the subnavigation will be placed above
-// the normal page title. The flash messages will be shown up there as well.
-if(!empty($subnav)) {
-  // Include the $flashArgs for the subnavigation element
-  $subnav['flashArgs'] = $flashArgs;
-  if(!empty($topLinks) && ($modelsName == 'People' &&  $vv_action == 'edit')) {
-    // We are in Person canvas mode: pass along the top links for building the Actions menu.
-    $subnav['topLinks'] = $topLinks;
-  }
-  // Generate the subnavigation title and tabs
-  print $this->element('subnavigation', $subnav);
-}
-?>
-
-<div class="page-title-container">
-  <div class="page-title">
-    <?php if(empty($subnav)): ?>
-      <h1><?= $vv_title; ?></h1>
-    <?php else: ?>
-      <h2><?= $vv_title; ?></h2>
-    <?php endif; ?>
-  </div>
-  <?php
-    // Action list for top menu dropdown / button listing
-    $action_args = array();
-    $action_args['vv_attr_id'] =  $vv_obj->id;
-    
-    foreach(($topLinks ?? []) as $t) {
-      $perm = false;
-
-      if(!empty($t['link']['controller'])) {
-        // We're linking into a related model, which may or may not be in a plugin
-
-        $linkModel = \Cake\Utility\Inflector::camelize($t['link']['controller']);
-
-        if(!empty($t['link']['plugin'])) {
-          $linkModel = \Cake\Utility\Inflector::camelize($t['link']['plugin'])
-                       . "." . $linkModel;
-        }
-        
-        if(isset($vv_permissions[$linkModel][ $t['link']['action'] ])) {
-          $perm = $vv_permissions[$linkModel][ $t['link']['action'] ];
-        }
-
-        // Inject a link to the current object ID
-        $t['link']['?'][\App\Lib\Util\StringUtilities::entityToForeignKey($vv_obj)] = $vv_obj->id;
-      } else {
-        $perm = $vv_permissions[ $t['link']['action'] ];
-
-        // We need to inject $linkFilter, but not overwrite any existing query params
-        if(!empty($t['link']['?'])) {
-          $t['link']['?'] = array_merge($t['link']['?'], $linkFilter);
-        } else {
-          $t['link']['?'] = $linkFilter;
-        }
-      }
-      
-      if($perm) {
-        $action_args['vv_actions'][] = [
-          'order' => $this->Menu->getMenuOrder($t['order']),
-          'icon' => $this->Menu->getMenuIcon($t['icon']),
-          'url' => $t['link'],
-          'label' => $t['label'],
-          'class' => !empty($t['class']) ? $t['class'] : '',
-          'confirm' => !empty($t['confirm']) ? $t['confirm'] : []
-        ];
-      }
-    }
-  
-    // Delete
-    if($vv_action != 'add' && !empty($vv_obj->id) && $vv_permissions['delete']) {
-      $action_args['vv_actions'][] = [
-        'order' => $this->Menu->getMenuOrder('Delete'),
-        'icon' =>  $this->Menu->getMenuIcon('Delete'),
-        'url' => ['action' => 'delete', $vv_obj->id],
-        'label' => __d('operation', 'delete'),
-        'class' => 'deletebutton',
-        'confirm' => [
-          'method' => 'post',
-          'dg_title' => __d('operation', 'remove'),
-          'dg_body_txt' => __d('operation', 'delete.confirm', [$vv_obj->id]),
-          'dg_confirm_btn' => __d('operation', 'remove')
-        ]
-      ];
-    }
-  
-    if(!empty($action_args['vv_actions'])) {
-      print '<div class="field-actions top-links">';
-      print $this->element('menuAction', $action_args);
-      print '</div>';
-    }
-  ?>
-</div>
-
-<?php if(empty($subnav)): ?>
-  <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
-  <?= $this->element('flash', $flashArgs); ?>
-<?php endif; ?>
-
-<?php
-$linkId = null;
-
-if(!empty($vv_primary_link)) {
-  if(!empty($this->request->getQuery($vv_primary_link))) {
-    $linkId = $this->request->getQuery($vv_primary_link);
-  } elseif(!empty($this->request->getData($vv_primary_link))) {
-    $linkId = $this->request->getData($vv_primary_link);
-  } elseif(!empty($vv_obj->$vv_primary_link)) {
-    $linkId = $vv_obj->$vv_primary_link;
-  }
-}
-
-/*
- * Views have a set() method that is analogous to the set() found in Controller objects.
- * Using set() from your view file will add the variables to the layout and elements
- * that will be rendered later.
- */
-
-// By default, the form will POST to the current controller
-// Note we need to open the form for view so Cake will autopopulate values
-print $this->Form->create($vv_obj);
-
-// List of records to collect
-// Form body
-print $this->element('form/unorderedList');
-
-if(!empty($linkId)
-   && ($vv_action == 'add' || $vv_action == 'edit')) {
-  // We don't want/need to output these for view actions
-  print $this->Form->hidden($vv_primary_link, ['value' => $linkId]);
-}
-
-// Close the Form
-print $this->Form->end();
-
-
-/** MVEA Canvas output **/
-if($vv_action != 'add' && !empty($mveas)) {
-  // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. 
-  print $this->element('mveaCanvas',
-    [
-      'vv_mveas' => $mveas,
-      'vv_add_menu_links' => !empty($addMenuLinks) ? $addMenuLinks : '',
-      'vv_entity_type' => $mveasEntityType
-    ]);
-}  
-
-// XXX insert changelog metadata (+nav? or maybe we should have a dedicate index view that shows all records in revision order?)
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 3dd612797..b1e5fdb29 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -169,10 +169,6 @@
 <?php endif; ?>
 
 <?php
-// By default, the form will POST to the current controller
-// Note we need to open the form for view so Cake will autopopulate values
-print $this->Form->create($vv_obj);
-
 $linkId = null;
 
 if(!empty($vv_primary_link)) {
@@ -185,52 +181,29 @@
   }
 }
 
-print $this->Field->startControlSet(
-  modelName: $this->name,
-  action: $vv_action,
-  // XXX We need a model specific mechanism to disable read-only
-  editable: ($vv_action == 'add' || $vv_action == 'edit'),
-  reqFields: $vv_required_fields,
-  pluginName: $this->getPlugin()
-);
-
-// We allow the fields.inc file to be specified for Controllers that have more
-// complicated/non-default actions.
-$fieldsFile = "fields.inc";
-
-if(!empty($vv_fields_inc)) {
-  $fieldsFile = $vv_fields_inc;
-}
-
-// The controller will calculate the template path for us, since it could be
-// in one of several paths if we are in a plugin context.
-include($vv_template_path . DS . $fieldsFile);
+/*
+ * Views have a set() method that is analogous to the set() found in Controller objects.
+ * Using set() from your view file will add the variables to the layout and elements
+ * that will be rendered later.
+ */
 
-if(!empty($hidden)) {
-  // Inject any hidden variables set by the include file
-  foreach($hidden as $attr => $v) {
-    print $this->Form->hidden($attr, ['value' => $v]);
-  }
-}
+// By default, the form will POST to the current controller
+// Note we need to open the form for view so Cake will autopopulate values
+print $this->Form->create($vv_obj);
 
-if($vv_action != 'add') {
-  print '<li id="cm-entity-id">' . __d('information', 'entity.id', $vv_obj->id) . '</li>';  
-}
+// List of records to collect
+// Form body
+print $this->element('form/unorderedList');
 
-if($vv_action == 'add' || $vv_action == 'edit') {
+if(!empty($linkId)
+   && ($vv_action == 'add' || $vv_action == 'edit')) {
   // We don't want/need to output these for view actions
-  
-  if(!empty($linkId)) {
-    // Hidden values used to link to parent objects (eg: matchgrid_id)
-    print $this->Form->hidden($vv_primary_link, ['value' => $linkId]);
-  }
-  
-  print $this->Field->submit(__d('operation', 'save'));
+  print $this->Form->hidden($vv_primary_link, ['value' => $linkId]);
 }
 
+// Close the Form
 print $this->Form->end();
 
-print $this->Field->endControlSet();
 
 /** MVEA Canvas output **/
 if($vv_action != 'add' && !empty($mveas)) {
diff --git a/app/templates/element/filter/dateTimeFilters.php b/app/templates/element/filter/dateTimeFilters.php
index a3ad78d2f..fb38f0f50 100644
--- a/app/templates/element/filter/dateTimeFilters.php
+++ b/app/templates/element/filter/dateTimeFilters.php
@@ -42,7 +42,7 @@
           <?php
           // Create a text field to hold our value.
           print $this->Form->label("{$key}_starts_at", __d('field', 'starts_at'), ['class' => 'filter-datepicker-lbl']);
-          print $this->Fieeld->dateField("{$key}_starts_at", DateTypeEnum::DateOnly, $query);
+          print $this->Field->dateField("{$key}_starts_at", DateTypeEnum::DateOnly, $query);
           ?>
         </div>
         <!--     Ends at       -->
@@ -50,7 +50,7 @@
           <?php
           // Create a text field to hold our value.
           print $this->Form->label("{$key}_ends_at", __d('field','ends_at'), ['class' => 'filter-datepicker-lbl']);
-          print $this->Fieeld->dateField("{$key}_ends_at", DateTypeEnum::DateOnly, $query);
+          print $this->Field->dateField("{$key}_ends_at", DateTypeEnum::DateOnly, $query);
           ?>
         </div>
       </div>
diff --git a/app/templates/element/filter/filter.php b/app/templates/element/filter/filter.php
index ca534135b..f0df46ea6 100644
--- a/app/templates/element/filter/filter.php
+++ b/app/templates/element/filter/filter.php
@@ -129,7 +129,7 @@
             print '<div class="top-filters-fields-date filter-standard ' . $wrapperCssClass . '">';
             print $this->Form->label($key, $label);
             print '<div class="d-flex">';
-            print $this->Field->dateField($key, DateTypeEnum::DateOnly, $query)['controlCode'];
+            print $this->Field->dateField($key, DateTypeEnum::DateOnly, $query);
             print '</div>';
             print '</div>';
           } else {
diff --git a/app/templates/element/form/infoDiv/check.php b/app/templates/element/form/infoDiv/check.php
index d70790494..237eeac66 100644
--- a/app/templates/element/form/infoDiv/check.php
+++ b/app/templates/element/form/infoDiv/check.php
@@ -37,7 +37,7 @@
       <label class="form-check-label" for="format-toggle"><?= __d('field','format') ?></label>
     </div>
   </div>
-  <?= $this->Fieeld->formField(...$vv_field_arguments) ?>
+  <?= $this->Field->formField(...$vv_field_arguments) ?>
   <script>
     parametersValue = $("#<?= $fieldName ?>").val();
     parametersJSON = JSON.parse(parametersValue);
diff --git a/app/templates/element/form/infoDiv/default.php b/app/templates/element/form/infoDiv/default.php
index 9d1e86eb7..fe1aa2e71 100644
--- a/app/templates/element/form/infoDiv/default.php
+++ b/app/templates/element/form/infoDiv/default.php
@@ -29,5 +29,5 @@
 declare(strict_types = 1);
 ?>
 <div class="field-info">
-  <?= $this->Fieeld->formField(...$vv_field_arguments) ?>
+  <?= $this->Field->formField(...$vv_field_arguments) ?>
 </div>
\ No newline at end of file
diff --git a/app/templates/element/form/infoDiv/grouped.php b/app/templates/element/form/infoDiv/grouped.php
index d5278f945..96cb0f623 100644
--- a/app/templates/element/form/infoDiv/grouped.php
+++ b/app/templates/element/form/infoDiv/grouped.php
@@ -44,7 +44,7 @@
     ?>
   <div class="subfield subfield-cols <?= $classes ?>">
     <div class="field-col">
-    <?= $this->Fieeld->formField($fieldName, ...$fieldArguments) ?>
+    <?= $this->Field->formField($fieldName, ...$fieldArguments) ?>
     </div>
   </div>
   <?php endforeach; ?>
diff --git a/app/templates/element/form/infoDiv/source.php b/app/templates/element/form/infoDiv/source.php
index 5edeadce3..e9d222642 100644
--- a/app/templates/element/form/infoDiv/source.php
+++ b/app/templates/element/form/infoDiv/source.php
@@ -31,5 +31,5 @@
 
 ?>
 <div>
-  <?= $this->Fieeld->sourceLink($entity) ?>
+  <?= $this->Field->sourceLink($entity) ?>
 </div>
diff --git a/app/templates/element/form/infoDiv/withPrefix.php b/app/templates/element/form/infoDiv/withPrefix.php
index 0881534b5..17c4189df 100644
--- a/app/templates/element/form/infoDiv/withPrefix.php
+++ b/app/templates/element/form/infoDiv/withPrefix.php
@@ -33,6 +33,6 @@
     <div class="input-group-prepend">
       <span class="input-group-text" id="basic-addon3"><?= $vv_field_arguments['fieldPrefix'] ?></span>
     </div>
-    <?= $this->Fieeld->formField(...$vv_field_arguments)?>
+    <?= $this->Field->formField(...$vv_field_arguments)?>
   </div>
 </div>
diff --git a/app/templates/element/form/listItem.php b/app/templates/element/form/listItem.php
index ce97436a4..2774f259a 100644
--- a/app/templates/element/form/listItem.php
+++ b/app/templates/element/form/listItem.php
@@ -39,7 +39,7 @@
 $this->set('vv_field_arguments', $arguments);
 
 // Class calculation by field Type
-$classes = match ($this->Fieeld->getFieldType($fieldName)) {
+$classes = match ($this->Field->getFieldType($fieldName)) {
   'date',
   'datetime',
   'timestamp'     => 'fields-datepicker ',
@@ -62,14 +62,14 @@
 
 // If an attribute is frozen, inject a special link to unfreeze it, since
 // the attribute is read-only and the admin can't simply uncheck the setting
-if($fieldName == 'frozen' && $this->Fieeld->getEntity()->frozen) {
+if($fieldName == 'frozen' && $this->Field->getEntity()->frozen) {
   $url = [
     'label' => __d('operation', 'unfreeze'),
     'url' => [
       'plugin'      => null,
-      'controller'  => \App\Lib\Util\StringUtilities::entityToClassname($this->Fieeld->getEntity()),
+      'controller'  => \App\Lib\Util\StringUtilities::entityToClassname($this->Field->getEntity()),
       'action'      => 'unfreeze',
-      $this->Fieeld->getEntity()->id
+      $this->Field->getEntity()->id
     ]
   ];
   $arguments = [
@@ -86,14 +86,14 @@
     'label' => __d('operation', 'configure.plugin'),
     'url' => [
       'plugin'      => null,
-      'controller'  => \App\Lib\Util\StringUtilities::entityToClassname($this->Fieeld->getEntity()),
+      'controller'  => \App\Lib\Util\StringUtilities::entityToClassname($this->Field->getEntity()),
       'action'      => 'configure',
-      $this->Fieeld->getEntity()->id
+      $this->Field->getEntity()->id
     ]
   ];
   $arguments = [
     ...$arguments,
-    'status' => $this->Fieeld->getEntity()->$fieldName,
+    'status' => $this->Field->getEntity()->$fieldName,
     'link' => $url,
   ];
   $this->set('vv_field_arguments', $arguments);
diff --git a/app/templates/element/form/nameDiv.php b/app/templates/element/form/nameDiv.php
index e049384fe..fa76b0c17 100644
--- a/app/templates/element/form/nameDiv.php
+++ b/app/templates/element/form/nameDiv.php
@@ -45,7 +45,7 @@
 // request associated data. Note, however, that model names for language
 // keys are OtherModel, so we'll need to inflect.
 
-$mn = $this->Fieeld->getModelName();
+$mn = $this->Field->getModelName();
 $fn = $fieldName;
 
 if(str_contains($fieldName, '.')) {
@@ -56,7 +56,7 @@
   $fn = $bits[2];
 }
 
-[$label, $desc] = $this->Fieeld->calculateLabelAndDescription($fn);
+[$label, $desc] = $this->Field->calculateLabelAndDescription($fn);
 $label = $vv_field_arguments['fieldLabel'] ?? $label;
 
 // Override the default required behavior is the field has the required
@@ -74,7 +74,7 @@
   <div class="field-title">
     <!-- Will this work for accessibility? -->
     <?php if((isset($vv_field_arguments['labelIsTextOnly']) && !$vv_field_arguments['labelIsTextOnly'])
-             && $this->Fieeld->getFieldType($fieldName) !== 'boolean'): ?>
+             && $this->Field->getFieldType($fieldName) !== 'boolean'): ?>
       <?= $this->Form->label($fn, $label) ?>
     <!-- We print the login checkbox along with the Identifier type. -->
     <!-- As a result, the label is redundant -->
@@ -83,9 +83,9 @@
     <?php endif; ?>
     <?php
     // Required Field
-    if($this->Fieeld->isEditable()
+    if($this->Field->isEditable()
        &&
-       ($this->Fieeld->isReqField($fn) || $optionsRequired)
+       ($this->Field->isReqField($fn) || $optionsRequired)
     ) {
       print $this->element('form/requiredSpan');
     }
diff --git a/app/templates/element/form/submit.php b/app/templates/element/form/submit.php
index a32069142..2063db9f4 100644
--- a/app/templates/element/form/submit.php
+++ b/app/templates/element/form/submit.php
@@ -29,7 +29,7 @@
 declare(strict_types = 1);
 ?>
 
-<?php if($this->Fieeld->isEditable()): ?>
+<?php if($this->Field->isEditable()): ?>
   <li class="fields-submit">
     <div class="field">
       <div class="field-name">