diff --git a/docs/roles-and-permissions-architecture.md b/docs/roles-and-permissions-architecture.md
index fa45d86..b44604b 100644
--- a/docs/roles-and-permissions-architecture.md
+++ b/docs/roles-and-permissions-architecture.md
@@ -93,8 +93,8 @@ Five predefined roles stored in the `roles` table:
 Control CRUD operations on:
 - User (credentials, profile)
 - Member (member data)
-- Property (custom field values)
-- PropertyType (custom field definitions)
+- CustomFieldValue (custom field values)
+- CustomField (custom field definitions)
 - Role (role management)
 
 **4. Page-Level Permissions**
@@ -111,7 +111,7 @@ Three scope levels for permissions:
 - **:own** - Only records where `record.id == user.id` (for User resource)
 - **:linked** - Only records linked to user via relationships
   - Member: `member.user_id == user.id`
-  - Property: `property.member.user_id == user.id`
+  - CustomFieldValue: `custom_field_value.member.user_id == user.id`
 - **:all** - All records, no filtering
 
 **6. Special Cases**
@@ -414,7 +414,7 @@ defmodule Mv.Authorization.PermissionSets do
   ## Permission Sets
   
   1. **own_data** - Default for "Mitglied" role
-     - Can only access own user data and linked member/properties
+     - Can only access own user data and linked member/custom field values
      - Cannot create new members or manage system
   
   2. **read_only** - For "Vorstand" and "Buchhaltung" roles
@@ -423,11 +423,11 @@ defmodule Mv.Authorization.PermissionSets do
   
   3. **normal_user** - For "Kassenwart" role
      - Create/Read/Update members (no delete), full CRUD on properties
-     - Cannot manage property types or users
+     - Cannot manage custom fields or users
   
   4. **admin** - For "Admin" role
      - Unrestricted access to all resources
-     - Can manage users, roles, property types
+     - Can manage users, roles, custom fields
   
   ## Usage
   
@@ -500,12 +500,12 @@ defmodule Mv.Authorization.PermissionSets do
         %{resource: "Member", action: :read, scope: :linked, granted: true},
         %{resource: "Member", action: :update, scope: :linked, granted: true},
         
-        # Property: Can read/update properties of linked member
-        %{resource: "Property", action: :read, scope: :linked, granted: true},
-        %{resource: "Property", action: :update, scope: :linked, granted: true},
+        # CustomFieldValue: Can read/update custom field values of linked member
+        %{resource: "CustomFieldValue", action: :read, scope: :linked, granted: true},
+        %{resource: "CustomFieldValue", action: :update, scope: :linked, granted: true},
         
-        # PropertyType: Can read all (needed for forms)
-        %{resource: "PropertyType", action: :read, scope: :all, granted: true}
+        # CustomField: Can read all (needed for forms)
+        %{resource: "CustomField", action: :read, scope: :all, granted: true}
       ],
       pages: [
         "/",                  # Home page
@@ -525,17 +525,17 @@ defmodule Mv.Authorization.PermissionSets do
         # Member: Can read all members, no modifications
         %{resource: "Member", action: :read, scope: :all, granted: true},
         
-        # Property: Can read all properties
-        %{resource: "Property", action: :read, scope: :all, granted: true},
+        # CustomFieldValue: Can read all custom field values
+        %{resource: "CustomFieldValue", action: :read, scope: :all, granted: true},
         
-        # PropertyType: Can read all
-        %{resource: "PropertyType", action: :read, scope: :all, granted: true}
+        # CustomField: Can read all
+        %{resource: "CustomField", action: :read, scope: :all, granted: true}
       ],
       pages: [
         "/",
         "/members",           # Member list
         "/members/:id",       # Member detail
-        "/properties",        # Property overview
+        "/custom_field_values" # Custom field values overview
         "/profile"            # Own profile
       ]
     }
