diff --git a/core/Controller/OpenMetricsController.php b/core/Controller/OpenMetricsController.php
index 7ed388e7eac..8c57eb1a663 100644
--- a/core/Controller/OpenMetricsController.php
+++ b/core/Controller/OpenMetricsController.php
@@ -83,10 +83,10 @@ class OpenMetricsController extends Controller {
 
 		$elapsed = (string)(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']);
 		yield <<<SUMMARY
-			# TYPE nextcloud_exporter_duration gauge
-			# UNIT nextcloud_exporter_duration seconds
-			# HELP nextcloud_exporter_duration Exporter run time
-			nextcloud_exporter_duration $elapsed
+			# TYPE nextcloud_exporter_run_seconds gauge
+			# UNIT nextcloud_exporter_run_seconds seconds
+			# HELP nextcloud_exporter_run_seconds Exporter run time
+			nextcloud_exporter_run_seconds $elapsed
 			# EOF
 
 			SUMMARY;
diff --git a/lib/private/OpenMetrics/Exporters/AppsCount.php b/lib/private/OpenMetrics/Exporters/AppsCount.php
index c168d33f005..f011bea6956 100644
--- a/lib/private/OpenMetrics/Exporters/AppsCount.php
+++ b/lib/private/OpenMetrics/Exporters/AppsCount.php
@@ -27,7 +27,7 @@ class AppsCount implements IMetricFamily {
 
 	#[Override]
 	public function name(): string {
-		return 'apps_count';
+		return 'installed_applications';
 	}
 
 	#[Override]
@@ -42,7 +42,7 @@ class AppsCount implements IMetricFamily {
 
 	#[Override]
 	public function help(): string {
-		return 'Number of apps in Nextcloud';
+		return 'Number of applications installed in Nextcloud';
 	}
 
 	#[Override]
diff --git a/lib/private/OpenMetrics/Exporters/RunningJobs.php b/lib/private/OpenMetrics/Exporters/RunningJobs.php
index 98c901c8342..03fc3e5f111 100644
--- a/lib/private/OpenMetrics/Exporters/RunningJobs.php
+++ b/lib/private/OpenMetrics/Exporters/RunningJobs.php
@@ -27,7 +27,7 @@ class RunningJobs implements IMetricFamily {
 
 	#[Override]
 	public function name(): string {
-		return 'jobs_running';
+		return 'running_jobs';
 	}
 
 	#[Override]
diff --git a/tests/Core/Controller/OpenMetricsControllerTest.php b/tests/Core/Controller/OpenMetricsControllerTest.php
index b331bef5711..a5b740d9a09 100644
--- a/tests/Core/Controller/OpenMetricsControllerTest.php
+++ b/tests/Core/Controller/OpenMetricsControllerTest.php
@@ -54,10 +54,10 @@ class OpenMetricsControllerTest extends TestCase {
 		$this->assertEquals('200', $response->getStatus());
 		$this->assertEquals('application/openmetrics-text; version=1.0.0; charset=utf-8', $response->getHeaders()['Content-Type']);
 		$expected = <<<EXPECTED
-			# TYPE nextcloud_exporter_duration gauge
-			# UNIT nextcloud_exporter_duration seconds
-			# HELP nextcloud_exporter_duration Exporter run time
-			nextcloud_exporter_duration %f
+			# TYPE nextcloud_exporter_run_seconds gauge
+			# UNIT nextcloud_exporter_run_seconds seconds
+			# HELP nextcloud_exporter_run_seconds Exporter run time
+			nextcloud_exporter_run_seconds %f
 			# EOF
 
 			EXPECTED;
diff --git a/tests/lib/OpenMetrics/Exporters/ExporterTestCase.php b/tests/lib/OpenMetrics/Exporters/ExporterTestCase.php
index 96859699f07..439494e5c4f 100644
--- a/tests/lib/OpenMetrics/Exporters/ExporterTestCase.php
+++ b/tests/lib/OpenMetrics/Exporters/ExporterTestCase.php
@@ -26,11 +26,28 @@ abstract class ExporterTestCase extends TestCase {
 	}
 
 	public function testNotEmptyData(): void {
-		$this->assertNotEmpty($this->exporter->name());
 		$this->assertNotEmpty($this->metrics);
 	}
 
-	public function testValidNames(): void {
+	public function testValidExporterName(): void {
+		$exporterName = $this->exporter->name();
+		$this->assertMatchesRegularExpression('/^[a-z_:][a-z0-9_:]*$/i', $exporterName, );
+
+		$unit = $this->exporter->unit();
+		if ($unit === '') {
+			return;
+		}
+		// Unit name must follow metric name format
+		$this->assertMatchesRegularExpression('/^[a-z_:][a-z0-9_:]*$/i', $unit);
+		// Unit name must be a suffix in exporter name
+		$this->assertMatchesRegularExpression(
+			'/(^|_)' . $unit . '$/',
+			$exporterName,
+			'Metric name "' . $exporterName . '" must contains unit "' . $unit . '" as a suffix',
+		);
+	}
+
+	public function testValidLabelKey(): void {
 		$labelNames = [];
 		foreach ($this->metrics as $metric) {
 			foreach ($metric->labels as $label => $value) {