diff --git a/README.md b/README.md
index 01537f5d..53c7c370 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Built on the Events object.
 
 Developer sandbox pages — not for production use.
 
-- `/testing/ae_obj_field_editor_v3/` — V3 field editor playground
+- `/testing/ae_obj_field_editor/` — V3 field editor playground
 - `/testing/data_store_v3/` — Data store V3 playground
 - `/testing/editor_test/` — CodeMirror / TipTap editor tests
 - `/testing/hosted_files/` — File upload tests
diff --git a/documentation/AE__Components.md b/documentation/AE__Components.md
index eceb2d67..45114b9a 100644
--- a/documentation/AE__Components.md
+++ b/documentation/AE__Components.md
@@ -62,7 +62,7 @@ These are reusable components that provide common functionalities across differe
     - Bindings: `bind:trigger`, `bind:show_spinner`, `bind:show_percent`.
     - Status: `started`, `downloading`, `finished`.
 - **`data_store`**: Component for interacting with data stores.
-- **`element_ae_obj_field_editor_v3`**: Standard single-field inline editor. Replaces retired `ae_crud` v1/v2 components.
+- **`element_ae_obj_field_editor`**: Standard single-field inline editor. Replaces retired `ae_crud` v1/v2 components.
     - Props: `object_type`, `object_id`, `field_name`, `field_type`, `current_value`
     - Field types: `text`, `textarea`, `select`, `tiptap`, `checkbox`, `date`, `datetime`, `number`
     - Callbacks: `on_success`, `on_error`
diff --git a/documentation/GUIDE__Development.md b/documentation/GUIDE__Development.md
index 88511f0a..81ab4c4d 100644
--- a/documentation/GUIDE__Development.md
+++ b/documentation/GUIDE__Development.md
@@ -53,12 +53,12 @@ You are not working in a vacuum. Coordinate with the Backend Agent via MCP tools
 | `documentation/PROJECT__AE_Events_Launcher_Native_integration.md` | Electron/Launcher reference |
 | `tests/README.md` | Playwright test guide — shared helpers, hard-won lessons, demo IDs |
 
-## 6. Inline Field Editing — `element_ae_obj_field_editor_v3`
+## 6. Inline Field Editing — `element_ae_obj_field_editor`
 
 The standard component for single-field inline editing throughout the platform. Wraps a `PATCH /v3/crud/{obj_type}/{obj_id}` call behind a click-to-edit UI that respects `$ae_loc.edit_mode`.
 
 ```svelte
-import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
 ```
 
 ### Basic usage — text field with custom display
@@ -66,7 +66,7 @@ import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_e
 Wrap the display content in the default snippet. The component renders it in view mode and swaps in the input on edit.
 
 ```svelte
-<Element_ae_obj_field_editor_v3
+<Element_ae_obj_field_editor
     object_type={'event_session'}
     object_id={session.id}
     field_name={'name'}
@@ -75,7 +75,7 @@ Wrap the display content in the default snippet. The component renders it in vie
     on_success={() => events_func.load_ae_obj_id__event_session({ api_cfg: $ae_api, event_session_id: session.id })}
 >
     <h1 class="text-2xl font-bold">{session.name}</h1>
-</Element_ae_obj_field_editor_v3>
+</Element_ae_obj_field_editor>
 ```
 
 ### Field types
@@ -94,7 +94,7 @@ Wrap the display content in the default snippet. The component renders it in vie
 ### Select with nullable FK
 
 ```svelte
-<Element_ae_obj_field_editor_v3
+<Element_ae_obj_field_editor
     object_type={'event_presenter'}
     object_id={presenter.event_presenter_id}
     field_name={'person_id'}
@@ -105,7 +105,7 @@ Wrap the display content in the default snippet. The component renders it in vie
     on_success={() => events_func.load_ae_obj_id__event_presenter({ api_cfg: $ae_api, event_presenter_id: presenter.event_presenter_id })}
 >
     {presenter.person_id ?? 'Not linked'}
-</Element_ae_obj_field_editor_v3>
+</Element_ae_obj_field_editor>
 ```
 
 ### Key props
diff --git a/documentation/PROJECT__AE_Object_Field_Editor_V3_upgrade.md b/documentation/PROJECT__AE_Object_Field_Editor_V3_upgrade.md
index f3c8e61f..7b615c8f 100644
--- a/documentation/PROJECT__AE_Object_Field_Editor_V3_upgrade.md
+++ b/documentation/PROJECT__AE_Object_Field_Editor_V3_upgrade.md
@@ -2,7 +2,7 @@
 
 > **Status:** 🟡 Mostly Complete — Phase 3 items + GUIDE update remaining
 > **Date:** February 13, 2026 (last updated: 2026-03-20)
-> **Target Component:** `src/lib/elements/element_ae_obj_field_editor_v3.svelte`
+> **Target Component:** `src/lib/elements/element_ae_obj_field_editor.svelte`
 > **Replaces:** `element_ae_crud.svelte` and `element_ae_crud_v2.svelte`
 
 ## 1. Overview
@@ -36,7 +36,7 @@ Consolidate the legacy CRUD components into a single, high-performance "Aether O
 - [ ] Implement searchable dropdowns for the `select` type.
 
 ### Phase 4: Migration & Cleanup
-- [x] Create a playground route for V3 verification (`/testing/ae_obj_field_editor_v3`).
+- [x] Create a playground route for V3 verification (`/testing/ae_obj_field_editor`).
 - [x] Deprecate and remove `v1` and `v2` files — `element_ae_crud.svelte` and `element_ae_crud_v2.svelte` removed 2026-03-20.
 - [ ] Update `GUIDE__Development.md` with the new usage patterns.
 