@@ -554,14 +554,14 @@ defmodule Mv.Authorization.PermissionSets do
         %{resource: "Member", action: :update, scope: :all, granted: true},
         # Note: destroy intentionally omitted for safety
         
-        # Property: Full CRUD
-        %{resource: "Property", action: :read, scope: :all, granted: true},
-        %{resource: "Property", action: :create, scope: :all, granted: true},
-        %{resource: "Property", action: :update, scope: :all, granted: true},
-        %{resource: "Property", action: :destroy, scope: :all, granted: true},
+        # CustomFieldValue: Full CRUD
+        %{resource: "CustomFieldValue", action: :read, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :create, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :update, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :destroy, scope: :all, granted: true},
         
-        # PropertyType: Read only (admin manages definitions)
-        %{resource: "PropertyType", action: :read, scope: :all, granted: true}
+        # CustomField: Read only (admin manages definitions)
+        %{resource: "CustomField", action: :read, scope: :all, granted: true}
       ],
       pages: [
         "/",
@@ -569,9 +569,9 @@ defmodule Mv.Authorization.PermissionSets do
         "/members/new",        # Create member
         "/members/:id",
         "/members/:id/edit",   # Edit member
-        "/properties",
-        "/properties/new",
-        "/properties/:id/edit",
+        "/custom_field_values",
+        "/custom_field_values/new",
+        "/custom_field_values/:id/edit",
         "/profile"
       ]
     }
@@ -592,17 +592,17 @@ defmodule Mv.Authorization.PermissionSets do
         %{resource: "Member", action: :update, scope: :all, granted: true},
         %{resource: "Member", action: :destroy, scope: :all, granted: true},
         
-        # Property: Full CRUD
-        %{resource: "Property", action: :read, scope: :all, granted: true},
-        %{resource: "Property", action: :create, scope: :all, granted: true},
-        %{resource: "Property", action: :update, scope: :all, granted: true},
-        %{resource: "Property", action: :destroy, scope: :all, granted: true},
+        # CustomFieldValue: Full CRUD
+        %{resource: "CustomFieldValue", action: :read, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :create, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :update, scope: :all, granted: true},
+        %{resource: "CustomFieldValue", action: :destroy, scope: :all, granted: true},
         
-        # PropertyType: Full CRUD (admin manages custom field definitions)
-        %{resource: "PropertyType", action: :read, scope: :all, granted: true},
-        %{resource: "PropertyType", action: :create, scope: :all, granted: true},
-        %{resource: "PropertyType", action: :update, scope: :all, granted: true},
-        %{resource: "PropertyType", action: :destroy, scope: :all, granted: true},
+        # CustomField: Full CRUD (admin manages custom field definitions)
+        %{resource: "CustomField", action: :read, scope: :all, granted: true},
+        %{resource: "CustomField", action: :create, scope: :all, granted: true},
+        %{resource: "CustomField", action: :update, scope: :all, granted: true},
+        %{resource: "CustomField", action: :destroy, scope: :all, granted: true},
         
         # Role: Full CRUD (admin manages roles)
         %{resource: "Role", action: :read, scope: :all, granted: true},
@@ -677,9 +677,9 @@ Quick reference table showing what each permission set allows:
 | **User** (all) | - | - | - | R, C, U, D |
 | **Member** (linked) | R, U | - | - | - |
 | **Member** (all) | - | R | R, C, U | R, C, U, D |
-| **Property** (linked) | R, U | - | - | - |
-| **Property** (all) | - | R | R, C, U, D | R, C, U, D |
-| **PropertyType** (all) | R | R | R | R, C, U, D |
+| **CustomFieldValue** (linked) | R, U | - | - | - |
+| **CustomFieldValue** (all) | - | R | R, C, U, D | R, C, U, D |
+| **CustomField** (all) | R | R | R | R, C, U, D |
 | **Role** (all) | - | - | - | R, C, U, D |
 
 **Legend:** R=Read, C=Create, U=Update, D=Destroy
