diff --git a/source/localization/de.json b/source/localization/de.json
index ff9280c..1f510ea 100644
--- a/source/localization/de.json
+++ b/source/localization/de.json
@@ -1,9 +1,9 @@
 {
 	"conditions.unknown": "unbekannt",
 	"conditions.ok": "in Ordnung",
-	"conditions.warning": "bedenklich",
+	"conditions.concerning": "bedenklich",
 	"conditions.critical": "kritisch",
-	"help.title": "Heimdall — Werkzeug zur System-Überwachungs",
+	"help.title": "Heimdall — Werkzeug zur System-Überwachung",
 	"help.args.conf_path": "Pfad zur Konfigurations-Datei",
 	"help.args.state_path": "Pfad zur Zustands-Datei, welche Daten über vorherige Prüfungen enthält; Standard-Wert: Pfad im temporären Verzeichnis des Systems mit eindeutigem Namen in Bezug auf den Pfad zur Konfigurations-Datei",
 	"help.args.send_ok_notifications": "ob '{{condition_name}}'-Zustände gemeldet werden sollen",
@@ -16,11 +16,11 @@
 	"checks.file_state.timestamp_implausible": "Datei ist scheinbar aus der Zukunft",
 	"checks.file_state.too_old": "Datei ist zu alt",
 	"checks.file_state.too_big": "Datei ist zu groß",
+	"checks.generic_remote.overflow": "Laufwerk fast voll",
 	"checks.http_request.request_failed": "HTTP-Abfrage fehlgeschlagen",
 	"checks.http_request.status_code_mismatch": "Status-Code {{status_code_actual}} stimmt nicht mit dem erwarteten Wert {{status_code_expected}} überein",
 	"checks.http_request.header_value_mismatch": "Header-Wert für Schlüssel '{{key}}' '{{value_actual}}' stimmt nicht mit erwartetem Wert {{value_expected}} überein",
 	"checks.http_request.body_misses_part": "Rumpf enthält nicht den erwarteten Teil '{{part}}'",
 	"misc.state_file_path": "Pfad zur Zustands-Datei",
-	"misc.check_procedure_failed": "Prüfungs-Prozedur fehlgeschlagen",
-	"checks.generic_remote.overflow": "Festplatte fast voll"
+	"misc.check_procedure_failed": "Prüfungs-Prozedur fehlgeschlagen"
 }
diff --git a/source/localization/en.json b/source/localization/en.json
index 798c20d..77ef5b7 100644
--- a/source/localization/en.json
+++ b/source/localization/en.json
@@ -1,7 +1,7 @@
 {
 	"conditions.unknown": "unknown",
 	"conditions.ok": "ok",
-	"conditions.warning": "concerning",
+	"conditions.concerning": "concerning",
 	"conditions.critical": "critical",
 	"help.title": "Heimdall — Monitoring Tool",
 	"help.args.conf_path": "path to the configuration file",
@@ -16,11 +16,11 @@
 	"checks.file_state.timestamp_implausible": "file is apparently from the future",
 	"checks.file_state.too_old": "file is too old",
 	"checks.file_state.too_big": "file is too big",
+	"checks.generic_remote.overflow": "disk drive almost full",
 	"checks.http_request.request_failed": "HTTP request failed",
 	"checks.http_request.status_code_mismatch": "actual status code {{status_code_actual}} does not match expected value {{status_code_expected}}",
 	"checks.http_request.header_value_mismatch": "actual header value for key '{{key}}' '{{value_actual}}' and does not match the expected value {{value_expected}}",
 	"checks.http_request.body_misses_part": "body does not contain the expected part '{{part}}'",
 	"misc.state_file_path": "state file path",
-	"misc.check_procedure_failed": "check procedure failed",
-	"checks.generic_remote.overflow": "harddisk full"
+	"misc.check_procedure_failed": "check procedure failed"
 }