diff --git a/src/lib/ae_api/api_get__data_store.ts b/src/lib/ae_api/api_get__data_store.ts
index 5ef0827a..07b4d56e 100644
--- a/src/lib/ae_api/api_get__data_store.ts
+++ b/src/lib/ae_api/api_get__data_store.ts
@@ -15,7 +15,7 @@ interface GetDataStoreV3Params {
  * Uses hierarchical fallback logic (Specific -> Account -> Global)
  * Path: GET /v3/data_store/code/{code}
  */
-export async function get_data_store_v3({
+export async function get_data_store({
     api_cfg,
     code,
     for_type = null,
@@ -24,7 +24,7 @@ export async function get_data_store_v3({
     log_lvl = 0
 }: GetDataStoreV3Params): Promise<any> {
     if (log_lvl) {
-        console.log(`*** get_data_store_v3() *** code=${code} no_account_id=${no_account_id}`);
+        console.log(`*** get_data_store() *** code=${code} no_account_id=${no_account_id}`);
     }
 
     const endpoint = `/v3/data_store/code/${code}`;
diff --git a/src/lib/ae_core/core__crud_generic.ts b/src/lib/ae_core/core__crud_generic.ts
deleted file mode 100644
index 2a967837..00000000
--- a/src/lib/ae_core/core__crud_generic.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-import { marked } from 'marked';
-
-import type { key_val } from '$lib/stores/ae_stores';
-import { api } from '$lib/api/api';
-
-import { db_save_ae_obj_li__ae_obj } from '$lib/ae_core/core__idb_dexie';
-
-// Define generic CRUD args
-export interface GenericCrudArgs {
-    api_cfg: any;
-    obj_type: string;
-    obj_id?: string;
-    for_obj_type?: string;
-    for_obj_id?: string;
-
-    db_instance?: any; // Optional DB instance for caching
-    db_field_li?: string[]; // Optional list of fields to save in DB
-
-    // Flags to include related core object models
-    inc_account_li?: boolean;
-    inc_address_li?: boolean;
-    inc_contact_li?: boolean;
-    inc_person_li?: boolean;
-    inc_site_li?: boolean;
-    inc_site_domain_li?: boolean;
-    inc_user_li?: boolean;
-
-    // Flags to include related other object models
-    inc_archive_li?: boolean;
-    inc_archive_entry_li?: boolean;
-    inc_event_li?: boolean;
-    inc_event_session_li?: boolean;
-    inc_post_li?: boolean;
-    inc_post_comment_li?: boolean;
-    inc_journal_li?: boolean;
-    inc_journal_entry_li?: boolean;
-
-    inc_obj_type_li?: string[]; // Optional list of object types to include
-
-    data_kv?: key_val;
-    enabled?: 'enabled' | 'not_enabled' | 'all';
-    hidden?: 'not_hidden' | 'hidden' | 'all';
-    method?: string;
-    limit?: number;
-    offset?: number;
-    order_by_li?: Record<string, 'ASC' | 'DESC'> | Record<string, 'ASC' | 'DESC'>[] | null;
-    params?: key_val;
-    try_cache?: boolean;
-    log_lvl?: number;
-}
-
-// Generic function: Load single object by ID
-export async function load_ae_obj_id(args: GenericCrudArgs): Promise<any> {
-    const { api_cfg, obj_type, obj_id, log_lvl = 0 } = args;
-
-    if (!obj_id) {
-        if (log_lvl) console.warn('load_ae_obj_id called without obj_id');
-        return null;
-    }
-
-    if (log_lvl) {
-        console.log(`*** load_ae_obj_id() *** obj_type=${obj_type} obj_id=${obj_id}`);
-    }
-
-    const result = await api.get_ae_obj_id_crud({
-        api_cfg,
-        obj_type,
-        obj_id,
-        params: {},
-        log_lvl
-    });
-
-    return result;
-}
-
-// Generic function: Load list of objects
-export async function load_ae_obj_li(args: GenericCrudArgs): Promise<any> {
-    const {
-        api_cfg,
-        obj_type,
-        for_obj_type = '',
-        for_obj_id,
-        inc_obj_type_li,
-        enabled = 'enabled',
-        hidden = 'not_hidden',
-        limit = 99,
-        offset = 0,
-        order_by_li = {},
-        params = {},
-        try_cache = true,
-        log_lvl = 0
-    } = args;
-
-    if (log_lvl) {
-        console.log(
-            `*** load_ae_obj_li() *** obj_type=${obj_type} for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`
-        );
-    }
-
-    const params_json: key_val = {};
-
-    const result = await api.get_ae_obj_li_for_obj_id_crud_v2({
-        api_cfg,
-        obj_type,
-        for_obj_type,
-        for_obj_id: for_obj_id ?? '',
-        enabled,
-        hidden,
-        order_by_li,
-        limit,
-        offset,
-        params_json: {},
-        params,
-        log_lvl
-    });
-
-    return result;
-}
-
-// Generic function: Create object
-export async function create_ae_obj(args: GenericCrudArgs): Promise<any> {
-    const { api_cfg, obj_type, data_kv, log_lvl = 0 } = args;
-
-    if (log_lvl) {
-        console.log(`*** create_ae_obj() *** obj_type=${obj_type}`, data_kv);
-    }
-
-    const result = await api.create_ae_obj_crud({
-        api_cfg,
-        obj_type,
-        fields: data_kv,
-        key: api_cfg.api_crud_super_key,
-        params: {},
-        return_obj: true,
-        log_lvl
-    });
-
-    return result;
-}
-
-// Generic function: Update object
-export async function update_ae_obj(args: GenericCrudArgs): Promise<any> {
-    const { api_cfg, obj_type, obj_id, data_kv, log_lvl = 0 } = args;
-
-    if (!obj_id) {
-        if (log_lvl) console.warn('update_ae_obj called without obj_id');
-        return null;
-    }
-
-    if (log_lvl) {
-        console.log(`*** update_ae_obj() *** obj_type=${obj_type} obj_id=${obj_id}`, data_kv);
-    }
-
-    const result = await api.update_ae_obj_id_crud({
-        api_cfg,
-        obj_type,
-        obj_id,
-        fields: data_kv,
-        key: api_cfg.api_crud_super_key,
-        params: {},
-        return_obj: true,
-        log_lvl
-    });
-
-    return result;
-}
-
-// Generic function: Delete object
-export async function delete_ae_obj_id(args: GenericCrudArgs): Promise<any> {
-    const { api_cfg, obj_type, obj_id, method = 'delete', log_lvl = 0 } = args;
-
-    if (!obj_id) {
-        if (log_lvl) console.warn('delete_ae_obj_id called without obj_id');
-        return null;
-    }
-
-    if (log_lvl) {
-        console.log(`*** delete_ae_obj_id() *** obj_type=${obj_type} obj_id=${obj_id}`);
-    }
-
-    const result = await api.delete_ae_obj_id_crud({
-        api_cfg,
-        obj_type,
-        obj_id,
-        key: api_cfg.api_crud_super_key,
-        params: {},
-        method,
-        log_lvl
-    });
-
-    return result;
-}
-
-// Additional Modules that might be needed for reloads
-import { load_ae_obj_id__archive } from '$lib/ae_archives/ae_archives__archive';
-import { load_ae_obj_id__archive_content } from '$lib/ae_archives/ae_archives__archive_content';
-import { load_ae_obj_id__event } from '$lib/ae_events/ae_events__event';
-import { load_ae_obj_id__event_device } from '$lib/ae_events/ae_events__event_device';
-import { load_ae_obj_id__event_file } from '$lib/ae_events/ae_events__event_file';
-import { load_ae_obj_id__event_location } from '$lib/ae_events/ae_events__event_location';
-import { load_ae_obj_id__event_presentation } from '$lib/ae_events/ae_events__event_presentation';
-import { load_ae_obj_id__event_presenter } from '$lib/ae_events/ae_events__event_presenter';
-import { load_ae_obj_id__event_session } from '$lib/ae_events/ae_events__event_session';
-import { load_ae_obj_id__journal } from '$lib/ae_journals/ae_journals__journal';
-import { load_ae_obj_id__journal_entry } from '$lib/ae_journals/ae_journals__journal_entry';
-import { load_ae_obj_id__post } from '$lib/ae_posts/ae_posts__post';
-import { load_ae_obj_id__post_comment } from '$lib/ae_posts/ae_posts__post_comment';
-import { load_ae_obj_id__person } from '$lib/ae_core/ae_core__person';
-
-export async function update_ae_obj_id_crud_v2({
-    api_cfg,
-    object_type,
-    object_id,
-    object_reload = false,
-    field_name,
-    new_field_value,
-    log_lvl = 0
-}: {
-    api_cfg: any;
-    object_type: string;
-    object_id: string;
-    object_reload?: boolean;
-    field_name: string;
-    new_field_value: any;
-    log_lvl?: number;
-}) {
-    if (log_lvl) {
-        console.log(
-            `*** update_ae_obj_id_crud_v2() *** object_type=${object_type}, object_id=${object_id}, object_reload=${object_reload}, field_name=${field_name}, new_field_value=`,
-            new_field_value
-        );
-    }
-
-    try {
-        const results = await api.update_ae_obj_id_crud({
-            api_cfg: api_cfg,
-            obj_type: object_type,
-            obj_id: object_id,
-            field_name: field_name,
-            field_value: new_field_value,
-            key: api_cfg.api_crud_super_key,
-            log_lvl: log_lvl
-        });
-
-        if (!results) {
-            if (log_lvl) console.log(
-                `Not Patched - Field Name: ${field_name} with new Field Value: ${new_field_value}; Account ID: ${api_cfg.account_id}`
-            );
-            return false;
-        }
-
-        if (log_lvl) console.log(`Patched - Field Name: ${field_name} with new Field Value: ${new_field_value}`);
-
-        if (object_reload) {
-            if (log_lvl) console.log(`Reloading the object after patching...`);
-
-            const reload_fns: { [key: string]: (args: any) => Promise<any> } = {
-                person: load_ae_obj_id__person,
-                archive: load_ae_obj_id__archive,
-                archive_content: load_ae_obj_id__archive_content,
-                journal: load_ae_obj_id__journal,
-                journal_entry: load_ae_obj_id__journal_entry,
-                event: load_ae_obj_id__event,
-                event_device: load_ae_obj_id__event_device,
-                event_file: load_ae_obj_id__event_file,
-                event_location: load_ae_obj_id__event_location,
-                event_presentation: load_ae_obj_id__event_presentation,
-                event_presenter: load_ae_obj_id__event_presenter,
-                event_session: load_ae_obj_id__event_session,
-                post: load_ae_obj_id__post,
-                post_comment: load_ae_obj_id__post_comment
-            };
-
-            const reload_fn = reload_fns[object_type];
-            if (reload_fn) {
-                const id_key = `${object_type}_id`;
-                return await reload_fn({ api_cfg, [id_key]: object_id, log_lvl });
-            }
-        }
-
-        return true;
-    } catch (error) {
-        console.log('Something went wrong patching the record.', error);
-        return false;
-    }
-}
-
-export async function download_export_li({
-    api_cfg,
-    get_obj_type,
-    for_obj_type,
-    for_obj_id,
-    exp_alt = null,
-    file_type = 'CSV',
-    return_file = true,
-    filename = 'no_filename.csv',
-    auto_download = false,
-    limit = 5000,
-    params = {},
-    log_lvl = 0
-}: {
-    api_cfg: any;
-    get_obj_type: string;
-    for_obj_type: string;
-    for_obj_id: string;
-    exp_alt?: null | string;
-    file_type?: string;
-    return_file?: boolean;
-    filename?: string;
-    auto_download?: boolean;
-    limit?: number;
-    params?: key_val;
-    log_lvl?: number;
-}) {
-    if (log_lvl) console.log('*** download_export_li() ***');
-
-    const endpoint = `/v2/crud/${get_obj_type}/list`;
-    params['for_obj_type'] = for_obj_type;
-    params['for_obj_id'] = for_obj_id;
-
-    if (file_type === 'CSV' || file_type === 'Excel') {
-        params['file_type'] = file_type;
-    }
-    params['return_file'] = true;
-    params['mdl_alt'] = 'out';
-
-    if (exp_alt) {
-        params['exp_alt'] = exp_alt;
-    }
-
-    const clean_filename = filename.replace(/[^a-zA-Z0-9\[\]-_.]/gi, '_');
-
-    if (limit >= 0) {
-        params['limit'] = limit;
-    }
-
-    const download_result = await api.get_object({
-        api_cfg: api_cfg,
-        endpoint: endpoint,
-        params: params,
-        timeout: 90000,
-        return_blob: return_file,
-        filename: clean_filename,
-        auto_download: auto_download,
-        task_id: for_obj_id,
-        log_lvl: log_lvl
-    });
-
-    if (log_lvl) console.log('download_result:', download_result);
-    return download_result;
-}
diff --git a/src/lib/ae_core/core__data_store.ts b/src/lib/ae_core/core__data_store.ts
index fc7b8cd2..b08c42f6 100644
--- a/src/lib/ae_core/core__data_store.ts
+++ b/src/lib/ae_core/core__data_store.ts
@@ -39,7 +39,7 @@ export async function load_ae_obj_by_code__data_store({
     }
 
     try {
-        const get_ds_result = await api.get_data_store_v3({
+        const get_ds_result = await api.get_data_store({
             api_cfg,
             code,
             log_lvl
@@ -60,7 +60,7 @@ export async function load_ae_obj_by_code__data_store({
         // Map content fields for convenience
         const text_val = get_ds_result.text || '';
         const json_val = get_ds_result.json || (get_ds_result.json_str ? JSON.parse(get_ds_result.json_str) : null);
-        
+
         const mapped_ds: ae_DataStore = {
             ...get_ds_result,
             id: ds_id,
@@ -77,7 +77,7 @@ export async function load_ae_obj_by_code__data_store({
         if (data_type === 'html') return mapped_ds.html;
         if (data_type === 'json') return mapped_ds.json;
         return mapped_ds.text;
-        
+
     } catch (error) {
         if (log_lvl) console.error('*ae_func* Fetch failed.', error);
         return null;
diff --git a/src/lib/api/api.ts b/src/lib/api/api.ts
index d79125b0..d7837f1c 100644
--- a/src/lib/api/api.ts
+++ b/src/lib/api/api.ts
@@ -27,7 +27,7 @@ import {
     delete_nested_ae_obj_v3
 } from '$lib/ae_api/api_post__crud_obj_v3';
 
-import { get_data_store_v3 } from '$lib/ae_api/api_get__data_store';
+import { get_data_store } from '$lib/ae_api/api_get__data_store';
 
 /**
  * Get a list of lookup objects (V3)
@@ -670,7 +670,7 @@ const obj = {
     delete_ae_obj_id_crud: delete_ae_obj_id_crud,
     download_hosted_file: download_hosted_file,
     delete_hosted_file: delete_hosted_file,
-    get_data_store_v3: get_data_store_v3,
+    get_data_store: get_data_store,
     get_data_store_obj_w_code: get_data_store_obj_w_code,
     get_ae_obj_li_for_lu: get_ae_obj_li_for_lu,
     send_email: send_email
diff --git a/src/lib/elements/element_ae_obj_field_editor_v3.svelte b/src/lib/elements/element_ae_obj_field_editor.svelte
similarity index 99%
rename from src/lib/elements/element_ae_obj_field_editor_v3.svelte
rename to src/lib/elements/element_ae_obj_field_editor.svelte
index f7268737..72706302 100644
--- a/src/lib/elements/element_ae_obj_field_editor_v3.svelte
+++ b/src/lib/elements/element_ae_obj_field_editor.svelte
@@ -155,7 +155,7 @@
 </script>
 
 <div
-    class="ae_field_editor_v3 group relative {class_li}"
+    class="ae_field_editor group relative {class_li}"
     class:block={display_block}
     class:inline-block={!display_block}
 >
@@ -312,7 +312,7 @@
 
 <style>
     /* Add any specialized transitions if needed */
-    .ae_field_editor_v3 :global(.btn-icon-sm) {
+    .ae_field_editor :global(.btn-icon-sm) {
         width: 24px;
         height: 24px;
     }
diff --git a/src/lib/elements/element_data_store_v3.svelte b/src/lib/elements/element_data_store.svelte
similarity index 99%
rename from src/lib/elements/element_data_store_v3.svelte
rename to src/lib/elements/element_data_store.svelte
index 93364583..fb469f7f 100644
--- a/src/lib/elements/element_data_store_v3.svelte
+++ b/src/lib/elements/element_data_store.svelte
@@ -160,7 +160,7 @@
 
         try {
             // Attempt 1: Context-specific fetch
-            let ds_results = await api.get_data_store_v3({
+            let ds_results = await api.get_data_store({
                 api_cfg,
                 code: ds_code,
                 for_type: for_type,
@@ -176,7 +176,7 @@
             if (!ds_results || is_error || status_code === 404 || status_code === 403 || status_code === 401) {
                 if (log_lvl) console.log(`ae_e_data_store [${ds_code}]: Not found in context (Status ${status_code}). Trying global fallback.`);
 
-                ds_results = await api.get_data_store_v3({
+                ds_results = await api.get_data_store({
                     api_cfg,
                     code: ds_code,
                     no_account_id: true,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 87829f40..7d7c5f3e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -8,7 +8,7 @@
     // import { PUBLIC_TESTING } from '$env/static/public';
     // console.log(`AE Config - +page.svelte PUBLIC_TESTING:`, PUBLIC_TESTING);
 
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     // import { api } from '$lib/api';
     import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores';
diff --git a/src/routes/core/people/[person_id]/+page.svelte b/src/routes/core/people/[person_id]/+page.svelte
index 1ea21273..e961bf25 100644
--- a/src/routes/core/people/[person_id]/+page.svelte
+++ b/src/routes/core/people/[person_id]/+page.svelte
@@ -8,7 +8,7 @@
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     // import { api } from '$lib/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     import { liveQuery } from 'dexie';
     // import { core_func } from '$lib/ae_core_functions';
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index fd4b7c81..9a048e56 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -13,7 +13,7 @@
 
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import { api } from '$lib/api/api';
 
     import { core_func } from '$lib/ae_core/ae_core_functions';
@@ -93,7 +93,7 @@
 
     <ul class="space-y-2 px-4">
         <li class:hidden={!$ae_loc.trusted_access || !$ae_loc.edit_mode}>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'external_id'}
@@ -107,10 +107,10 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.external_id ?? ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
         <li class:hidden={!$ae_loc.trusted_access || !$ae_loc.edit_mode}>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'external_sys_id'}
@@ -124,13 +124,13 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.external_sys_id ?? ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
 
         <li>
             <User size="1em" />
 
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'given_name'}
@@ -141,8 +141,8 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.given_name ?? ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
-            <Element_ae_obj_field_editor_v3
+            </Element_ae_obj_field_editor>
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'family_name'}
@@ -153,10 +153,10 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.family_name ?? ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
         <li>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'primary_email'}
@@ -179,10 +179,10 @@
                         email {@html ae_snip.html__not_set}
                     {/if}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
         <li>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'affiliations'}
@@ -195,10 +195,10 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.affiliations ?? 'affiliations' + ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
         <li>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'professional_title'}
@@ -214,10 +214,10 @@
                         ? $lq__person_obj.professional_title
                         : 'professional title' + ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
         <li>
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'person'}
                 object_id={$lq__person_obj.person_id_random}
                 field_name={'passcode'}
@@ -231,7 +231,7 @@
                 <span class="font-bold">
                     {@html $lq__person_obj.passcode ?? 'passcode' + ae_snip.html__not_set}
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </li>
 
         <li hidden={!$ae_loc.trusted_access}>
diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index d49bedc4..8a05f811 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -22,7 +22,7 @@
     // *** Import Aether specific variables and functions
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_loc, ae_sess, ae_api, slct } from '$lib/stores/ae_stores';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import {
         events_loc,
         events_sess,
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
index 978a105f..9971b8cb 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
@@ -9,7 +9,7 @@
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { events_loc, events_sess } from '$lib/stores/ae_events_stores';
     import { events_func } from '$lib/ae_events/ae_events_functions';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import Comp_exhibit_license_list from './ae_comp__exhibit_license_list.svelte';
     import Comp_exhibit_custom_questions from './ae_comp__exhibit_custom_questions.svelte';
     import Comp_exhibit_payment from './ae_comp__exhibit_payment.svelte';
@@ -54,7 +54,7 @@
                 <!-- Priority / Payment Toggle -->
                 <div class="card p-3 preset-tonal-surface flex items-center justify-between">
                     <div class="text-[10px] uppercase font-black opacity-40">Payment Status</div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type="event_exhibit"
                         object_id={exhibit_id}
                         field_name="priority"
@@ -63,13 +63,13 @@
                         on_success={() => events_func.load_ae_obj_id__event_exhibit({ api_cfg: $ae_api, exhibit_id })}
                     >
                         <div class="font-bold">{$lq__exhibit_obj?.priority ? 'PAID' : 'PENDING'}</div>
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 </div>
 
                 <!-- Max Licenses -->
                 <div class="card p-3 preset-tonal-surface flex items-center justify-between">
                     <div class="text-[10px] uppercase font-black opacity-40">Max Licenses</div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type="event_exhibit"
                         object_id={exhibit_id}
                         field_name="license_max"
@@ -83,7 +83,7 @@
                 <!-- Small Devices -->
                 <div class="card p-3 preset-tonal-surface flex items-center justify-between">
                     <div class="text-[10px] uppercase font-black opacity-40">Small Devices</div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type="event_exhibit"
                         object_id={exhibit_id}
                         field_name="leads_device_sm_qty"
@@ -97,7 +97,7 @@
                 <!-- Large Devices -->
                 <div class="card p-3 preset-tonal-surface flex items-center justify-between">
                     <div class="text-[10px] uppercase font-black opacity-40">Large Devices</div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type="event_exhibit"
                         object_id={exhibit_id}
                         field_name="leads_device_lg_qty"
@@ -124,7 +124,7 @@
                 <div class="label mb-2">
                     <span class="text-xs uppercase font-black opacity-40 tracking-widest">Exhibitor Name</span>
                 </div>
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type="event_exhibit"
                     object_id={exhibit_id}
                     field_name="name"
@@ -142,7 +142,7 @@
                 <div class="label mb-2">
                     <span class="text-xs uppercase font-black opacity-40 tracking-widest">Booth Description / Promo</span>
                 </div>
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type="event_exhibit"
                     object_id={exhibit_id}
                     field_name="description"
@@ -177,7 +177,7 @@
                             </div>
                         {/if}
 
-                        <Element_ae_obj_field_editor_v3
+                        <Element_ae_obj_field_editor
                             object_type="event_exhibit"
                             object_id={exhibit_id}
                             field_name="staff_passcode"
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte
index b288bffe..b5de2e5c 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte
@@ -10,7 +10,7 @@
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { events_func } from '$lib/ae_events/ae_events_functions';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import Comp_lead_detail_form from './ae_comp__lead_detail_form.svelte';
     import { Briefcase, CalendarDays, ChevronLeft, Eye, FileText, ListTodo, LoaderCircle, Mail, MapPin, RotateCcw, ShieldCheck, SquarePen, Star, Store, Trash2, User } from '@lucide/svelte';
     const exhibit_tracking_id = $derived(page.params.exhibit_tracking_id);
@@ -96,7 +96,7 @@
             </a>
             <h1 class="text-lg font-bold">Lead Profile</h1>
         </div>
-        
+
         <div class="flex items-center gap-2">
             {#if $lq__lead_obj}
                 <button
@@ -165,7 +165,7 @@
         {:else}
             <!-- Main Grid -->
             <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
-                
+
                 <!-- Left: Profile Info -->
                 <div class="lg:col-span-2 space-y-6">
                     <!-- Attendee Core Identity -->
@@ -245,7 +245,7 @@
                         </div>
                         <div class="bg-surface-500/5 p-5 rounded-xl border border-surface-500/10 min-h-[120px]">
                             {#if is_edit_mode}
-                                <Element_ae_obj_field_editor_v3
+                                <Element_ae_obj_field_editor
                                     object_type="event_exhibit_tracking"
                                     object_id={exhibit_tracking_id ?? ''}
                                     field_name="exhibitor_notes"
@@ -286,11 +286,11 @@
                                 <span class="text-sm opacity-60">Captured By</span>
                                 <span class="font-mono text-[10px]">{$lq__lead_obj.external_person_id || 'Unknown'}</span>
                             </div>
-                            
+
                             {#if is_edit_mode}
                                 <div class="flex justify-between items-center pt-2 border-t border-surface-500/10">
                                     <span class="text-xs opacity-60 font-bold">Priority Lead</span>
-                                    <Element_ae_obj_field_editor_v3
+                                    <Element_ae_obj_field_editor
                                         object_type="event_exhibit_tracking"
                                         object_id={exhibit_tracking_id ?? ''}
                                         field_name="priority"
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
index f0901052..67d1d344 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
@@ -40,7 +40,7 @@
     } from '$lib/stores/ae_events_stores';
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import { Barcode, Camera, ChevronDown, ChevronUp, Eye, EyeOff, HeartPulse, Laptop, LoaderCircle, MessageCircle, RefreshCw, TriangleAlert } from '@lucide/svelte';
     $effect(() => {
         if (log_lvl) {
@@ -68,11 +68,11 @@
         if (auto_refresh) {
             untrack(() => {
                 if (refresh_interval_id) clearInterval(refresh_interval_id);
-                
+
                 // Add a random number of seconds to the auto_refresh interval to prevent all clients from refreshing at the same time.
                 let refresh_interval = auto_refresh + Math.floor(Math.random() * 15000);
                 if (log_lvl) console.log(`Auto refresh interval: ${refresh_interval}`);
-                
+
                 refresh_interval_id = setInterval(() => {
                     if (log_lvl) console.log('Auto-refreshing Event Device List');
                     events_func.load_ae_obj_li__event_device({
@@ -129,7 +129,7 @@
                         class="h5 rounded-md p-2 bg-gray-200 flex flex-row gap-1 items-center justify-between"
                     >
                         <span>
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'event_device'}
                                 object_id={event_device_obj?.event_device_id}
                                 field_name={'name'}
@@ -140,7 +140,7 @@
                             >
                                 <Laptop size="1em" class="m-1" />
                                 "{event_device_obj?.name}"
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
                             <!-- "{event_device_obj.name}" -->
                             {#if event_device_obj?.code && !$events_loc.pres_mgmt?.hide__device_code}
                                 <span
@@ -469,7 +469,7 @@
                             class:hidden={!$events_loc.pres_mgmt
                                 .show_content__device_description}
                         >
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'event_device'}
                                 object_id={event_device_obj?.event_device_id}
                                 field_name={'description'}
@@ -536,7 +536,7 @@
                     No description provided.
                 </div>
             {/if} -->
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
                         </div>
                     </div>
                     <!-- End of device content -->
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
index 5b056ceb..952c434f 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
@@ -20,7 +20,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__events_menu_nav from '../../ae_comp__events_menu_nav.svelte';
     import Comp__pres_mgmt_menu_opts from '../../ae_comp__events_menu_opts.svelte';
     import AE_Record_Controls from '$lib/ae_elements/AE_Record_Controls.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
index 29348845..127bfba2 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
@@ -25,7 +25,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__events_menu_nav from '../../../../ae_comp__events_menu_nav.svelte';
     import AE_Record_Controls from '$lib/ae_elements/AE_Record_Controls.svelte';
 
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
index 8437529a..f1882575 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
@@ -21,8 +21,8 @@
 
     import type { key_val } from '$lib/stores/ae_stores';
     // import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     let ae_promises: key_val = $state({});
     // let ae_tmp: key_val = {};
@@ -138,7 +138,7 @@
 
         <ul class="space-y-2 px-4">
             <li class:hidden={!$ae_loc.manager_access || !$ae_loc.edit_mode}>
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_location'}
                     object_id={$lq__event_location_obj?.event_location_id}
                     field_name={'external_id'}
@@ -150,14 +150,14 @@
                 >
                     <strong class="text-sm">External ID:</strong>
                     {$lq__event_location_obj.external_id}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
             </li>
 
             <li
                 class:hidden={!$ae_loc.administrator_access ||
                     !$ae_loc.edit_mode}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_location'}
                     object_id={$lq__event_location_obj?.event_location_id}
                     field_name={'code'}
@@ -169,11 +169,11 @@
                 >
                     <strong class="text-sm">Code:</strong>
                     {$lq__event_location_obj.code}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
             </li>
 
             <li>
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_location'}
                     object_id={$lq__event_location_obj?.event_location_id}
                     field_name={'name'}
@@ -184,10 +184,10 @@
                 >
                     <strong class="text-sm">Name (room or area):</strong>
                     {$lq__event_location_obj.name}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if !$events_loc.pres_mgmt?.hide__location_code}
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_location'}
                         object_id={$lq__event_location_obj?.event_location_id}
                         field_name={'code'}
@@ -203,7 +203,7 @@
                             <Barcode size="1em" />
                             {$lq__event_location_obj.code}
                         </span>
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 {/if}
 
                 <!-- BEGIN: Legacy link -->
@@ -240,7 +240,7 @@
                     {@html $lq__event_location_obj.passcode
                         ? $lq__event_location_obj.passcode
                         : ae_snip.html__not_set}
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_location'}
                         object_id={$lq__event_location_obj?.event_location_id}
                         field_name={'passcode'}
@@ -254,7 +254,7 @@
 
             <li>
                 <div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_location'}
                         object_id={$lq__event_location_obj?.event_location_id}
                         field_name={'description'}
@@ -294,7 +294,7 @@
                         {:else}
                             {@html ae_snip.html__not_set}
                         {/if}
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 </div>
             </li>
         </ul>
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
index fdbc28ea..f31411c6 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
@@ -14,7 +14,7 @@
 
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     let ae_promises: key_val = {};
     let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
index 3c5c1dcd..21ca356e 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
@@ -36,7 +36,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_session_obj_li from '../../../ae_comp__event_session_obj_li_wrapper.svelte';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import Comp_event_device_obj_li from '../device/device/ae_comp__event_device_obj_li_wrapper.svelte';
     import { Barcode, ChevronDown, ChevronUp, Eye, EyeOff, MapPin, MapPinned, Plane, Plus, Send, TriangleAlert } from '@lucide/svelte';
     // if (log_lvl) {
@@ -138,7 +138,7 @@
                         class="h5 rounded-md p-2 bg-gray-200 flex flex-row gap-1 items-center justify-between"
                     >
                         <span>
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'event_location'}
                                 object_id={event_location_obj?.event_location_id}
                                 field_name={'name'}
@@ -152,7 +152,7 @@
                             >
                                 <MapPin size="1em" class="m-1 text-neutral-800/80" />
                                 "{event_location_obj?.name ?? '-- not set --'}"
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
 
                             <!-- "{event_location_obj.name}" -->
                             {#if event_location_obj?.code && !$events_loc.pres_mgmt?.hide__location_code}
@@ -308,7 +308,7 @@
                 {/if}
             </Element_ae_crud> -->
 
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'event_location'}
                                 object_id={event_location_obj?.event_location_id}
                                 field_name={'description'}
@@ -369,7 +369,7 @@
                                 {:else}
                                     {@html ae_snip.html__not_set}
                                 {/if}
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
                         </div>
 
                         {#if !$events_loc.pres_mgmt.show_content__location_devices_sessions || $events_loc.pres_mgmt.show_content__location_devices_sessions == 'default' || $events_loc.pres_mgmt.show_content__location_devices_sessions == 'sessions'}
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
index 850cc7ff..2f3103ea 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
@@ -14,7 +14,7 @@
         events_slct
     } from '$lib/stores/ae_events_stores';
 
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
     let show_modal = $state(false);
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
index 7dcb5288..067336dc 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
@@ -11,7 +11,7 @@
     // Imports (external and then internal)
     // import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     import { liveQuery } from 'dexie';
     import { Modal } from 'flowbite-svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index 725a6068..7898b758 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -17,7 +17,7 @@
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     import {
         ae_loc,
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
index d3a0baaf..e445be2d 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -25,7 +25,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__events_menu_nav from '../../../../ae_comp__events_menu_nav.svelte';
     import AE_Record_Controls from '$lib/ae_elements/AE_Record_Controls.svelte';
 
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
index 449f2db9..35eb9ff8 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
@@ -21,7 +21,7 @@
 
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { api } from '$lib/api/api';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
     import { core_func } from '$lib/ae_core/ae_core_functions';
@@ -147,7 +147,7 @@
             >
         </h3>
         <h3 class="h6 text-lg/6">
-            <Element_ae_obj_field_editor_v3
+            <Element_ae_obj_field_editor
                 object_type={'event_presentation'}
                 object_id={$lq__event_presenter_obj?.event_presentation_id}
                 field_name={'name'}
@@ -163,7 +163,7 @@
                 >
                     "{$lq__event_presenter_obj?.event_presentation_name}"
                 </span>
-            </Element_ae_obj_field_editor_v3>
+            </Element_ae_obj_field_editor>
         </h3>
 
         <h3 class="h6 text-lg/6">
@@ -216,7 +216,7 @@
                 class:hidden={!$ae_loc.trusted_access ||
                     (!$ae_loc.edit_mode && !$ae_loc.manager_access)}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'external_id'}
@@ -232,11 +232,11 @@
                         {@html $lq__event_presenter_obj?.external_id ??
                             ae_snip.html__not_set}
                     </span>
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if $lq__event_presenter_obj?.person_id && $lq__event_presenter_obj.external_id != $lq__event_presenter_obj.person_external_id}
                     <div>
-                        <Element_ae_obj_field_editor_v3
+                        <Element_ae_obj_field_editor
                             object_type={'person'}
                             object_id={$lq__event_presenter_obj.person_id}
                             field_name={'external_id'}
@@ -253,7 +253,7 @@
                                 {@html $lq__event_presenter_obj.person_external_id ??
                                     ae_snip.html__not_set}
                             </span>
-                        </Element_ae_obj_field_editor_v3>
+                        </Element_ae_obj_field_editor>
 
                         <button
                             type="button"
@@ -282,7 +282,7 @@
             >
                 <User size="1em" />
 
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'given_name'}
@@ -293,9 +293,9 @@
                     <span class="font-bold">
                         {$lq__event_presenter_obj.given_name}
                     </span>
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'family_name'}
@@ -307,7 +307,7 @@
                     <span class="font-bold">
                         {$lq__event_presenter_obj.family_name}
                     </span>
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if $lq__event_presenter_obj.person_given_name != $lq__event_presenter_obj.given_name || $lq__event_presenter_obj.person_family_name != $lq__event_presenter_obj.family_name}
                     {#if $lq__event_presenter_obj.person_given_name != $lq__event_presenter_obj.given_name}
@@ -315,7 +315,7 @@
                             <Asterisk size="1em" />
                             <CircleUser size="1em" />
                             given name:
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'person'}
                                 object_id={$lq__event_presenter_obj.person_id}
                                 field_name={'given_name'}
@@ -327,7 +327,7 @@
                                     {@html $lq__event_presenter_obj.person_given_name ??
                                         ae_snip.html__not_set}
                                 </span>
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
 
                             {#if $ae_loc.edit_mode && $ae_loc.trusted_access}
                                 <!-- Sync button: overwrites person.given_name with presenter.given_name -->
@@ -356,7 +356,7 @@
                             <Asterisk size="1em" />
                             <CircleUser size="1em" />
                             family name:
-                            <Element_ae_obj_field_editor_v3
+                            <Element_ae_obj_field_editor
                                 object_type={'person'}
                                 object_id={$lq__event_presenter_obj.person_id}
                                 field_name={'family_name'}
@@ -369,7 +369,7 @@
                                     {@html $lq__event_presenter_obj.person_family_name ??
                                         ae_snip.html__not_set}
                                 </span>
-                            </Element_ae_obj_field_editor_v3>
+                            </Element_ae_obj_field_editor>
 
                             {#if $ae_loc.edit_mode && $ae_loc.trusted_access}
                                 <!-- Sync button: overwrites person.family_name with presenter.family_name -->
@@ -393,7 +393,6 @@
                         </div>
                     {/if}
                 {/if}
-                <!-- $lq__event_presenter_obj.person_given_name != $lq__event_presenter_obj.given_name || $lq__event_presenter_obj.person_family_name != $lq__event_presenter_obj.family_name -->
             </li>
 
             <li
@@ -405,7 +404,7 @@
                         $lq__event_presenter_obj.event_session_id
                     ]}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'email'}
@@ -428,11 +427,11 @@
                         email
                         {@html ae_snip.html__not_set}
                     {/if}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if $lq__event_presenter_obj.person_primary_email && $lq__event_presenter_obj.person_primary_email != $lq__event_presenter_obj.email}
                     <div>
-                        <Element_ae_obj_field_editor_v3
+                        <Element_ae_obj_field_editor
                             object_type={'person'}
                             object_id={$lq__event_presenter_obj.person_id}
                             field_name={'primary_email'}
@@ -455,7 +454,7 @@
                                 email
                                 {@html ae_snip.html__not_set}
                             {/if}
-                        </Element_ae_obj_field_editor_v3>
+                        </Element_ae_obj_field_editor>
 
                         {#if $ae_loc.trusted_access}
                             <!-- Sync button: overwrites person.primary_email with presenter.email -->
@@ -484,7 +483,7 @@
                 class:hidden={!$ae_loc.authenticated_access &&
                     !$lq__event_presenter_obj.affiliations}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'affiliations'}
@@ -502,11 +501,11 @@
                         affiliations
                         {@html ae_snip.html__not_set}
                     {/if}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if $lq__event_presenter_obj.person_id && $lq__event_presenter_obj.person_affiliations != $lq__event_presenter_obj.affiliations}
                     <div>
-                        <Element_ae_obj_field_editor_v3
+                        <Element_ae_obj_field_editor
                             object_type={'person'}
                             object_id={$lq__event_presenter_obj.person_id}
                             field_name={'affiliations'}
@@ -521,7 +520,7 @@
                                 {@html $lq__event_presenter_obj.person_affiliations ??
                                     'affiliations' + ae_snip.html__not_set}
                             </span>
-                        </Element_ae_obj_field_editor_v3>
+                        </Element_ae_obj_field_editor>
 
                         {#if $ae_loc.trusted_access}
                             <!-- Sync button: overwrites person.affiliations with presenter.affiliations -->
@@ -550,7 +549,7 @@
                 class:hidden={!$ae_loc.authenticated_access &&
                     !$lq__event_presenter_obj.professional_title}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'event_presenter'}
                     object_id={$lq__event_presenter_obj?.event_presenter_id}
                     field_name={'professional_title'}
@@ -568,11 +567,11 @@
                         professional title
                         {@html ae_snip.html__not_set}
                     {/if}
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 {#if $lq__event_presenter_obj.person_id && $lq__event_presenter_obj.person_professional_title != $lq__event_presenter_obj.professional_title}
                     <div>
-                        <Element_ae_obj_field_editor_v3
+                        <Element_ae_obj_field_editor
                             object_type={'person'}
                             object_id={$lq__event_presenter_obj.person_id}
                             field_name={'professional_title'}
@@ -589,7 +588,7 @@
                                     ? $lq__event_presenter_obj.person_professional_title
                                     : 'professional title' + ae_snip.html__not_set}
                             </span>
-                        </Element_ae_obj_field_editor_v3>
+                        </Element_ae_obj_field_editor>
 
                         {#if $ae_loc.trusted_access}
                             <!-- Sync button: overwrites person.professional_title with presenter.professional_title -->
@@ -622,7 +621,7 @@
                 Person link:
                 <!-- Allow for linking the presenter to a person record. -->
                 {#if $ae_loc.trusted_access}
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presenter'}
                         object_id={$lq__event_presenter_obj?.event_presenter_id}
                         field_name={'person_id'}
@@ -682,7 +681,7 @@
                                 <span class="hidden group-hover:inline">Re-link</span>
                             </button>
                         {/if}
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 {/if}
 
                 <!-- A sync button to use the person record fields to update the event_presenter fields -->
@@ -835,7 +834,7 @@
                             $lq__event_presenter_obj?.event_presenter_id
                         ])}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'person'}
                     object_id={$lq__event_presenter_obj.person_id}
                     field_name={'passcode'}
@@ -851,7 +850,7 @@
                         {@html $lq__event_presenter_obj.person_passcode ??
                             ae_snip.html__not_set}
                     </span>
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
 
                 <!-- <span class="fas fa-user-secret"></span>
         {$lq__event_presenter_obj.person_passcode} (your passcode)
@@ -871,7 +870,7 @@
                     !$ae_loc.trusted_access ||
                     !$ae_loc.edit_mode}
             >
-                <Element_ae_obj_field_editor_v3
+                <Element_ae_obj_field_editor
                     object_type={'person'}
                     object_id={$lq__event_presenter_obj.person_id}
                     field_name={'external_sys_id'}
@@ -887,7 +886,7 @@
                         {@html $lq__event_presenter_obj.person_external_sys_id ??
                             ae_snip.html__not_set}
                     </span>
-                </Element_ae_obj_field_editor_v3>
+                </Element_ae_obj_field_editor>
             </li>
 
             <!-- The presenters biography. There should be a character counter. -->
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
index 03015d75..b331484a 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
@@ -14,7 +14,7 @@
         events_slct
     } from '$lib/stores/ae_events_stores';
 
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
     let show_modal = $state(false);
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index 677a3fc4..7678e80c 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -29,7 +29,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     // Import components and elements
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import { Check, CheckCircle, LoaderCircle, TriangleAlert, X } from '@lucide/svelte';
     // Local Variables
     let ae_promises: key_val = $state({});
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
index 841bcba4..e7b40ddf 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
@@ -27,7 +27,7 @@
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Sign_in_out from '../../../sign_in_out.svelte';
     import Comp__events_menu_nav from '../../../../ae_comp__events_menu_nav.svelte';
     import AE_Record_Controls from '$lib/ae_elements/AE_Record_Controls.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
index 3bed94e7..2defb8bd 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
@@ -19,7 +19,7 @@
     import { Modal } from 'flowbite-svelte';
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
     import { core_func } from '$lib/ae_core/ae_core_functions';
     import { ae_snip, ae_loc, ae_api } from '$lib/stores/ae_stores';
@@ -104,7 +104,7 @@
             <!-- Session Name: the primary identity check -->
             {#if $lq__event_session_obj}
                 <div>
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_session'}
                         object_id={$lq__event_session_obj.id}
                         field_name={'name'}
@@ -113,7 +113,7 @@
                         on_success={() => events_func.load_ae_obj_id__event_session({api_cfg: $ae_api, event_session_id: $lq__event_session_obj.id})}
                     >
                         <h1 class="text-2xl font-bold leading-snug">{$lq__event_session_obj.name}</h1>
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                     {#if $ae_loc.edit_mode}
                         <span class="badge preset-tonal-surface text-xs mt-1">code: {$lq__event_session_obj.code}</span>
                     {/if}
diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
index 3fa95ca3..e83bf3be 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -34,7 +34,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import Element_ae_obj_field_editor from '$lib/elements/element_ae_obj_field_editor.svelte';
     import Comp_event_presenter_obj_li from '../events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte';
     import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_all.svelte';
     import { Barcode, CalendarDays, Eye, EyeOff, ListOrdered, Plus } from '@lucide/svelte';
@@ -175,7 +175,7 @@
                         )}
                     </span>
 
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
                         field_name={'name'}
@@ -187,10 +187,10 @@
                         <span class="italic">
                             {event_presentation_obj?.name}
                         </span>
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                     <!-- "{event_presentation_obj.name}" -->
 
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
                         field_name={'code'}
@@ -224,7 +224,7 @@
                                 </span>
                             </span>
                         {/if}
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                     <!-- Can not edit the abstract code here at this time. -->
                 </h4>
 
@@ -262,7 +262,7 @@
                         :</span
                     >
                     <CalendarDays size="1em" class="text-success-800-400" />
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
                         field_name={'start_datetime'}
@@ -278,9 +278,9 @@
                             event_presentation_obj.start_datetime,
                             $events_loc.pres_mgmt.time_format
                         )}
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                     -
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
                         field_name={'end_datetime'}
@@ -292,7 +292,7 @@
                             event_presentation_obj.end_datetime,
                             $events_loc.pres_mgmt.time_format
                         )}
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 </div>
 
                 <div
@@ -300,7 +300,7 @@
                         .show_content__presentation_description &&
                         !($ae_loc.trusted_access && $ae_loc.edit_mode)}
                 >
-                    <Element_ae_obj_field_editor_v3
+                    <Element_ae_obj_field_editor
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
                         field_name={'description'}
@@ -369,7 +369,7 @@
             No description provided.
         </div>
     {/if} -->
-                    </Element_ae_obj_field_editor_v3>
+                    </Element_ae_obj_field_editor>
                 </div>
 
                 <!-- Show presenters for this presentation -->
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 54b1737b..f595775a 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -23,7 +23,7 @@
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
     import { events_func } from '$lib/ae_events/ae_events_functions';
 
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Comp__event_obj_qry from './ae_idaa_comp__event_obj_qry.svelte';
     import Comp__event_obj_li_wrapper from './ae_idaa_comp__event_obj_li_wrapper.svelte';
 
diff --git a/src/routes/idaa/+layout.svelte b/src/routes/idaa/+layout.svelte
index 4c2aa91d..2c443b13 100644
--- a/src/routes/idaa/+layout.svelte
+++ b/src/routes/idaa/+layout.svelte
@@ -21,7 +21,7 @@
     } from '$lib/stores/ae_stores';
     import { core_func } from '$lib/ae_core/ae_core_functions';
     import { idaa_loc, idaa_sess, idaa_slct } from '$lib/stores/ae_idaa_stores';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
 
     interface Props {
         /** @type {import('./$types').LayoutData} */
diff --git a/src/routes/journals/+layout.svelte b/src/routes/journals/+layout.svelte
index c8f7e29c..ac919490 100644
--- a/src/routes/journals/+layout.svelte
+++ b/src/routes/journals/+layout.svelte
@@ -17,7 +17,7 @@
         journals_slct,
         journals_trig
     } from '$lib/ae_journals/ae_journals_stores';
-    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
+    import Element_data_store from '$lib/elements/element_data_store.svelte';
     import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
     // *** Setup Svelte properties
diff --git a/src/routes/testing/ae_obj_field_editor_v3/+page.svelte b/src/routes/testing/ae_obj_field_editor_v3/+page.svelte
index 735da5e4..cb0e6971 100644
--- a/src/routes/testing/ae_obj_field_editor_v3/+page.svelte
+++ b/src/routes/testing/ae_obj_field_editor_v3/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import AE_Obj_Field_Editor_V3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
+    import AE_Obj_Field_Editor_V3 from '$lib/elements/element_ae_obj_field_editor.svelte';
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
     import { liveQuery } from 'dexie';
     import { db_journals } from '$lib/ae_journals/db_journals';
     import { load_ae_obj_id__journal } from '$lib/ae_journals/ae_journals__journal';
     import { load_ae_obj_id__journal_entry } from '$lib/ae_journals/ae_journals__journal_entry';
-    import { Database, Edit, FileText, LoaderCircle, RefreshCw, Settings2 } from '@lucide/svelte';
+    import { Database, FileText, LoaderCircle, RefreshCw } from '@lucide/svelte';
     import { onMount } from 'svelte';
 
     let log_lvl = $state(1);
diff --git a/src/routes/testing/data_store_v3/+page.svelte b/src/routes/testing/data_store_v3/+page.svelte
index 9ba1e904..3b8942b8 100644
--- a/src/routes/testing/data_store_v3/+page.svelte
+++ b/src/routes/testing/data_store_v3/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import AE_Element_Data_Store from '$lib/elements/element_data_store_v3.svelte';
+    import AE_Element_Data_Store from '$lib/elements/element_data_store.svelte';
     import { ae_loc } from '$lib/stores/ae_stores';
     import { db_core } from '$lib/ae_core/db_core';
     import { RefreshCw, Trash2 } from '@lucide/svelte';