@@ -715,7 +715,7 @@ defmodule Mv.Authorization.Checks.HasPermission do
   - **:own** - Filters to records where record.id == actor.id
   - **:linked** - Filters based on resource type:
     - Member: member.user_id == actor.id
-    - Property: property.member.user_id == actor.id (traverses relationship!)
+    - CustomFieldValue: custom_field_value.member.user_id == actor.id (traverses relationship!)
   
   ## Error Handling
   
@@ -802,8 +802,8 @@ defmodule Mv.Authorization.Checks.HasPermission do
         # Member.user_id == actor.id (direct relationship)
         {:filter, expr(user_id == ^actor.id)}
       
-      "Property" -> 
-        # Property.member.user_id == actor.id (traverse through member!)
+      "CustomFieldValue" -> 
+        # CustomFieldValue.member.user_id == actor.id (traverse through member!)
         {:filter, expr(member.user_id == ^actor.id)}
       
       _ -> 
@@ -832,7 +832,7 @@ end
 
 **Key Design Decisions:**
 
-1. **Resource-Specific :linked Scope:** Property needs to traverse `member` relationship to check `user_id`
+1. **Resource-Specific :linked Scope:** CustomFieldValue needs to traverse `member` relationship to check `user_id`
 2. **Error Handling:** All errors log for debugging but return generic forbidden to user
 3. **Module Name Extraction:** Uses `Module.split() |> List.last()` to match against PermissionSets strings
 4. **Pure Function:** No side effects, deterministic, easily testable
@@ -966,21 +966,21 @@ end
 
 *Email editing has additional validation (see Special Cases)
 
-### Property Resource Policies
+### CustomFieldValue Resource Policies
 
-**Location:** `lib/mv/membership/property.ex`
+**Location:** `lib/mv/membership/custom_field_value.ex`
 
-**Special Case:** Users can access properties of their linked member.
+**Special Case:** Users can access custom field values of their linked member.
 
 ```elixir
-defmodule Mv.Membership.Property do
+defmodule Mv.Membership.CustomFieldValue do
   use Ash.Resource, ...
   
   policies do
-    # SPECIAL CASE: Users can access properties of their linked member
+    # SPECIAL CASE: Users can access custom field values of their linked member
     # Note: This traverses the member relationship!
     policy action_type([:read, :update]) do
-      description "Users can access properties of their linked member"
+      description "Users can access custom field values of their linked member"
       authorize_if expr(member.user_id == ^actor(:id))
     end
     
@@ -1010,18 +1010,18 @@ end
 | Create | ❌ | ❌ | ✅ | ❌ | ✅ |
 | Destroy | ❌ | ❌ | ✅ | ❌ | ✅ |
 
-### PropertyType Resource Policies
+### CustomField Resource Policies
 
-**Location:** `lib/mv/membership/property_type.ex`
+**Location:** `lib/mv/membership/custom_field.ex`
 
 **No Special Cases:** All users can read, only admin can write.
 
 ```elixir
-defmodule Mv.Membership.PropertyType do
+defmodule Mv.Membership.CustomField do
   use Ash.Resource, ...
   
   policies do
-    # All authenticated users can read property types (needed for forms)
+    # All authenticated users can read custom fields (needed for forms)
     # Write operations are admin-only
     policy action_type([:read, :create, :update, :destroy]) do
       description "Check permissions from user's role"
@@ -1308,12 +1308,12 @@ end
 - ❌ Cannot access: `/members`, `/members/new`, `/admin/roles`
 
 **Vorstand (read_only):**
-- ✅ Can access: `/`, `/members`, `/members/123`, `/properties`, `/profile`
+- ✅ Can access: `/`, `/members`, `/members/123`, `/custom_field_values`, `/profile`
 - ❌ Cannot access: `/members/new`, `/members/123/edit`, `/admin/roles`
 
 **Kassenwart (normal_user):**
