diff --git a/packages/core/src/domains/patient/types.ts b/packages/core/src/domains/patient/types.ts
index 7c5bea05..f3c07ee5 100644
--- a/packages/core/src/domains/patient/types.ts
+++ b/packages/core/src/domains/patient/types.ts
@@ -20,7 +20,7 @@ export type Patient = {
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-service-base/blob/main/src/main/scala/de/dnpm/dip/service/query/PatientMatch.scala
  */
-export type PatientMatch<Criteria = any> = {
+export type PatientMatchBase<Criteria = any> = {
     id: string,
     managingSite?: Coding,
     gender: Coding<'male' | 'female' | 'other' | 'unknown'>,
diff --git a/packages/rd/src/runtime/components/core/PreparedQueryEntity.ts b/packages/rd/src/runtime/components/core/PreparedQueryEntity.ts
index d0ff93f4..c09da1db 100644
--- a/packages/rd/src/runtime/components/core/PreparedQueryEntity.ts
+++ b/packages/rd/src/runtime/components/core/PreparedQueryEntity.ts
@@ -3,19 +3,19 @@ import { createResourceRecordManager, defineResourceRecordEvents } from '@dnpm-d
 import type { PropType, SlotsType } from 'vue';
 import { defineComponent, toRef } from 'vue';
 import { useRDAPIClient } from '../../composables';
-import type { RDPreparedQuery } from '../../domains';
+import type { PreparedQuery } from '../../domains';
 
 export default defineComponent({
     props: {
         entity: {
-            type: Object as PropType<RDPreparedQuery>,
+            type: Object as PropType<PreparedQuery>,
         },
         entityId: {
             type: String,
         },
     },
-    emits: defineResourceRecordEvents<RDPreparedQuery>(),
-    slots: Object as SlotsType<ResourceRecordSlots<RDPreparedQuery>>,
+    emits: defineResourceRecordEvents<PreparedQuery>(),
+    slots: Object as SlotsType<ResourceRecordSlots<PreparedQuery>>,
     async setup(props, setup) {
         const api = useRDAPIClient();
         const id = toRef(props, 'entityId');
diff --git a/packages/rd/src/runtime/components/core/PreparedQueryForm.vue b/packages/rd/src/runtime/components/core/PreparedQueryForm.vue
index a3f10fde..3d5993ee 100644
--- a/packages/rd/src/runtime/components/core/PreparedQueryForm.vue
+++ b/packages/rd/src/runtime/components/core/PreparedQueryForm.vue
@@ -6,17 +6,17 @@ import {
 import SearchForm from './SearchForm.vue';
 import PreparedQueryList from './PreparedQueryList';
 import PreparedQueryEntity from './PreparedQueryEntity';
-import type { QuerySession, RDPreparedQuery, RDQueryCriteria } from '../../domains';
+import type { PreparedQuery, QueryCriteria, QuerySession } from '../../domains';
 
 export default defineComponent({
     components: { PreparedQueryEntity, PreparedQueryList, SearchForm },
     emits: ['submitted'],
     setup(props, setup) {
         const searchEl = ref(null) as Ref<null | typeof SearchForm>;
-        const criteria = ref<RDQueryCriteria | undefined>(undefined);
+        const criteria = ref<QueryCriteria | undefined>(undefined);
 
         const preparedQueryNode = ref(null) as Ref<null | typeof PreparedQueryList>;
-        const preparedQuery = ref<RDPreparedQuery | undefined>(undefined);
+        const preparedQuery = ref<PreparedQuery | undefined>(undefined);
         const preparedQueryId = computed(() => {
             if (preparedQuery.value) {
                 return preparedQuery.value.id;
@@ -33,7 +33,7 @@ export default defineComponent({
             });
         };
 
-        const togglePreparedQuery = (data: RDPreparedQuery) => {
+        const togglePreparedQuery = (data: PreparedQuery) => {
             if (
                 preparedQuery.value &&
                 preparedQuery.value.id === data.id
@@ -66,21 +66,21 @@ export default defineComponent({
             });
         };
 
-        const handlePreparedQueryCreated = (data: RDPreparedQuery) => {
+        const handlePreparedQueryCreated = (data: PreparedQuery) => {
             preparedQuery.value = data;
             if (preparedQueryNode.value) {
                 preparedQueryNode.value.created(data);
             }
         };
 
-        const handlePreparedQueryUpdated = (data: RDPreparedQuery) => {
+        const handlePreparedQueryUpdated = (data: PreparedQuery) => {
             preparedQuery.value = data;
             if (preparedQueryNode.value) {
                 preparedQueryNode.value.updated(data);
             }
         };
 
-        const handlePreparedQueryDeleted = (data: RDPreparedQuery) => {
+        const handlePreparedQueryDeleted = (data: PreparedQuery) => {
             if (
                 preparedQuery.value &&
                 preparedQuery.value.id === data.id
diff --git a/packages/rd/src/runtime/components/core/PreparedQueryList.ts b/packages/rd/src/runtime/components/core/PreparedQueryList.ts
index ffc66049..973b5b54 100644
--- a/packages/rd/src/runtime/components/core/PreparedQueryList.ts
+++ b/packages/rd/src/runtime/components/core/PreparedQueryList.ts
@@ -3,11 +3,11 @@ import { createResourceCollectionManager, defineResourceCollectionEvents } from
 import type { SlotsType } from 'vue';
 import { defineComponent } from 'vue';
 import { useRDAPIClient } from '../../composables';
-import type { RDPreparedQuery } from '../../domains';
+import type { PreparedQuery } from '../../domains';
 
 export default defineComponent({
-    slots: Object as SlotsType<ResourceCollectionSlots<RDPreparedQuery>>,
-    emits: defineResourceCollectionEvents<RDPreparedQuery>(),
+    slots: Object as SlotsType<ResourceCollectionSlots<PreparedQuery>>,
+    emits: defineResourceCollectionEvents<PreparedQuery>(),
     setup(props, setup) {
         const api = useRDAPIClient();
 
diff --git a/packages/rd/src/runtime/components/core/QueryPatientMatchEntity.vue b/packages/rd/src/runtime/components/core/QueryPatientMatchEntity.vue
index 28566969..204cba6d 100644
--- a/packages/rd/src/runtime/components/core/QueryPatientMatchEntity.vue
+++ b/packages/rd/src/runtime/components/core/QueryPatientMatchEntity.vue
@@ -1,12 +1,12 @@
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineComponent, ref } from 'vue';
-import type { RDPatientMatch } from '../../domains';
+import type { PatientMatch } from '../../domains';
 
 export default defineComponent({
     props: {
         entity: {
-            type: Object as PropType<RDPatientMatch>,
+            type: Object as PropType<PatientMatch>,
             required: true,
         },
         queryId: {
diff --git a/packages/rd/src/runtime/components/core/QueryPatientMatchList.ts b/packages/rd/src/runtime/components/core/QueryPatientMatchList.ts
index 42fca09b..79b137c1 100644
--- a/packages/rd/src/runtime/components/core/QueryPatientMatchList.ts
+++ b/packages/rd/src/runtime/components/core/QueryPatientMatchList.ts
@@ -1,4 +1,4 @@
-import type { ObjectLiteral, PatientMatch, ResourceCollectionSlots } from '@dnpm-dip/core';
+import type { ObjectLiteral, PatientMatchBase, ResourceCollectionSlots } from '@dnpm-dip/core';
 import { createResourceCollectionManager } from '@dnpm-dip/core';
 import type { PropType, SlotsType } from 'vue';
 import { defineComponent, toRef } from 'vue';
@@ -14,7 +14,7 @@ export default defineComponent({
             type: Object as PropType<ObjectLiteral>,
         },
     },
-    slots: Object as SlotsType<ResourceCollectionSlots<PatientMatch>>,
+    slots: Object as SlotsType<ResourceCollectionSlots<PatientMatchBase>>,
     setup(props, setup) {
         const api = useRDAPIClient();
 
diff --git a/packages/rd/src/runtime/components/core/QueryPatientRecordEntity.ts b/packages/rd/src/runtime/components/core/QueryPatientRecordEntity.ts
index 1ffd171b..4e512973 100644
--- a/packages/rd/src/runtime/components/core/QueryPatientRecordEntity.ts
+++ b/packages/rd/src/runtime/components/core/QueryPatientRecordEntity.ts
@@ -5,7 +5,7 @@ import {
 import type { SlotsType } from 'vue';
 import { defineComponent, toRef } from 'vue';
 import { useRDAPIClient } from '#imports';
-import type { RDPatientRecord } from '../../domains';
+import type { PatientRecord } from '../../domains';
 
 export default defineComponent({
     props: {
@@ -23,7 +23,7 @@ export default defineComponent({
             default: false,
         },
     },
-    slots: Object as SlotsType<ResourceRecordSlots<RDPatientRecord>>,
+    slots: Object as SlotsType<ResourceRecordSlots<PatientRecord>>,
     async setup(props, setup) {
         const apiClient = useRDAPIClient();
         const id = toRef(props, 'queryId');
diff --git a/packages/rd/src/runtime/components/core/SearchForm.vue b/packages/rd/src/runtime/components/core/SearchForm.vue
index 16d7959e..ad2f9be6 100644
--- a/packages/rd/src/runtime/components/core/SearchForm.vue
+++ b/packages/rd/src/runtime/components/core/SearchForm.vue
@@ -9,10 +9,10 @@ import {
     defineComponent, ref,
 } from 'vue';
 import type {
+    PreparedQuery,
+    QueryCriteria,
+    QueryCriteriaVariant,
     QuerySession,
-    RDPreparedQuery,
-    RDQueryCriteria,
-    RDQueryCriteriaVariant,
 } from '../../domains';
 import { useRDAPIClient } from '#imports';
 import VariantFormTabGroup from './VariantFormTabGroup.vue';
@@ -27,7 +27,7 @@ export default defineComponent({
     },
     props: {
         criteria: {
-            type: Object as PropType<RDQueryCriteria>,
+            type: Object as PropType<QueryCriteria>,
         },
         queryId: {
             type: String,
@@ -36,7 +36,7 @@ export default defineComponent({
             type: String as PropType<QueryRequestMode>,
         },
         preparedQuery: {
-            type: Object as PropType<RDPreparedQuery>,
+            type: Object as PropType<PreparedQuery>,
         },
         preparedQueryId: {
             type: String,
@@ -61,12 +61,12 @@ export default defineComponent({
         ];
 
         const busy = ref(false);
-        const criteria = ref<RDQueryCriteria>({});
+        const criteria = ref<QueryCriteria>({});
 
         const categories = ref<FormSelectOption[]>([]);
         const hpoTerms = ref<FormSelectOption[]>([]);
 
-        const variants = ref<RDQueryCriteriaVariant<string>[]>([]);
+        const variants = ref<QueryCriteriaVariant<string>[]>([]);
 
         const preparedQueryId = ref<string | undefined>(undefined);
         const preparedQueryName = ref('');
@@ -122,12 +122,12 @@ export default defineComponent({
 
             if (criteria.value.variants) {
                 for (let i = 0; i < criteria.value.variants.length; i++) {
-                    const variant = criteria.value.variants[i] as RDQueryCriteriaVariant;
-                    const data : RDQueryCriteriaVariant<string> = {};
+                    const variant = criteria.value.variants[i] as QueryCriteriaVariant;
+                    const data : QueryCriteriaVariant<string> = {};
 
                     const keys = Object.keys(variant);
                     for (let j = 0; j < keys.length; j++) {
-                        data[keys[j] as keyof typeof data] = variant[keys[j] as keyof RDQueryCriteriaVariant]?.code;
+                        data[keys[j] as keyof typeof data] = variant[keys[j] as keyof QueryCriteriaVariant]?.code;
                     }
 
                     variants.value.push(data);
@@ -180,8 +180,8 @@ export default defineComponent({
             }
         };
 
-        const buildCriteria = () : RDQueryCriteria => {
-            const payload : RDQueryCriteria = {};
+        const buildCriteria = () : QueryCriteria => {
+            const payload : QueryCriteria = {};
             if (variants.value.length > 0) {
                 for (let i = 0; i < variants.value.length; i++) {
                     const variant = variants.value[i];
@@ -240,7 +240,7 @@ export default defineComponent({
             const payload = buildCriteria();
 
             try {
-                let preparedQuery : RDPreparedQuery | undefined;
+                let preparedQuery : PreparedQuery | undefined;
 
                 if (preparedQueryId.value) {
                     preparedQuery = await apiClient.preparedQuery.update(
diff --git a/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue b/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
index 3b86b112..4d671e0c 100644
--- a/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
+++ b/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
@@ -4,14 +4,14 @@ import {
     type PropType, defineComponent, reactive, toRef, watch,
 } from 'vue';
 import { DCodeSystem, DCollectionTransform, DFormSelectSearch } from '@dnpm-dip/core';
-import type { RDQueryCriteriaVariant } from '../../domains';
+import type { QueryCriteriaVariant } from '../../domains';
 
 export default defineComponent({
     components: { DCollectionTransform, DCodeSystem, DFormSelectSearch },
     emit: ['updated'],
     props: {
         entity: {
-            type: Object as PropType<RDQueryCriteriaVariant<string>>,
+            type: Object as PropType<QueryCriteriaVariant<string>>,
         },
     },
     setup(props, { emit }) {
diff --git a/packages/rd/src/runtime/domains/case/types.ts b/packages/rd/src/runtime/domains/case/types.ts
index 92aa1dad..291d64ed 100644
--- a/packages/rd/src/runtime/domains/case/types.ts
+++ b/packages/rd/src/runtime/domains/case/types.ts
@@ -1,10 +1,10 @@
 import type { Patient } from '@dnpm-dip/core';
-import type { RDDiagnosis } from '../diagnosis';
+import type { Diagnosis } from '../diagnosis';
 
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/RDCase.scala
  */
-export type RDCase = {
+export type Case = {
     id: string,
     externalId?: {
         value: string,
@@ -23,5 +23,5 @@ export type RDCase = {
     referrer: {
         name: string
     },
-    reason: RDDiagnosis
+    reason: Diagnosis
 };
diff --git a/packages/rd/src/runtime/domains/diagnosis/types.ts b/packages/rd/src/runtime/domains/diagnosis/types.ts
index 7efc7eaf..71044dd2 100644
--- a/packages/rd/src/runtime/domains/diagnosis/types.ts
+++ b/packages/rd/src/runtime/domains/diagnosis/types.ts
@@ -3,7 +3,7 @@ import type { Coding, Patient } from '@dnpm-dip/core';
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/RDDiagnosis.scala
  */
-export type RDDiagnosis = {
+export type Diagnosis = {
     id: string,
     patient: Patient,
     recordedOn?: string,
diff --git a/packages/rd/src/runtime/domains/ngs-report/types.ts b/packages/rd/src/runtime/domains/ngs-report/types.ts
index 5429bd5c..a29e2d13 100644
--- a/packages/rd/src/runtime/domains/ngs-report/types.ts
+++ b/packages/rd/src/runtime/domains/ngs-report/types.ts
@@ -37,7 +37,7 @@ export type Variant = {
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/RDNGSReport.scala
  */
-export type RDNGSReport = {
+export type NGSReport = {
     id: string,
     patient: Patient,
     performingLab: {
diff --git a/packages/rd/src/runtime/domains/patient/types.ts b/packages/rd/src/runtime/domains/patient/types.ts
index f97899bc..f406ed85 100644
--- a/packages/rd/src/runtime/domains/patient/types.ts
+++ b/packages/rd/src/runtime/domains/patient/types.ts
@@ -1,9 +1,9 @@
-import type { Coding, Patient, PatientMatch } from '@dnpm-dip/core';
-import type { RDCase } from '../case';
-import type { RDDiagnosis } from '../diagnosis';
-import type { RDNGSReport } from '../ngs-report';
-import type { RDQueryCriteria } from '../query';
-import type { RDTherapy } from '../therapy';
+import type { Coding, Patient, PatientMatchBase } from '@dnpm-dip/core';
+import type { Case } from '../case';
+import type { Diagnosis } from '../diagnosis';
+import type { NGSReport } from '../ngs-report';
+import type { QueryCriteria } from '../query';
+import type { Therapy } from '../therapy';
 
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/Observations.scala
@@ -17,13 +17,13 @@ type HPOTerm = {
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/RDPatientRecord.scala
  */
-export type RDPatientRecord = {
-    case: RDCase,
-    diagnosis: RDDiagnosis,
+export type PatientRecord = {
+    case: Case,
+    diagnosis: Diagnosis,
     hpoTerms: HPOTerm[],
-    ngsReports: RDNGSReport[],
+    ngsReports: NGSReport[],
     patient: Patient,
-    therapy?: RDTherapy
+    therapy?: Therapy
 };
 
-export type RDPatientMatch = PatientMatch<RDQueryCriteria>;
+export type PatientMatch = PatientMatchBase<QueryCriteria>;
diff --git a/packages/rd/src/runtime/domains/prepared-query/api.ts b/packages/rd/src/runtime/domains/prepared-query/api.ts
index 0ff06ba5..a894f9d5 100644
--- a/packages/rd/src/runtime/domains/prepared-query/api.ts
+++ b/packages/rd/src/runtime/domains/prepared-query/api.ts
@@ -1,33 +1,33 @@
 import type { CollectionResponse, ResourceCollectionLoadResponse } from '@dnpm-dip/core';
 import { BaseAPI } from '@dnpm-dip/core';
 import type {
-    RDPreparedQuery,
-    RDPreparedQueryCreate,
-    RDPreparedQueryUpdate,
+    PreparedQuery,
+    PreparedQueryCreate,
+    PreparedQueryUpdate,
 } from './types';
 
 export class PreparedQueryAPI extends BaseAPI {
-    async create(data: RDPreparedQueryCreate) : Promise<RDPreparedQuery> {
+    async create(data: PreparedQueryCreate) : Promise<PreparedQuery> {
         const response = await this.client.post('rd/prepared-queries', data);
         return response.data;
     }
 
-    async getOne(id: string) : Promise<RDPreparedQuery> {
+    async getOne(id: string) : Promise<PreparedQuery> {
         const response = await this.client.get(`rd/prepared-queries/${id}`);
         return response.data;
     }
 
-    async getMany() : Promise<CollectionResponse<RDPreparedQuery>> {
+    async getMany() : Promise<CollectionResponse<PreparedQuery>> {
         const response = await this.client.get('rd/prepared-queries');
         return response.data;
     }
 
-    async update(id: string, data: RDPreparedQueryUpdate) : Promise<RDPreparedQuery> {
+    async update(id: string, data: PreparedQueryUpdate) : Promise<PreparedQuery> {
         const response = await this.client.patch(`rd/prepared-queries/${id}`, data);
         return response.data;
     }
 
-    async delete(id: string) : Promise<RDPreparedQuery> {
+    async delete(id: string) : Promise<PreparedQuery> {
         const response = await this.client.delete(`rd/prepared-queries/${id}`);
         return response.data;
     }
diff --git a/packages/rd/src/runtime/domains/prepared-query/types.ts b/packages/rd/src/runtime/domains/prepared-query/types.ts
index 2718bbce..b41d6dfc 100644
--- a/packages/rd/src/runtime/domains/prepared-query/types.ts
+++ b/packages/rd/src/runtime/domains/prepared-query/types.ts
@@ -1,14 +1,14 @@
-import type { RDQueryCriteria } from '../query';
+import type { QueryCriteria } from '../query';
 
-export type RDPreparedQueryCreate = {
+export type PreparedQueryCreate = {
     name?: string,
-    criteria: RDQueryCriteria
+    criteria: QueryCriteria
 };
 
-export type RDPreparedQueryUpdate = RDPreparedQueryCreate;
+export type PreparedQueryUpdate = PreparedQueryCreate;
 
-export type RDPreparedQuery = {
+export type PreparedQuery = {
     id: string,
     name: string,
-    criteria: RDQueryCriteria
+    criteria: QueryCriteria
 };
diff --git a/packages/rd/src/runtime/domains/query/api.ts b/packages/rd/src/runtime/domains/query/api.ts
index f136ae8c..cfb614b7 100644
--- a/packages/rd/src/runtime/domains/query/api.ts
+++ b/packages/rd/src/runtime/domains/query/api.ts
@@ -2,7 +2,7 @@ import type {
     CollectionResponse, ResourceCollectionLoadMeta, URLQueryRecord,
 } from '@dnpm-dip/core';
 import { BaseAPI, QueryRequestMode, serializeURLQueryRecord } from '@dnpm-dip/core';
-import type { RDPatientMatch, RDPatientRecord } from '../patient';
+import type { PatientMatch, PatientRecord } from '../patient';
 import type {
     QuerySession, QuerySessionCreate, QuerySummary,
 } from './types';
@@ -63,7 +63,7 @@ export class QueryAPI extends BaseAPI {
      * @param meta
      * @throws ClientError
      */
-    async getPatients(id: string, meta?: ResourceCollectionLoadMeta) : Promise<CollectionResponse<RDPatientMatch>> {
+    async getPatients(id: string, meta?: ResourceCollectionLoadMeta) : Promise<CollectionResponse<PatientMatch>> {
         let qs : string = '';
         if (typeof meta !== 'undefined') {
             const { filters, limit, offset } = meta;
@@ -95,7 +95,7 @@ export class QueryAPI extends BaseAPI {
      * @param queryId
      * @param patientId
      */
-    async getPatientRecord(queryId: string, patientId: string) : Promise<RDPatientRecord> {
+    async getPatientRecord(queryId: string, patientId: string) : Promise<PatientRecord> {
         const response = await this.client.get(`rd/queries/${queryId}/patient-record/${patientId}`);
         return response.data;
     }
diff --git a/packages/rd/src/runtime/domains/query/types.ts b/packages/rd/src/runtime/domains/query/types.ts
index 25e2bdf1..6de5ac75 100644
--- a/packages/rd/src/runtime/domains/query/types.ts
+++ b/packages/rd/src/runtime/domains/query/types.ts
@@ -7,7 +7,7 @@ import type {
     QuerySummaryBase,
 } from '@dnpm-dip/core';
 
-export type RDVariantCriteria = 'gene' |
+export type VariantCriteria = 'gene' |
 'cDNAChange' |
 'gDNAChange' |
 'proteinChange' |
@@ -18,24 +18,24 @@ export type RDVariantCriteria = 'gene' |
 'modeOfInheritance' |
 'significance';
 
-export type RDQueryCriteriaVariant<
+export type QueryCriteriaVariant<
     V = CodeRecord,
 > = {
-    [K in RDVariantCriteria]?: V
+    [K in VariantCriteria]?: V
 };
 
-export type RDQueryCriteria = {
+export type QueryCriteria = {
     diagnoses?: CodeRecord[],
     hpoTerms?: CodeRecord[],
-    variants?: RDQueryCriteriaVariant[]
+    variants?: QueryCriteriaVariant[]
 };
 
 export type QuerySessionCreate = {
     mode?: CodeRecord<`${QueryRequestMode}` | QueryRequestMode>,
-    criteria: RDQueryCriteria
+    criteria: QueryCriteria
 };
 
-export type QuerySession = QueryBase<RDQueryCriteria>;
+export type QuerySession = QueryBase<QueryCriteria>;
 
 export type VariantDistribution = {
     key: Coding,
diff --git a/packages/rd/src/runtime/domains/therapy/types.ts b/packages/rd/src/runtime/domains/therapy/types.ts
index 070c3daa..cfdba5d7 100644
--- a/packages/rd/src/runtime/domains/therapy/types.ts
+++ b/packages/rd/src/runtime/domains/therapy/types.ts
@@ -3,7 +3,7 @@ import type { Patient } from '@dnpm-dip/core';
 /**
  * @see https://github.com/KohlbacherLab/dnpm-dip-rd-model/blob/main/dto_model/src/main/scala/de/dnpm/dip/rd/model/RDTherapy.scala
  */
-export type RDTherapy = {
+export type Therapy = {
     id: string,
     patient: Patient,
     notes: string
diff --git a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId].vue b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId].vue
index 4a5af804..0e381cd5 100644
--- a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId].vue
+++ b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId].vue
@@ -6,7 +6,7 @@ import {
     createError, defineNuxtComponent, navigateTo, useRoute,
 } from '#app';
 import { useRDAPIClient } from '../../../../composables';
-import type { QuerySession, RDPatientRecord } from '../../../../domains';
+import type { PatientRecord, QuerySession } from '../../../../domains';
 
 export default defineNuxtComponent({
     components: {
@@ -23,7 +23,7 @@ export default defineNuxtComponent({
         const api = useRDAPIClient();
         const route = useRoute();
 
-        const entity = ref<RDPatientRecord>(null) as any;
+        const entity = ref<PatientRecord>(null) as any;
 
         if (typeof route.params.patientId !== 'string') {
             await navigateTo({ path: `/rd/query/${props.entity.id}` });
diff --git a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/index.vue b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/index.vue
index 3eb0d922..d3c08e0b 100644
--- a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/index.vue
+++ b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineNuxtComponent } from '#app';
-import type { QuerySession, RDPatientRecord } from '../../../../../domains';
+import type { PatientRecord, QuerySession } from '../../../../../domains';
 
 export default defineNuxtComponent({
     props: {
@@ -10,7 +10,7 @@ export default defineNuxtComponent({
             required: true,
         },
         record: {
-            type: Object as PropType<RDPatientRecord>,
+            type: Object as PropType<PatientRecord>,
             required: true,
         },
     },
diff --git a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/reports.vue b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/reports.vue
index cabcc823..1096076c 100644
--- a/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/reports.vue
+++ b/packages/rd/src/runtime/pages/query/[id]/patients/[patientId]/reports.vue
@@ -2,7 +2,7 @@
 import type { PropType } from 'vue';
 import { defineNuxtComponent } from '#app';
 import VariantEntity from '../../../../../components/core/VariantEntity.vue';
-import type { QuerySession, RDPatientRecord } from '../../../../../domains';
+import type { PatientRecord, QuerySession } from '../../../../../domains';
 
 export default defineNuxtComponent({
     components: { VariantEntity },
@@ -12,7 +12,7 @@ export default defineNuxtComponent({
             required: true,
         },
         record: {
-            type: Object as PropType<RDPatientRecord>,
+            type: Object as PropType<PatientRecord>,
             required: true,
         },
     },
diff --git a/packages/rd/src/runtime/pages/search.vue b/packages/rd/src/runtime/pages/search.vue
index 9eb1a4db..703dd66d 100644
--- a/packages/rd/src/runtime/pages/search.vue
+++ b/packages/rd/src/runtime/pages/search.vue
@@ -5,7 +5,7 @@ import { ref } from 'vue';
 import { defineNuxtComponent, definePageMeta, navigateTo } from '#imports';
 import SearchForm from '../components/core/SearchForm.vue';
 import SearchSVG from '../components/svg/SearchSVG';
-import type { RDQueryCriteria } from '../domains';
+import type { QueryCriteria } from '../domains';
 import PreparedQueryForm from '../components/core/PreparedQueryForm.vue';
 
 export default defineNuxtComponent({
@@ -27,7 +27,7 @@ export default defineNuxtComponent({
         };
 
         const handleSubmitted = async (data : {
-            criteria: RDQueryCriteria,
+            criteria: QueryCriteria,
             queryId: string,
             preparedQueryId?: string
         }) => {