diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
index 172cfd3..71bdd03 100644
--- a/lib/mv_web/live/custom_field_live/form_component.ex
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -26,12 +26,12 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
             type="button"
             phx-click="cancel"
             phx-target={@myself}
-            aria-label={gettext("Back to custom field overview")}
+            aria-label={gettext("Back to settings")}
           >
             <.icon name="hero-arrow-left" class="w-4 h-4" />
           </.button>
           <h3 class="card-title">
-            {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
+            {if @custom_field, do: gettext("Edit Data Field"), else: gettext("New Data Field")}
           </h3>
         </div>
 
@@ -66,7 +66,7 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
               {gettext("Cancel")}
             </.button>
             <.button phx-disable-with={gettext("Saving...")} variant="primary">
-              {gettext("Save Custom Field")}
+              {gettext("Save Data Field")}
             </.button>
           </div>
         </.form>
diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex
index a11cc57..5f26f78 100644
--- a/lib/mv_web/live/custom_field_live/index_component.ex
+++ b/lib/mv_web/live/custom_field_live/index_component.ex
@@ -29,7 +29,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
             phx-click="new_custom_field"
             phx-target={@myself}
           >
-            <.icon name="hero-plus" /> {gettext("New Custom Field")}
+            <.icon name="hero-plus" /> {gettext("New Data Field")}
           </.button>
         </div>
       </div>
@@ -111,7 +111,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
       <%!-- Delete Confirmation Modal --%>
       <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
         <div class="modal-box">
-          <h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3>
+          <h3 class="text-lg font-bold">{gettext("Delete Data Field")}</h3>
 
           <div class="py-4 space-y-4">
             <div class="alert alert-warning">
diff --git a/lib/mv_web/live/custom_field_value_live/show.ex b/lib/mv_web/live/custom_field_value_live/show.ex
index 42e9f43..7a3f678 100644
--- a/lib/mv_web/live/custom_field_value_live/show.ex
+++ b/lib/mv_web/live/custom_field_value_live/show.ex
@@ -26,7 +26,7 @@ defmodule MvWeb.CustomFieldValueLive.Show do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
-        Custom field value {@custom_field_value.id}
+        Data field value {@custom_field_value.id}
         <:subtitle>This is a custom_field_value record from your database.</:subtitle>
 
         <:actions>
@@ -62,6 +62,6 @@ defmodule MvWeb.CustomFieldValueLive.Show do
      |> assign(:custom_field_value, Ash.get!(Mv.Membership.CustomFieldValue, id))}
   end
 
-  defp page_title(:show), do: "Show Custom field value"
-  defp page_title(:edit), do: "Edit Custom field value"
+  defp page_title(:show), do: "Show data field value"
+  defp page_title(:edit), do: "Edit data field value"
 end
diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex
index 3696880..a4332d3 100644
--- a/lib/mv_web/live/global_settings_live.ex
+++ b/lib/mv_web/live/global_settings_live.ex
@@ -118,12 +118,12 @@ defmodule MvWeb.GlobalSettingsLive do
     {:noreply,
      socket
      |> assign(:active_editing_section, nil)
-     |> put_flash(:info, gettext("Custom field %{action} successfully", action: action))}
+     |> put_flash(:info, gettext("Data field %{action} successfully", action: action))}
   end
 
   @impl true
   def handle_info({:custom_field_deleted, _custom_field}, socket) do
-    {:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))}
+    {:noreply, put_flash(socket, :info, gettext("Data field deleted successfully"))}
   end
 
   @impl true