-- ✅ Can access: `/`, `/members`, `/members/new`, `/members/123/edit`, `/properties`, `/profile`
-- ❌ Cannot access: `/admin/roles`, `/admin/property_types/new`
+- ✅ Can access: `/`, `/members`, `/members/new`, `/members/123/edit`, `/custom_field_values`, `/profile`
+- ❌ Cannot access: `/admin/roles`, `/admin/custom_fields/new`
 
 **Admin:**
 - ✅ Can access: `*` (all pages, including `/admin/roles`)
@@ -1479,9 +1479,9 @@ defmodule MvWeb.Authorization do
         # Direct relationship: member.user_id
         Map.get(record, :user_id) == user.id
       
-      "Property" -> 
-        # Need to traverse: property.member.user_id
-        # Note: In UI, property should have member preloaded
+      "CustomFieldValue" -> 
+        # Need to traverse: custom_field_value.member.user_id
+        # Note: In UI, custom_field_value should have member preloaded
         case Map.get(record, :member) do
           %{user_id: member_user_id} -> member_user_id == user.id
           _ -> false
@@ -1569,7 +1569,7 @@ end
       <span>Admin</span>
       <ul>
         <li><.link navigate="/admin/roles">Roles</.link></li>
-        <li><.link navigate="/admin/property_types">Property Types</.link></li>
+        <li><.link navigate="/admin/custom_fields">Custom Fields</.link></li>
       </ul>
     </div>
   <% end %>
