diff --git a/main.go b/main.go
index bb900a6..b29952f 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,7 @@ import (
 	"time"
 )
 
-const VERSION = "v39"
+const VERSION = "v40"
 
 var (
 	logger              *slog.Logger
@@ -663,6 +663,27 @@ func pageDatapointEdit(w http.ResponseWriter, r *http.Request, _ *session.T) { /
 		}
 	}
 
+	/* Triggers using this datapoint is provided as a list to update
+	 * if changing the datapoint name. Parsing expr and automatically
+	 * changing it to renamed datapoints would be nice in the future. */
+	var triggers []Trigger
+	triggers, err = TriggersRetrieveByDatapoint(datapoint.Name)
+	if err != nil {
+		httpError(w, werr.Wrap(err).Log())
+		return
+	}
+	slices.SortFunc(triggers, func(a, b Trigger) int {
+		an := strings.ToUpper(a.Name)
+		bn := strings.ToUpper(b.Name)
+		if an < bn {
+			return -1
+		}
+		if an > bn {
+			return 1
+		}
+		return 0
+	})
+
 	page := Page{
 		LAYOUT: "main",
 		PAGE:   "datapoint_edit",
@@ -674,6 +695,7 @@ func pageDatapointEdit(w http.ResponseWriter, r *http.Request, _ *session.T) { /
 
 	page.Data = map[string]any{
 		"Datapoint": datapoint,
+		"Triggers":  triggers,
 	}
 	page.Render(w, r)
 	return
diff --git a/sql/00027.sql b/sql/00027.sql
new file mode 100644
index 0000000..83a5625
--- /dev/null
+++ b/sql/00027.sql
@@ -0,0 +1,22 @@
+/* Updating a datapoint name also updates the jsonb array entry */
+CREATE OR REPLACE FUNCTION update_triggers_datapoint_name()
+	RETURNS TRIGGER
+	LANGUAGE PLPGSQL
+	AS
+$$
+BEGIN
+UPDATE "trigger"
+	SET
+		datapoints = (datapoints - OLD.name) || jsonb_build_array(NEW.name)
+	WHERE
+		datapoints ? OLD.name;
+
+	RETURN NEW;
+END;
+$$;
+
+CREATE TRIGGER datapoint_renamed
+	AFTER UPDATE
+	ON public.datapoint
+	FOR EACH ROW
+	EXECUTE PROCEDURE update_triggers_datapoint_name();
diff --git a/static/js/datapoint_edit.mjs b/static/js/datapoint_edit.mjs
index dfe5e9c..8180084 100644
--- a/static/js/datapoint_edit.mjs
+++ b/static/js/datapoint_edit.mjs
@@ -1,5 +1,6 @@
 export class UI {
-	constructor() {
+	constructor(datapointData) {
+		this.datapoint = datapointData
 		document.addEventListener('keydown', evt=>this.keyHandler(evt))
 		document.querySelector('input[name="group"]').focus()
 	}
@@ -16,4 +17,10 @@ export class UI {
 			break
 		}
 	}
+	check_rename() {
+		let newName = document.querySelector(`input[name="name"]`).value
+		if (newName != this.datapoint.Name)
+			return confirm(`Trigger expressions needs to be manually updated when renaming a datapoint.\nDo you want to rename the datapoint?`)
+		return true
+	}
 }
diff --git a/views/pages/datapoint_edit.gotmpl b/views/pages/datapoint_edit.gotmpl
index e4a138b..3cfe372 100644
--- a/views/pages/datapoint_edit.gotmpl
+++ b/views/pages/datapoint_edit.gotmpl
@@ -3,48 +3,59 @@
 
 	<script type="module" defer>
 		import {UI} from "/js/{{ .VERSION }}/datapoint_edit.mjs"
-		window._ui = new UI()
+		window._ui = new UI({{ .Data.Datapoint }})
 	</script>
 
 	{{ block "page_label" . }}{{end}}
 
-	<form id="form-trigger" action="/datapoint/update/{{ .Data.Datapoint.ID }}" method="post">
-	<div id="widgets" class="widgets">
-		<div class="label">Group</div>
-		<div><input type="text" name="group" value="{{ .Data.Datapoint.Group }}"></div>
+	<form id="form-trigger" action="/datapoint/update/{{ .Data.Datapoint.ID }}" method="post" onsubmit="return _ui.check_rename()">
+		<div id="widgets" class="widgets">
+			<div class="label">Group</div>
+			<div><input type="text" name="group" value="{{ .Data.Datapoint.Group }}"></div>
 
-		<div class="label">Name</div>
-		<div><input type="text" name="name" value="{{ .Data.Datapoint.Name }}"></div>
-		
-		<div class="label">Datatype</div>
-		<div>
-			<select name="datatype">
-				<option {{ if eq .Data.Datapoint.Datatype "INT" }}selected{{end}}>INT</option>
-				<option {{ if eq .Data.Datapoint.Datatype "STRING" }}selected{{end}}>STRING</option>
-				<option {{ if eq .Data.Datapoint.Datatype "DATETIME" }}selected{{end}}>DATETIME</option>
-			</select>
-		</div>
+			<div class="label">Name</div>
+			<div><input type="text" name="name" value="{{ .Data.Datapoint.Name }}"></div>
 
-		<div class="label">No data<br>problem time<br>(seconds)</div>
-		<div>
-			<input type="text" name="nodata_seconds" value="{{ .Data.Datapoint.NodataProblemSeconds }}">
-			<div class="description">A problem is raised and notified if an entry isn't made within this time.</div>
-			<div class="description">Set to 0 to disable.</div>
-		</div>
+			<div class="label">Datatype</div>
+			<div>
+				<select name="datatype">
+					<option {{ if eq .Data.Datapoint.Datatype "INT" }}selected{{end}}>INT</option>
+					<option {{ if eq .Data.Datapoint.Datatype "STRING" }}selected{{end}}>STRING</option>
+					<option {{ if eq .Data.Datapoint.Datatype "DATETIME" }}selected{{end}}>DATETIME</option>
+				</select>
+			</div>
 
-		<div class="label">Comment</div>
-		<div>
-			<textarea name="comment" rows=4>{{ .Data.Datapoint.Comment }}</textarea>
-		</div>
+			<div class="label">No data<br>problem time<br>(seconds)</div>
+			<div>
+				<input type="text" name="nodata_seconds" value="{{ .Data.Datapoint.NodataProblemSeconds }}">
+				<div class="description">A problem is raised and notified if an entry isn't made within this time.</div>
+				<div class="description">Set to 0 to disable.</div>
+			</div>
+
+			<div class="label">Comment</div>
+			<div>
+				<textarea name="comment" rows=4>{{ .Data.Datapoint.Comment }}</textarea>
+			</div>
 
 
-		<div></div>
-		<div class="action">
-			{{ if eq .Data.Datapoint.ID 0 }}
-			<button id="button-update">Create</button>
-			{{ else }}
-			<button id="button-update">Update</button>
-			{{ end }}
+			<div></div>
+			<div class="action">
+				{{ if eq .Data.Datapoint.ID 0 }}
+				<button id="button-update">Create</button>
+				{{ else }}
+				<button id="button-update">Update</button>
+				{{ end }}
+			</div>
+
+			<div></div>
+			<div style="margin-top: 32px">
+				<b>Used in the following triggers:</b>
+				<ul>
+					{{ range .Data.Triggers }}
+					<li><a href="/trigger/edit/{{ .ID }}">{{ .Name }}</a></li>
+					{{ end }}
+				</ul>
+			</div>
 		</div>
 	</form>