@@ -132,7 +132,7 @@ defmodule MvWeb.GlobalSettingsLive do
      put_flash(
        socket,
        :error,
-       gettext("Failed to delete custom field: %{error}", error: inspect(error))
+       gettext("Failed to delete data field: %{error}", error: inspect(error))
      )}
   end
 
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 2bba1cd..6b2bc04 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -608,11 +608,6 @@ msgstr "Wähle ein Benutzerdefiniertes Feld"
 msgid "Custom field"
 msgstr "Benutzerdefinierte Felder"
 
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field %{action} successfully"
-msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
@@ -646,11 +641,6 @@ msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld z
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
 
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format
-msgid "Delete Custom Field"
-msgstr "Benutzerdefiniertes Feld löschen"
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
@@ -1249,32 +1239,6 @@ msgstr "Alle auswählen"
 msgid "Select none"
 msgstr "Keine auswählen"
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Back to custom field overview"
-msgstr "Zurück zur Felderliste"
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom field deleted successfully"
-msgstr "Benutzerdefiniertes Feld erfolgreich gelöscht"
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit Custom Field"
-msgstr "Benutzerdefiniertes Feld bearbeiten"
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Failed to delete custom field: %{error}"
-msgstr "Konnte Feld nicht löschen: %{error}"
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom Field"
-msgstr "Neues Benutzerdefiniertes Feld"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Slug does not match. Deletion cancelled."
@@ -1726,11 +1690,6 @@ msgstr "Zyklen regenerieren"
 msgid "Regenerating..."
 msgstr "Regeneriere..."
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Custom Field"
-msgstr "Benutzerdefiniertes Feld speichern"
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Custom Field Value"
@@ -1857,6 +1816,47 @@ msgstr "Spalten ein-/ausblenden"
 msgid "The cycle will be calculated based on this date and the interval."
 msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
 
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Back to settings"
+msgstr "Zurück zu den Einstellungen"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Data field %{action} successfully"
+msgstr "Datenfeld erfolgreich %{action}"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Data field deleted successfully"
+msgstr "Datenfeld erfolgreich gelöscht"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Delete Data Field"
+msgstr "Datenfeld löschen"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Data Field"
+msgstr "Datenfeld bearbeiten"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Failed to delete data field: %{error}"
+msgstr "Konnte Datenfeld nicht löschen: %{error}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Data Field"
+msgstr "Neues Datenfeld"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save Data Field"
+msgstr "Datenfeld speichern"
+
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Show current cycle"
@@ -1992,6 +1992,11 @@ msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
 #~ msgid "Cycle Period"
 #~ msgstr "Zyklus"
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Back to custom field overview"
+#~ msgstr "Zurück zur Felderliste"
+
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Include joining period"
@@ -2070,6 +2075,11 @@ msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
 #~ msgid "Default Contribution Type"
 #~ msgstr "Standard-Beitragsart"
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Custom Field"
+#~ msgstr "Benutzerdefiniertes Feld speichern"
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "yearly"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 6e2df25..a64f90a 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -609,11 +609,6 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field %{action} successfully"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
@@ -647,11 +642,6 @@ msgstr[1] ""
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format
-msgid "Delete Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
@@ -1250,32 +1240,6 @@ msgstr ""
 msgid "Select none"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Back to custom field overview"
-msgstr ""
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field deleted successfully"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Edit Custom Field"
-msgstr ""
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Failed to delete custom field: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format
-msgid "New Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Slug does not match. Deletion cancelled."
@@ -1727,11 +1691,6 @@ msgstr ""
 msgid "Regenerating..."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Save Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom Field Value"
@@ -1857,3 +1816,44 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "The cycle will be calculated based on this date and the interval."
 msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Back to settings"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Data field %{action} successfully"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Data field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "Delete Data Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Edit Data Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Failed to delete data field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "New Data Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Save Data Field"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 467e715..59e0f78 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -609,11 +609,6 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field %{action} successfully"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
@@ -647,11 +642,6 @@ msgstr[1] ""
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format
-msgid "Delete Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
@@ -1250,32 +1240,6 @@ msgstr ""
 msgid "Select none"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Back to custom field overview"
-msgstr ""
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom field deleted successfully"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit Custom Field"
-msgstr ""
-
-#: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Failed to delete custom field: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#: lib/mv_web/live/custom_field_live/index_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Slug does not match. Deletion cancelled."
@@ -1727,11 +1691,6 @@ msgstr ""
 msgid "Regenerating..."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Custom Field Value"
@@ -1858,6 +1817,47 @@ msgstr ""
 msgid "The cycle will be calculated based on this date and the interval."
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Back to settings"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Data field %{action} successfully"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Data field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Delete Data Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Data Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Failed to delete data field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Data Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save Data Field"
+msgstr ""
+
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #: lib/mv_web/live/components/payment_filter_component.ex
 #~ #, elixir-autogen, elixir-format
@@ -1997,6 +1997,11 @@ msgstr ""
 #~ msgid "Cycle Period"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Back to custom field overview"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_field_live/form_component.ex
 #~ #: lib/mv_web/live/member_field_live/index_component.ex
 #~ #, elixir-autogen, elixir-format
@@ -2060,6 +2065,11 @@ msgstr ""
 #~ msgid "Default Contribution Type"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Custom Field"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "yearly"