@@ -2409,8 +2409,8 @@ The `HasPermission` check extracts resource names via `Module.split() |> List.la
 |------------|------------------------|
 | `Mv.Accounts.User` | "User" |
 | `Mv.Membership.Member` | "Member" |
-| `Mv.Membership.Property` | "Property" |
-| `Mv.Membership.PropertyType` | "PropertyType" |
+| `Mv.Membership.CustomFieldValue` | "CustomFieldValue" |
+| `Mv.Membership.CustomField` | "CustomField" |
 | `Mv.Authorization.Role` | "Role" |
 
 These strings must match exactly in `PermissionSets` module.
@@ -2450,7 +2450,7 @@ These strings must match exactly in `PermissionSets` module.
 
 **Integration:**
 - [ ] One complete user journey per role
-- [ ] Cross-resource scenarios (e.g., Member -> Property)
+- [ ] Cross-resource scenarios (e.g., Member -> CustomFieldValue)
 - [ ] Special cases in context (e.g., linked member email during full edit flow)
 
 ### Useful Commands
diff --git a/docs/roles-and-permissions-implementation-plan.md b/docs/roles-and-permissions-implementation-plan.md
index 0b173fa..2c29b8d 100644
--- a/docs/roles-and-permissions-implementation-plan.md
+++ b/docs/roles-and-permissions-implementation-plan.md
@@ -53,7 +53,7 @@ This document defines the implementation plan for the **MVP (Phase 1)** of the R
 Hardcoded in `Mv.Authorization.PermissionSets` module:
 
 1. **own_data** - User can only access their own data (default for "Mitglied")
-2. **read_only** - Read access to all members/properties (for "Vorstand", "Buchhaltung")
+2. **read_only** - Read access to all members/custom field values (for "Vorstand", "Buchhaltung")
 3. **normal_user** - Create/Read/Update members (no delete), full CRUD on properties (for "Kassenwart")
 4. **admin** - Unrestricted access including user/role management (for "Admin")
 
@@ -77,7 +77,7 @@ Stored in database `roles` table, each referencing a `permission_set_name`:
 - ✅ Hardcoded PermissionSets module with 4 permission sets
 - ✅ Role database table and CRUD interface
 - ✅ Custom Ash Policy Check (`HasPermission`) that reads from PermissionSets
-- ✅ Policies on all resources (Member, User, Property, PropertyType, Role)
+- ✅ Policies on all resources (Member, User, CustomFieldValue, CustomField, Role)
 - ✅ Page-level permissions via Phoenix Plug
 - ✅ UI authorization helpers for conditional rendering
 - ✅ Special case: Member email validation for linked users
@@ -228,32 +228,32 @@ Create the core `PermissionSets` module that defines all four permission sets wi
 - Resources:
   - User: read/update :own
   - Member: read/update :linked
-  - Property: read/update :linked
-  - PropertyType: read :all
+  - CustomFieldValue: read/update :linked
+  - CustomField: read :all
 - Pages: `["/", "/profile", "/members/:id"]`
 
 **2. read_only (Vorstand, Buchhaltung):**
 - Resources:
   - User: read :own, update :own
   - Member: read :all
-  - Property: read :all
-  - PropertyType: read :all
-- Pages: `["/", "/members", "/members/:id", "/properties"]`
+  - CustomFieldValue: read :all
+  - CustomField: read :all
+- Pages: `["/", "/members", "/members/:id", "/custom_field_values"]`
 
 **3. normal_user (Kassenwart):**
 - Resources:
   - User: read/update :own
   - Member: read/create/update :all (no destroy for safety)
-  - Property: read/create/update/destroy :all
-  - PropertyType: read :all
-- Pages: `["/", "/members", "/members/new", "/members/:id", "/members/:id/edit", "/properties", "/properties/new", "/properties/:id/edit"]`
+  - CustomFieldValue: read/create/update/destroy :all
+  - CustomField: read :all
+- Pages: `["/", "/members", "/members/new", "/members/:id", "/members/:id/edit", "/custom_field_values", "/custom_field_values/new", "/custom_field_values/:id/edit"]`
 
 **4. admin:**
 - Resources:
   - User: read/update/destroy :all
   - Member: read/create/update/destroy :all
-  - Property: read/create/update/destroy :all
-  - PropertyType: read/create/update/destroy :all
+  - CustomFieldValue: read/create/update/destroy :all
+  - CustomField: read/create/update/destroy :all
   - Role: read/create/update/destroy :all
 - Pages: `["*"]` (wildcard = all pages)
 
@@ -276,10 +276,10 @@ Create the core `PermissionSets` module that defines all four permission sets wi
 
 **Permission Content Tests:**
 - `:own_data` allows User read/update with scope :own
-- `:own_data` allows Member/Property read/update with scope :linked
-- `:read_only` allows Member/Property read with scope :all
-- `:read_only` does NOT allow Member/Property create/update/destroy
-- `:normal_user` allows Member/Property full CRUD with scope :all
+- `:own_data` allows Member/CustomFieldValue read/update with scope :linked
+- `:read_only` allows Member/CustomFieldValue read with scope :all
+- `:read_only` does NOT allow Member/CustomFieldValue create/update/destroy
+- `:normal_user` allows Member/CustomFieldValue full CRUD with scope :all
 - `:admin` allows everything with scope :all
 - `:admin` has wildcard page permission "*"
 
@@ -387,7 +387,7 @@ Create the core custom Ash Policy Check that reads permissions from the `Permiss
    - `:own` → `{:filter, expr(id == ^actor.id)}`
    - `:linked` → resource-specific logic:
      - Member: `{:filter, expr(user_id == ^actor.id)}`
-     - Property: `{:filter, expr(member.user_id == ^actor.id)}` (traverse relationship!)
+     - CustomFieldValue: `{:filter, expr(member.user_id == ^actor.id)}` (traverse relationship!)
 6. Handle errors gracefully:
    - No actor → `{:error, :no_actor}`
    - No role → `{:error, :no_role}`
@@ -401,7 +401,7 @@ Create the core custom Ash Policy Check that reads permissions from the `Permiss
 - [ ] Check module implements `Ash.Policy.Check` behavior
 - [ ] `match?/3` correctly evaluates permissions from PermissionSets
 - [ ] Scope filters work correctly (:all, :own, :linked)
-- [ ] `:linked` scope handles Member and Property differently
+- [ ] `:linked` scope handles Member and CustomFieldValue differently
 - [ ] Errors are handled gracefully (no crashes)
 - [ ] Authorization failures are logged
 - [ ] Module is well-documented
@@ -425,7 +425,7 @@ Create the core custom Ash Policy Check that reads permissions from the `Permiss
 
 **Scope Application Tests - :linked:**
 - Actor with scope :linked can access Member where member.user_id == actor.id
