diff --git a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/OncoAnalyticsMonitorApplication.kt b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/OncoAnalyticsMonitorApplication.kt
index 48cef6a..ebc8547 100644
--- a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/OncoAnalyticsMonitorApplication.kt
+++ b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/OncoAnalyticsMonitorApplication.kt
@@ -23,7 +23,7 @@ class OncoAnalyticsMonitorApplication {
     }
 
     @Bean
-    fun obdsFhirConditionRepository(): ConditionInMemoryRepository {
+    fun fhirObdsConditionRepository(): ConditionInMemoryRepository {
         return ConditionInMemoryRepository()
     }
 
diff --git a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/ObdsFhirTopicMonitor.kt b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/FhirObdsTopicMonitor.kt
similarity index 92%
rename from src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/ObdsFhirTopicMonitor.kt
rename to src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/FhirObdsTopicMonitor.kt
index 4c22dfd..291c784 100644
--- a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/ObdsFhirTopicMonitor.kt
+++ b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/topiclisteners/FhirObdsTopicMonitor.kt
@@ -15,8 +15,8 @@ import org.springframework.messaging.handler.annotation.Payload
 import org.springframework.stereotype.Component
 
 @Component
-class ObdsFhirTopicMonitor(
-    @Qualifier("obdsFhirConditionRepository")
+class FhirObdsTopicMonitor(
+    @Qualifier("fhirObdsConditionRepository")
     private val conditionRepository: ConditionInMemoryRepository,
     statisticsEventProducer: StatisticsSink,
 ) : TopicMonitor(statisticsEventProducer) {
@@ -45,7 +45,7 @@ class ObdsFhirTopicMonitor(
                 )
 
                 if (updated) {
-                    sendUpdatedStatistics(fetchStatistics("obdsfhir", conditionRepository))
+                    sendUpdatedStatistics(fetchStatistics("fhirobds", conditionRepository))
                 }
             }
         } catch (e: Exception) {
diff --git a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/web/StatisticsController.kt b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/web/StatisticsController.kt
index 35b2964..bf3ca53 100644
--- a/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/web/StatisticsController.kt
+++ b/src/main/kotlin/dev/pcvolkmer/oncoanalytics/monitor/web/StatisticsController.kt
@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController
 class StatisticsController(
     @Qualifier("obdsXmlConditionRepository")
     private val obdsXmlConditionRepository: ConditionInMemoryRepository,
-    @Qualifier("obdsFhirConditionRepository")
-    private val obdsFhirConditionRepository: ConditionInMemoryRepository,
+    @Qualifier("fhirObdsConditionRepository")
+    private val fhirObdsConditionRepository: ConditionInMemoryRepository,
     @Qualifier("fhirPseudonymizedConditionRepository")
     private val fhirPseudonymizedConditionRepository: ConditionInMemoryRepository,
 ) {
@@ -24,9 +24,9 @@ class StatisticsController(
         return fetchStatistics("obdsxml", obdsXmlConditionRepository)
     }
 
-    @GetMapping(path = ["obdsfhir"])
+    @GetMapping(path = ["fhirobds"])
     fun obdsfhirStatistics(): Statistics {
-        return fetchStatistics("obdfhir", obdsFhirConditionRepository)
+        return fetchStatistics("fhirobds", fhirObdsConditionRepository)
     }
 
     @GetMapping(path = ["fhirpseudonymized"])
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 237aaa1..770f519 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -44,7 +44,7 @@
             <img class="logo" th:src="@{/images/topic.png}" alt="topic"/>
             <div class="description">Kafka Topic<br/>oBDS FHIR</div>
             <div class="statistics">
-                <table id="obdsfhir"></table>
+                <table id="fhirobds"></table>
             </div>
         </div>
     </div><div class="step">
@@ -78,7 +78,7 @@
     }
 
     fetch('/statistics/obdsxml').then(res => res.json()).then(data => updateData(data, 'obdsxml'));
-    fetch('/statistics/obdsfhir').then(res => res.json()).then(data => updateData(data, 'obdsfhir'));
+    fetch('/statistics/fhirobds').then(res => res.json()).then(data => updateData(data, 'fhirobds'));
     fetch('/statistics/fhirpseudonymized').then(res => res.json()).then(data => updateData(data, 'fhirpseudonymized'));
 
     window.addEventListener('load', () => {
@@ -88,8 +88,8 @@
             updateData(JSON.parse(event.data), 'obdsxml')
         });
 
-        evtSource.addEventListener('obdsfhir', (event) => {
-            updateData(JSON.parse(event.data), 'obdsfhir')
+        evtSource.addEventListener('fhirobds', (event) => {
+            updateData(JSON.parse(event.data), 'fhirobds')
         });
 
         evtSource.addEventListener('fhirpseudonymized', (event) => {