diff --git a/source/logic/channels/libnotify.py b/source/logic/channels/libnotify.py
index 4b3cb58..2b48f08 100644
--- a/source/logic/channels/libnotify.py
+++ b/source/logic/channels/libnotify.py
@@ -37,7 +37,7 @@ class implementation_notification_channel_libnotify(interface_notification_chann
 			return {
 				enum_condition.unknown: "normal",
 				enum_condition.ok: "low",
-				enum_condition.warning: "normal",
+				enum_condition.concerning: "normal",
 				enum_condition.critical: "critical",
 			}[condition]
 		parts = []
diff --git a/source/logic/checks/file_state.py b/source/logic/checks/file_state.py
index cab1d1f..997a08b 100644
--- a/source/logic/checks/file_state.py
+++ b/source/logic/checks/file_state.py
@@ -69,7 +69,7 @@ class implementation_check_kind_file_state(interface_check_kind):
 					"condition": (
 						enum_condition.critical
 						if parameters["strict"] else
-						enum_condition.warning
+						enum_condition.concerning
 					),
 					"info": {
 						"path": parameters["path"],
@@ -133,7 +133,7 @@ class implementation_check_kind_file_state(interface_check_kind):
 						(
 							enum_condition.critical
 							if parameters["strict"] else
-							enum_condition.warning
+							enum_condition.concerning
 						)
 					),
 					"info": {
@@ -148,7 +148,7 @@ class implementation_check_kind_file_state(interface_check_kind):
 					"condition": (
 						enum_condition.critical
 						if parameters["strict"] else
-						enum_condition.warning
+						enum_condition.concerning
 					),
 					"info": {
 						"path": parameters["path"],
diff --git a/source/logic/checks/generic_remote.py b/source/logic/checks/generic_remote.py
index 22a022f..acb6df2 100644
--- a/source/logic/checks/generic_remote.py
+++ b/source/logic/checks/generic_remote.py
@@ -113,7 +113,7 @@ class implementation_check_kind_generic_remote(interface_check_kind):
 					"condition": (
 						enum_condition.critical
 						if parameters["strict"] else
-						enum_condition.warning
+						enum_condition.concerning
 					),
 					"info": {
 						"data": {
diff --git a/source/logic/checks/http_request.py b/source/logic/checks/http_request.py
index e406bf1..4ecc923 100644
--- a/source/logic/checks/http_request.py
+++ b/source/logic/checks/http_request.py
@@ -132,7 +132,7 @@ class implementation_check_kind_http_request(interface_check_kind):
 				"condition": (
 					enum_condition.critical
 					if parameters["strict"] else
-					enum_condition.warning
+					enum_condition.concerning
 				),
 				"info": {
 					"request": parameters["request"],
@@ -193,7 +193,7 @@ class implementation_check_kind_http_request(interface_check_kind):
 					(
 						enum_condition.critical
 						if parameters["strict"] else
-						enum_condition.warning
+						enum_condition.concerning
 					)
 				),
 				"info": {
diff --git a/source/logic/checks/script.py b/source/logic/checks/script.py
index 57a5d4b..8385574 100644
--- a/source/logic/checks/script.py
+++ b/source/logic/checks/script.py
@@ -47,7 +47,7 @@ class implementation_check_kind_script(interface_check_kind):
 		elif (result["return_code"] == 1):
 			condition = enum_condition.unknown
 		elif (result["return_code"] == 2):
-			condition = enum_condition.warning
+			condition = enum_condition.concerning
 		elif (result["return_code"] == 3):
 			condition = enum_condition.critical
 		else:
diff --git a/source/logic/condition.py b/source/logic/condition.py
index 8eb1ae8..09e8075 100644
--- a/source/logic/condition.py
+++ b/source/logic/condition.py
@@ -1,7 +1,7 @@
 class enum_condition(_enum.Enum):
 	unknown = 0
 	ok = 1
-	warning = 2
+	concerning = 2
 	critical = 3
 	
 
@@ -13,7 +13,7 @@ def condition_show(condition):
 		{
 			enum_condition.unknown: "conditions.unknown",
 			enum_condition.ok: "conditions.ok",
-			enum_condition.warning: "conditions.warning",
+			enum_condition.concerning: "conditions.concerning",
 			enum_condition.critical: "conditions.critical",
 		}[condition]
 	)
@@ -23,7 +23,7 @@ def condition_encode(condition):
 	return {
 		enum_condition.unknown: "unknown",
 		enum_condition.ok: "ok",
-		enum_condition.warning: "warning",
+		enum_condition.concerning: "concerning",
 		enum_condition.critical: "critical",
 	}[condition]
 	
@@ -32,7 +32,8 @@ def condition_decode(condition_encoded):
 	return {
 		"unknown": enum_condition.unknown,
 		"ok": enum_condition.ok,
-		"warning": enum_condition.warning,
+		"warning": enum_condition.concerning, # deprecated
+		"concerning": enum_condition.concerning,
 		"critical": enum_condition.critical,
 	}[condition_encoded]