-- Actor with scope :linked can access Property where property.member.user_id == actor.id (relationship traversal!)
+- Actor with scope :linked can access CustomFieldValue where custom_field_value.member.user_id == actor.id (relationship traversal!)
 - Actor with scope :linked cannot access unlinked member
 - Query correctly filters based on user_id relationship
 
@@ -581,7 +581,7 @@ Add authorization policies to the User resource. Special case: Users can always
 
 ---
 
-#### Issue #9: Property Resource Policies
+#### Issue #9: CustomFieldValue Resource Policies
 
 **Size:** M (2 days)  
 **Dependencies:** #6 (HasPermission check)  
@@ -590,20 +590,20 @@ Add authorization policies to the User resource. Special case: Users can always
 
 **Description:**
 
-Add authorization policies to the Property resource. Properties are linked to members, which are linked to users.
+Add authorization policies to the CustomFieldValue resource. CustomFieldValues are linked to members, which are linked to users.
 
 **Tasks:**
 
-1. Open `lib/mv/membership/property.ex`
+1. Open `lib/mv/membership/custom_field_value.ex`
 2. Add `policies` block
-3. Add special policy: Allow user to read/update properties of their linked member
+3. Add special policy: Allow user to read/update custom field values of their linked member
    ```elixir
    policy action_type([:read, :update]) do
      authorize_if expr(member.user_id == ^actor(:id))
    end
    ```
 4. Add general policy: Check HasPermission
-5. Ensure Property preloads :member relationship for scope checks
+5. Ensure CustomFieldValue preloads :member relationship for scope checks
 6. Preload :role relationship for actor
 
 **Policy Order:**
@@ -620,27 +620,27 @@ Add authorization policies to the Property resource. Properties are linked to me
 
 **Test Strategy (TDD):**
 
-**Linked Properties Tests (:own_data):**
-- User can read properties of their linked member
-- User can update properties of their linked member
-- User cannot read properties of unlinked members
-- Verify relationship traversal works (property.member.user_id)
+**Linked CustomFieldValues Tests (:own_data):**
+- User can read custom field values of their linked member
+- User can update custom field values of their linked member
+- User cannot read custom field values of unlinked members
+- Verify relationship traversal works (custom_field_value.member.user_id)
 
 **Read-Only Tests:**
-- User with :read_only can read all properties
-- User with :read_only cannot create/update properties
+- User with :read_only can read all custom field values
+- User with :read_only cannot create/update custom field values
 
 **Normal User Tests:**
-- User with :normal_user can CRUD properties
+- User with :normal_user can CRUD custom field values
 
 **Admin Tests:**
 - Admin can perform all operations
 
-**Test File:** `test/mv/membership/property_policies_test.exs`
+**Test File:** `test/mv/membership/custom_field_value_policies_test.exs`
 
 ---
 
-#### Issue #10: PropertyType Resource Policies
+#### Issue #10: CustomField Resource Policies
 
 **Size:** S (1 day)  
 **Dependencies:** #6 (HasPermission check)  
@@ -649,11 +649,11 @@ Add authorization policies to the Property resource. Properties are linked to me
 
 **Description:**
 
-Add authorization policies to the PropertyType resource. PropertyTypes are admin-managed, but readable by all.
+Add authorization policies to the CustomField resource. CustomFields are admin-managed, but readable by all.
 
 **Tasks:**
 
-1. Open `lib/mv/membership/property_type.ex`
+1. Open `lib/mv/membership/custom_field.ex`
 2. Add `policies` block
 3. Add read policy: All authenticated users can read (scope :all)
 4. Add write policies: Only admin can create/update/destroy
@@ -661,27 +661,27 @@ Add authorization policies to the PropertyType resource. PropertyTypes are admin
 
 **Acceptance Criteria:**
 
-- [ ] All users can read property types
-- [ ] Only admin can create/update/destroy property types
+- [ ] All users can read custom fields
+- [ ] Only admin can create/update/destroy custom fields
 - [ ] Policies tested
 
 **Test Strategy (TDD):**
 
 **Read Access (All Roles):**
-- User with :own_data can read all property types
-- User with :read_only can read all property types
-- User with :normal_user can read all property types
-- User with :admin can read all property types
+- User with :own_data can read all custom fields
+- User with :read_only can read all custom fields
+- User with :normal_user can read all custom fields
+- User with :admin can read all custom fields
 
 **Write Access (Admin Only):**
-- Non-admin cannot create property type (Forbidden)
-- Non-admin cannot update property type (Forbidden)
-- Non-admin cannot destroy property type (Forbidden)
-- Admin can create property type
-- Admin can update property type
-- Admin can destroy property type
+- Non-admin cannot create custom field (Forbidden)
+- Non-admin cannot update custom field (Forbidden)
+- Non-admin cannot destroy custom field (Forbidden)
+- Admin can create custom field
+- Admin can update custom field
+- Admin can destroy custom field
 
-**Test File:** `test/mv/membership/property_type_policies_test.exs`
+**Test File:** `test/mv/membership/custom_field_policies_test.exs`
 
 ---
 
@@ -924,7 +924,7 @@ Create helper functions for UI-level authorization checks. These will be used in
    ```
 5. All functions use `PermissionSets.get_permissions/1` (same logic as HasPermission)
 6. All functions handle nil user gracefully (return false)
-7. Implement resource-specific scope checking (Member vs Property for :linked)
+7. Implement resource-specific scope checking (Member vs CustomFieldValue for :linked)
 8. Add comprehensive `@doc` with template examples
 9. Import helper in `mv_web.ex` `html_helpers` section
 
@@ -957,9 +957,9 @@ Create helper functions for UI-level authorization checks. These will be used in
 **can?/3 with Record Struct - Scope :linked:**
 - User can update linked Member (member.user_id == user.id)
 - User cannot update unlinked Member
-- User can update Property of linked Member (property.member.user_id == user.id)
-- User cannot update Property of unlinked Member
-- Scope checking is resource-specific (Member vs Property)
+- User can update CustomFieldValue of linked Member (custom_field_value.member.user_id == user.id)
+- User cannot update CustomFieldValue of unlinked Member
+- Scope checking is resource-specific (Member vs CustomFieldValue)
 
 **can_access_page?/2:**
 - User with page in list can access (returns true)
@@ -1046,7 +1046,7 @@ Update Role management LiveViews to use authorization helpers for conditional re
 
 **Description:**
 
-Update all existing LiveViews (Member, User, Property, PropertyType) to use authorization helpers for conditional rendering.
+Update all existing LiveViews (Member, User, CustomFieldValue, CustomField) to use authorization helpers for conditional rendering.
 
 **Tasks:**
 
@@ -1061,10 +1061,10 @@ Update all existing LiveViews (Member, User, Property, PropertyType) to use auth
    - Show: Only show other users if admin, always show own profile
    - Edit: Only allow editing own profile or admin editing anyone
 
-3. **Property LiveViews:**
+3. **CustomFieldValue LiveViews:**
    - Similar to Member (hide create/edit/delete based on permissions)
 
-4. **PropertyType LiveViews:**
+4. **CustomField LiveViews:**
    - All users can view
    - Only admin can create/edit/delete
 
@@ -1110,13 +1110,13 @@ Update all existing LiveViews (Member, User, Property, PropertyType) to use auth
 - Vorstand: Sees "Home", "Members" (read-only), "Profile"
 - Kassenwart: Sees "Home", "Members", "Properties", "Profile"
 - Buchhaltung: Sees "Home", "Members" (read-only), "Profile"
-- Admin: Sees "Home", "Members", "Properties", "Property Types", "Admin", "Profile"
+- Admin: Sees "Home", "Members", "Custom Field Values", "Custom Fields", "Admin", "Profile"
 
 **Test Files:**
 - `test/mv_web/live/member_live_authorization_test.exs`
 - `test/mv_web/live/user_live_authorization_test.exs`
-- `test/mv_web/live/property_live_authorization_test.exs`
-- `test/mv_web/live/property_type_live_authorization_test.exs`
+- `test/mv_web/live/custom_field_value_live_authorization_test.exs`
+- `test/mv_web/live/custom_field_live_authorization_test.exs`
 - `test/mv_web/components/navbar_authorization_test.exs`
 
 ---
@@ -1192,7 +1192,7 @@ Write comprehensive integration tests that follow complete user journeys for eac
 4. Can edit any member (except email if linked - see special case)
 5. Cannot delete member
 6. Can manage properties
-7. Cannot manage property types (read-only)
+7. Cannot manage custom fields (read-only)
 8. Cannot access /admin/roles
 
 **Buchhaltung Journey:**
@@ -1266,7 +1266,7 @@ Write comprehensive integration tests that follow complete user journeys for eac
         │                    │                     │
    ┌────▼─────┐       ┌──────▼──────┐             │
    │ Issue #9 │       │  Issue #10  │             │
-   │ Property │       │  PropType   │             │
+   │ CustomFieldValue │       │  CustomField   │             │
    │ Policies │       │  Policies   │             │
    └────┬─────┘       └──────┬──────┘             │
         │                    │                     │
@@ -1384,8 +1384,8 @@ test/
 ├── mv/membership/
 │   ├── member_policies_test.exs                  # Issue #7
 │   ├── member_email_validation_test.exs          # Issue #12
-│   ├── property_policies_test.exs                # Issue #9
-│   └── property_type_policies_test.exs           # Issue #10
+│   ├── custom_field_value_policies_test.exs                # Issue #9
+│   └── custom_field_policies_test.exs           # Issue #10
 ├── mv_web/
 │   ├── authorization_test.exs                    # Issue #14
 │   ├── plugs/
@@ -1395,8 +1395,8 @@ test/
 │       ├── role_live_authorization_test.exs      # Issue #15
 │       ├── member_live_authorization_test.exs    # Issue #16
 │       ├── user_live_authorization_test.exs      # Issue #16
-│       ├── property_live_authorization_test.exs  # Issue #16
-│       └── property_type_live_authorization_test.exs # Issue #16
+│       ├── custom_field_value_live_authorization_test.exs  # Issue #16
+│       └── custom_field_live_authorization_test.exs # Issue #16
 ├── integration/
 │   ├── mitglied_journey_test.exs                 # Issue #17
 │   ├── vorstand_journey_test.exs                 # Issue #17
diff --git a/docs/roles-and-permissions-overview.md b/docs/roles-and-permissions-overview.md
index 191e8b7..86e7273 100644
--- a/docs/roles-and-permissions-overview.md
+++ b/docs/roles-and-permissions-overview.md
@@ -201,7 +201,7 @@ When runtime permission editing becomes a business requirement, migrate to Appro
 
 **Resource Level (MVP):**
 - Controls create, read, update, destroy actions on resources
-- Resources: Member, User, Property, PropertyType, Role
+- Resources: Member, User, CustomFieldValue, CustomField, Role
 
 **Page Level (MVP):**
 - Controls access to LiveView pages
@@ -280,7 +280,7 @@ Contains:
 Each Permission Set contains:
 
 **Resources:** List of resource permissions
-- resource: "Member", "User", "Property", etc.
+- resource: "Member", "User", "CustomFieldValue", etc.
 - action: :read, :create, :update, :destroy
 - scope: :own, :linked, :all
 - granted: true/false