diff --git a/lib/components/examples/TableExample.tsx b/lib/components/examples/TableExample.tsx
index fca21e88..114bbeab 100644
--- a/lib/components/examples/TableExample.tsx
+++ b/lib/components/examples/TableExample.tsx
@@ -92,14 +92,14 @@ const TableExample = ({ data: initialData }: Pick<TableProps<DataType>, 'data'>)
         ]}
         header={[
           <SortButton
-            key="headerID"
+            key="headerId"
             ascending={sortingKey === 'id' ? ascending : undefined}
             onClick={newTableSorting => {
               setSorting(['id', newTableSorting])
               setData(data.sort(sortingFunctions.id[newTableSorting]))
             }}
           >
-            <Span type="tableHeader">ID</Span>
+            <Span type="tableHeader">Id</Span>
           </SortButton>,
           <SortButton
             key="name"
diff --git a/tasks/components/AddPatientModal.tsx b/tasks/components/AddPatientModal.tsx
index d0e2030c..d394b15a 100644
--- a/tasks/components/AddPatientModal.tsx
+++ b/tasks/components/AddPatientModal.tsx
@@ -4,7 +4,7 @@ import type { PropsWithLanguage } from '@helpwave/common/hooks/useTranslation'
 import { useTranslation } from '@helpwave/common/hooks/useTranslation'
 import type { ConfirmDialogProps } from '@helpwave/common/components/modals/ConfirmDialog'
 import { ConfirmDialog } from '@helpwave/common/components/modals/ConfirmDialog'
-import type { RoomBedDropDownIDs } from './RoomBedDropDown'
+import type { RoomBedDropDownIds } from './RoomBedDropDown'
 import { RoomBedDropDown } from './RoomBedDropDown'
 import React, { useState } from 'react'
 import { Span } from '@helpwave/common/components/Span'
@@ -35,7 +35,7 @@ const defaultAddPatientModalTranslation: Record<Languages, AddPatientModalTransl
 }
 
 export type AddPatientModalProps = ConfirmDialogProps & {
-  wardID: string
+  wardId: string
 }
 
 /**
@@ -43,26 +43,26 @@ export type AddPatientModalProps = ConfirmDialogProps & {
  */
 export const AddPatientModal = ({
   language,
-  wardID,
+  wardId,
   title,
   onConfirm = noop,
   ...modalProps
 }: PropsWithLanguage<AddPatientModalTranslation, AddPatientModalProps>) => {
   const translation = useTranslation(language, defaultAddPatientModalTranslation)
-  const [dropdownID, setDropdownID] = useState<RoomBedDropDownIDs>({})
+  const [dropdownId, setDropdownId] = useState<RoomBedDropDownIds>({})
   const [patientName, setPatientName] = useState<string>('')
   const [touched, setTouched] = useState<boolean>(false)
   const assignBedMutation = useAssignBedMutation()
   const createPatientMutation = usePatientCreateMutation(patient => {
-    if (dropdownID.bedID) {
-      assignBedMutation.mutate({ id: dropdownID.bedID, patientID: patient.id })
+    if (dropdownId.bedId) {
+      assignBedMutation.mutate({ id: dropdownId.bedId, patientId: patient.id })
     }
   })
 
   const minimumNameLength = 4
   const trimmedPatientName = patientName.trim()
   const validPatientName = trimmedPatientName.length >= minimumNameLength
-  const validRoomAndBed = dropdownID.roomID && dropdownID.bedID
+  const validRoomAndBed = dropdownId.roomId && dropdownId.bedId
   const isShowingError = touched && !validPatientName
 
   return (
@@ -88,9 +88,9 @@ export const AddPatientModal = ({
           {isShowingError && <Span type="formError">{translation.minimumLength(minimumNameLength)}</Span>}
         </div>
         <RoomBedDropDown
-          initialRoomAndBed={dropdownID}
-          wardID={wardID}
-          onChange={roomBedDropDownIDs => setDropdownID(roomBedDropDownIDs)}
+          initialRoomAndBed={dropdownId}
+          wardId={wardId}
+          onChange={roomBedDropDownIds => setDropdownId(roomBedDropDownIds)}
           isClearable={true}
         />
         <Span className={tx({ 'text-hw-warn-400': !validRoomAndBed, 'text-transparent': validRoomAndBed })}>{translation.noBedSelected}</Span>
diff --git a/tasks/components/BreadCrumb.tsx b/tasks/components/BreadCrumb.tsx
index 6d8cb29b..02618f82 100644
--- a/tasks/components/BreadCrumb.tsx
+++ b/tasks/components/BreadCrumb.tsx
@@ -14,7 +14,7 @@ type BreadCrumbProps = {
 /**
  * A component for showing a hierarchical link structure with an independent link on each element
  *
- * e.g. Organizations/Ward/uuid
+ * e.g. Organizations/Ward/<id>
  */
 export const BreadCrumb = ({ crumbs }: BreadCrumbProps) => {
   return (
diff --git a/tasks/components/KanbanColumn.tsx b/tasks/components/KanbanColumn.tsx
index 49d9657b..faa48b09 100644
--- a/tasks/components/KanbanColumn.tsx
+++ b/tasks/components/KanbanColumn.tsx
@@ -32,7 +32,7 @@ type KanbanColumnProps = {
   tasks: TaskDTO[],
   type: TaskStatus,
   isDraggedOver: boolean,
-  draggedTileID?: string,
+  draggedTileId?: string,
   onEditTask: (task: TaskDTO) => void
 }
 
@@ -44,7 +44,7 @@ export const KanbanColumn = ({
   tasks,
   type,
   isDraggedOver,
-  draggedTileID,
+  draggedTileId,
   onEditTask
 }: PropsWithLanguage<KanbanColumnsTranslation, KanbanColumnProps>) => {
   const translation = useTranslation(language, defaultKanbanColumnsTranslations)
@@ -69,7 +69,7 @@ export const KanbanColumn = ({
             <Sortable key={task.id} id={task.id}>
               <TaskCard
                 task={task}
-                isSelected={draggedTileID === task.id}
+                isSelected={draggedTileId === task.id}
                 onTileClick={() => onEditTask(task)}
               />
             </Sortable>
diff --git a/tasks/components/MangeBedsModal.tsx b/tasks/components/MangeBedsModal.tsx
index 98504258..45341a31 100644
--- a/tasks/components/MangeBedsModal.tsx
+++ b/tasks/components/MangeBedsModal.tsx
@@ -57,8 +57,8 @@ const defaultManageBedsModalTranslation: Record<Languages, ManageBedsModalTransl
 }
 
 export type ManageBedsModalProps = Omit<ModalProps, 'title'|'description'> & {
-  wardID: string, // TODO remove later
-  roomID: string,
+  wardId: string, // TODO remove later
+  roomId: string,
   onClose?: () => void
 }
 
@@ -67,19 +67,19 @@ export type ManageBedsModalProps = Omit<ModalProps, 'title'|'description'> & {
  */
 export const ManageBedsModal = ({
   language,
-  wardID,
-  roomID,
+  wardId,
+  roomId,
   onClose = noop,
   modalClassName,
   ...ModalProps
 }: PropsWithLanguage<ManageBedsModalTranslation, ManageBedsModalProps>) => {
   const translation = useTranslation(language, defaultManageBedsModalTranslation)
-  const { data, isLoading, isError } = useRoomOverviewsQuery(wardID) // Todo use more optimized query later
+  const { data, isLoading, isError } = useRoomOverviewsQuery(wardId) // Todo use more optimized query later
   const [tableState, setTableState] = useState<TableState>({
     pagination: defaultTableStatePagination
   })
   const [beds, setBeds] = useState<BedWithPatientWithTasksNumberDTO[]>([])
-  const room = data?.find(value => value.id === roomID)
+  const room = data?.find(value => value.id === roomId)
 
   useEffect(() => {
     if (data) {
@@ -114,7 +114,7 @@ export const ManageBedsModal = ({
             </div>
             <div className={tw('flex flex-row justify-between items-end mb-2')}>
               <Span type="tableName">{`${translation.beds} (${beds.length})`}</Span>
-              <Button color="positive" onClick={() => addBedMutation.mutate({ id: '', name: `${translation.bed} ${room?.beds.length + 1 ?? 1}`, roomID })}>{translation.addBed}</Button>
+              <Button color="positive" onClick={() => addBedMutation.mutate({ id: '', name: `${translation.bed} ${room?.beds.length + 1 ?? 1}`, roomId })}>{translation.addBed}</Button>
             </div>
             <Table
               data={beds}
@@ -133,7 +133,7 @@ export const ManageBedsModal = ({
                     onChange={text => {
                       setBeds(beds.map(value => value.id === bed.id ? { ...value, name: text } : value))
                     }}
-                    onEditCompleted={text => updateBedMutation.mutate({ id: bed.id, name: text, roomID: room.id })}
+                    onEditCompleted={text => updateBedMutation.mutate({ id: bed.id, name: text, roomId: room.id })}
                   />
                 </div>,
                 <div key="patient" className={tw('w-20')}>
diff --git a/tasks/components/OrganisationInvitationList.tsx b/tasks/components/OrganisationInvitationList.tsx
index 1afb4cbd..a4560131 100644
--- a/tasks/components/OrganisationInvitationList.tsx
+++ b/tasks/components/OrganisationInvitationList.tsx
@@ -51,26 +51,26 @@ export type OrganisationInvitation = {
 }
 
 export type OrganisationInvitationListProps = {
-  organizationID: string,
+  organizationId: string,
   invitations?: OrganisationInvitation[],
   onChange: (invites: OrganisationInvitation[]) => void
 }
 
 /**
- * Description
+ * A List showing all members invited to an organisation
  */
 export const OrganisationInvitationList = ({
   language,
-  organizationID,
+  organizationId,
   invitations,
   onChange
 }: PropsWithLanguage<OrganisationInvitationListTranslation, OrganisationInvitationListProps>) => {
   const translation = useTranslation(language, defaultOrganisationInvitationListTranslation)
 
   const context = useContext(OrganizationContext)
-  const usedOrganizationID = organizationID ?? context.state.organizationID
-  const isCreatingOrganization = usedOrganizationID === ''
-  const { data, isLoading, isError } = useInvitationsByOrganisationQuery(context.state.organizationID)
+  const usedOrganizationId = organizationId ?? context.state.organizationId
+  const isCreatingOrganization = usedOrganizationId === ''
+  const { data, isLoading, isError } = useInvitationsByOrganisationQuery(context.state.organizationId)
   const [tableState, setTableState] = useState<TableState>({
     pagination: {
       ...defaultTableStatePagination,
@@ -81,7 +81,7 @@ export const OrganisationInvitationList = ({
   // Maybe move this filter to the endpoint or the query
   const usedInvitations: OrganisationInvitation[] = invitations ?? (data ?? []).filter(value => value.state === InvitationState.INVITATION_STATE_PENDING)
 
-  const inviteMemberMutation = useInviteMemberMutation(usedOrganizationID)
+  const inviteMemberMutation = useInviteMemberMutation(usedOrganizationId)
   const revokeInviteMutation = useInviteRevokeMutation()
   const idMapping = (invite: OrganisationInvitation) => invite.email
   const isValidEmail = !!inviteMemberModalEmail && validateEmail(inviteMemberModalEmail)
@@ -89,8 +89,8 @@ export const OrganisationInvitationList = ({
 
   return (
     <LoadingAndErrorComponent
-      isLoading={isLoading && !!context.state.organizationID}
-      hasError={isError && !!context.state.organizationID}
+      isLoading={isLoading && !!context.state.organizationId}
+      hasError={isError && !!context.state.organizationId}
       errorProps={{ classname: tw('border-2 border-gray-500 rounded-xl') }}
       loadingProps={{ classname: tw('border-2 border-gray-500 rounded-xl') }}
     >
diff --git a/tasks/components/OrganizationMemberList.tsx b/tasks/components/OrganizationMemberList.tsx
index d50d2703..af853d60 100644
--- a/tasks/components/OrganizationMemberList.tsx
+++ b/tasks/components/OrganizationMemberList.tsx
@@ -70,7 +70,7 @@ type DeleteDialogState = {isShowing: boolean, member?: OrgMember}
 const defaultDeleteDialogState: DeleteDialogState = { isShowing: false }
 
 export type OrganizationMemberListProps = {
-  organizationID?: string,
+  organizationId?: string,
   members?: OrgMember[]
 }
 
@@ -79,19 +79,19 @@ export type OrganizationMemberListProps = {
  */
 export const OrganizationMemberList = ({
   language,
-  organizationID,
+  organizationId,
   members
 }: PropsWithLanguage<OrganizationMemberListTranslation, OrganizationMemberListProps>) => {
   const translation = useTranslation(language, defaultOrganizationMemberListTranslations)
   const [tableState, setTableState] = useState<TableState>({ pagination: defaultTableStatePagination, selection: defaultTableStateSelection })
 
   const context = useContext(OrganizationContext)
-  organizationID ??= context.state.organizationID
-  // const { data, isLoading, isError } = useMembersByOrganizationQuery(organizationID) TODO use later
+  organizationId ??= context.state.organizationId
+  // const { data, isLoading, isError } = useMembersByOrganizationQuery(organizationId) TODO use later
   const { data, isError, isLoading } = useOrganizationsByUserQuery()
-  const membersByOrganization = data?.find(value => value.id === organizationID)?.members ?? []
+  const membersByOrganization = data?.find(value => value.id === organizationId)?.members ?? []
   const usedMembers: OrgMember[] = members ?? membersByOrganization ?? []
-  const removeMemberMutation = useRemoveMemberMutation(organizationID)
+  const removeMemberMutation = useRemoveMemberMutation(organizationId)
 
   const [deleteDialogState, setDeleteDialogState] = useState<DeleteDialogState>(defaultDeleteDialogState)
 
@@ -100,8 +100,8 @@ export const OrganizationMemberList = ({
 
   // TODO move this filtering to the Table component
   const admins = usedMembers.filter(value => value.role === Role.admin).map(idMapping)
-  if (tableState.selection?.currentSelection.find(value => admins.find(adminID => adminID === value))) {
-    const newSelection = tableState.selection.currentSelection.filter(value => !admins.find(adminID => adminID === value))
+  if (tableState.selection?.currentSelection.find(value => admins.find(adminId => adminId === value))) {
+    const newSelection = tableState.selection.currentSelection.filter(value => !admins.find(adminId => adminId === value))
     setTableState({
       ...tableState,
       selection: {
diff --git a/tasks/components/RoomBedDropDown.tsx b/tasks/components/RoomBedDropDown.tsx
index bbc92765..326f4ca1 100644
--- a/tasks/components/RoomBedDropDown.tsx
+++ b/tasks/components/RoomBedDropDown.tsx
@@ -46,21 +46,21 @@ const defaultRoomBedDropDownTranslation: Record<Languages, RoomBedDropDownTransl
   }
 }
 
-export type RoomBedDropDownIDs = {
+export type RoomBedDropDownIds = {
   /**
    * undefined value here means select a room and bed
    */
-  roomID?: string,
-  bedID?: string
+  roomId?: string,
+  bedId?: string
 }
 
 export type RoomBedDropDownProps = {
-  initialRoomAndBed: RoomBedDropDownIDs,
-  wardID: string,
+  initialRoomAndBed: RoomBedDropDownIds,
+  wardId: string,
   /**
    * Only triggers on valid input
    */
-  onChange?: (roomBedDropDownIDs:RoomBedDropDownIDs) => void,
+  onChange?: (roomBedDropDownIds:RoomBedDropDownIds) => void,
   isSubmitting?: boolean,
   isClearable?: boolean
 }
@@ -71,35 +71,35 @@ export type RoomBedDropDownProps = {
 export const RoomBedDropDown = ({
   language,
   initialRoomAndBed,
-  wardID,
+  wardId,
   isSubmitting = false,
   isClearable = false,
   onChange = noop
 }: PropsWithLanguage<RoomBedDropDownTranslation, RoomBedDropDownProps>) => {
   const translation = useTranslation(language, defaultRoomBedDropDownTranslation)
-  const { data, isError, isLoading } = usePatientAssignmentByWardQuery(wardID)
-  const [currentSelection, setCurrentSelection] = useState<RoomBedDropDownIDs>({ ...initialRoomAndBed })
+  const { data, isError, isLoading } = usePatientAssignmentByWardQuery(wardId)
+  const [currentSelection, setCurrentSelection] = useState<RoomBedDropDownIds>({ ...initialRoomAndBed })
   const ref = useRef<HTMLDivElement>(null)
-  const currentRoom = data?.find(value => value.id === currentSelection.roomID)
+  const currentRoom = data?.find(value => value.id === currentSelection.roomId)
   const [touched, setTouched] = useState(false)
-  const isCreating = !initialRoomAndBed.roomID
+  const isCreating = !initialRoomAndBed.roomId
 
   useEffect(() => {
     setCurrentSelection(initialRoomAndBed)
   }, [initialRoomAndBed])
 
-  const hasChanges = initialRoomAndBed.bedID !== currentSelection.bedID || initialRoomAndBed.roomID !== currentSelection.roomID
+  const hasChanges = initialRoomAndBed.bedId !== currentSelection.bedId || initialRoomAndBed.roomId !== currentSelection.roomId
 
   const roomSelect = (data && (
     <Select
       className={tw('min-w-[120px]')}
-      value={currentSelection.roomID}
+      value={currentSelection.roomId}
       options={data.map(room => ({ value: room.id, label: room.name, disabled: room.beds.length === 0 }))}
       onChange={value => {
         setCurrentSelection({
           ...currentSelection,
-          roomID: value,
-          bedID: undefined
+          roomId: value,
+          bedId: undefined
         })
         setTouched(true)
       }}
@@ -109,13 +109,13 @@ export const RoomBedDropDown = ({
   const bedSelect = (
     <Select
       className={tw('min-w-[150px]')}
-      value={currentSelection.bedID}
-      isDisabled={!currentSelection.roomID}
+      value={currentSelection.bedId}
+      isDisabled={!currentSelection.roomId}
       options={(currentRoom?.beds ?? []).map(value => ({ value: value.id, label: value.name, disabled: !!value.patient }))}
       onChange={value => {
         const newSelection = {
           ...currentSelection,
-          bedID: value
+          bedId: value
         }
         setCurrentSelection(newSelection)
         setTouched(true)
@@ -149,8 +149,8 @@ export const RoomBedDropDown = ({
           <Button
             onClick={() => {
               setCurrentSelection({
-                bedID: undefined,
-                roomID: undefined
+                bedId: undefined,
+                roomId: undefined
               })
               setTouched(false)
               onChange({})
@@ -175,10 +175,10 @@ export const RoomBedDropDown = ({
       )}
       {touched && !isSubmitting && isCreating && (
         <Span className={tx({
-          '!text-hw-positive-400': currentSelection.roomID && currentSelection.bedID,
-          '!text-hw-negative-400': !(currentSelection.roomID && currentSelection.bedID)
+          '!text-hw-positive-400': currentSelection.roomId && currentSelection.bedId,
+          '!text-hw-negative-400': !(currentSelection.roomId && currentSelection.bedId)
         })}>
-          {currentSelection.roomID && currentSelection.bedID ? translation.valid : translation.invalid}
+          {currentSelection.roomId && currentSelection.bedId ? translation.valid : translation.invalid}
         </Span>
       )}
       {isSubmitting && (
diff --git a/tasks/components/RoomList.tsx b/tasks/components/RoomList.tsx
index 85d517c0..ec07597d 100644
--- a/tasks/components/RoomList.tsx
+++ b/tasks/components/RoomList.tsx
@@ -7,7 +7,7 @@ import { ConfirmDialog } from '@helpwave/common/components/modals/ConfirmDialog'
 import { Button } from '@helpwave/common/components/Button'
 import { Input } from '@helpwave/common/components/user_input/Input'
 import { Span } from '@helpwave/common/components/Span'
-import { OrganizationOverviewContext } from '../pages/organizations/[uuid]'
+import { OrganizationOverviewContext } from '../pages/organizations/[id]'
 import type { RoomOverviewDTO } from '../mutations/room_mutations'
 import {
   emptyRoomOverview,
@@ -106,11 +106,11 @@ export const RoomList = ({
   const creatRoomMutation = useRoomCreateMutation((room) => {
     context.updateContext({ ...context.state })
     setFocusElement({ ...emptyRoomOverview, id: room.id })
-  }, context.state.wardID ?? '') // Not good but should be safe most of the time
+  }, context.state.wardId ?? '') // Not good but should be safe most of the time
   const deleteRoomMutation = useRoomDeleteMutation(() => context.updateContext({ ...context.state }))
   const updateRoomMutation = useRoomUpdateMutation(() => context.updateContext({ ...context.state }))
 
-  const { data, isError, isLoading } = useRoomOverviewsQuery(context.state.wardID) // TODO use a more light weight query
+  const { data, isError, isLoading } = useRoomOverviewsQuery(context.state.wardId) // TODO use a more light weight query
 
   useEffect(() => {
     if (data && !isEditing) {
@@ -157,11 +157,11 @@ export const RoomList = ({
         }}
         confirmType="negative"
       />
-      {managedRoom && context.state.wardID && (
+      {managedRoom && context.state.wardId && (
         <ManageBedsModal
           isOpen={!!managedRoom}
-          wardID={context.state.wardID}
-          roomID={managedRoom}
+          wardId={context.state.wardId}
+          roomId={managedRoom}
           onBackgroundClick={() => setManagedRoom(undefined)}
           onClose={() => setManagedRoom(undefined)}
         />
diff --git a/tasks/components/RoomOverview.tsx b/tasks/components/RoomOverview.tsx
index 009bc7c4..2271dac9 100644
--- a/tasks/components/RoomOverview.tsx
+++ b/tasks/components/RoomOverview.tsx
@@ -5,7 +5,7 @@ import type { RoomOverviewDTO } from '../mutations/room_mutations'
 import { Span } from '@helpwave/common/components/Span'
 import type { BedMinimalDTO } from '../mutations/bed_mutations'
 import { useContext, useEffect, useRef, useState } from 'react'
-import { WardOverviewContext } from '../pages/ward/[uuid]'
+import { WardOverviewContext } from '../pages/ward/[id]'
 import type { PatientDTO } from '../mutations/patient_mutations'
 import { emptyPatient } from '../mutations/patient_mutations'
 import { Droppable } from './dnd-kit/Droppable'
@@ -24,12 +24,12 @@ export const RoomOverview = ({ room }: RoomOverviewProps) => {
   const ref = useRef<HTMLDivElement>(null)
   const [columns, setColumns] = useState(3)
 
-  const setSelectedBed = (room: RoomOverviewDTO, bed: BedMinimalDTO, patientID?: string, patient?: PatientDTO) =>
+  const setSelectedBed = (room: RoomOverviewDTO, bed: BedMinimalDTO, patientId?: string, patient?: PatientDTO) =>
     context.updateContext({
       ...context.state,
-      roomID: room.id,
-      bedID: bed.id,
-      patientID,
+      roomId: room.id,
+      bedId: bed.id,
+      patientId,
       patient
     })
 
@@ -39,7 +39,7 @@ export const RoomOverview = ({ room }: RoomOverviewProps) => {
     }
   }, [ref.current?.offsetWidth])
 
-  const selectedBedID = context.state.bedID
+  const selectedBedId = context.state.bedId
 
   return (
     <div className={tw('flex flex-col w-full')} ref={ref}>
@@ -70,7 +70,7 @@ export const RoomOverview = ({ room }: RoomOverviewProps) => {
                               setSelectedBed(room, bed, bed.patient.id)
                             }
                           }}
-                          isSelected={selectedBedID === bed.id}
+                          isSelected={selectedBedId === bed.id}
                           cardDragProperties={{ isOver, isDangerous: true }}
                         />
                       )}
@@ -93,7 +93,7 @@ export const RoomOverview = ({ room }: RoomOverviewProps) => {
                         name: `Patient ${room?.beds.findIndex(bedOfRoom => bedOfRoom.id === bed.id) ?? 1}`
                       })
                     }}
-                    isSelected={selectedBedID === bed.id}
+                    isSelected={selectedBedId === bed.id}
                   />
                 ) : (
                   <PatientCard
diff --git a/tasks/components/SubtaskView.tsx b/tasks/components/SubtaskView.tsx
index 2aec6c11..a1c1db89 100644
--- a/tasks/components/SubtaskView.tsx
+++ b/tasks/components/SubtaskView.tsx
@@ -39,7 +39,7 @@ const defaultSubtaskViewTranslation = {
 type SubtaskViewProps = {
   // TODO: This component should not decide between two mutate functions. Pass mutate function instead.
   subtasks: SubTaskDTO[],
-  taskID?: string,
+  taskId?: string,
   createdBy?: string,
   taskTemplateId?: string,
   onChange: (subtasks: SubTaskDTO[]) => void
@@ -51,7 +51,7 @@ type SubtaskViewProps = {
 export const SubtaskView = ({
   language,
   subtasks,
-  taskID,
+  taskId,
   taskTemplateId,
   onChange,
 }: PropsWithLanguage<SubtaskViewTranslation, SubtaskViewProps>) => {
@@ -103,7 +103,7 @@ export const SubtaskView = ({
                 }}
                 onRemoveClick={() => {
                   const filteredSubtasks = subtasks.filter((_, subtaskIndex) => subtaskIndex !== index)
-                  if (!taskID) {
+                  if (!taskId) {
                     context.updateContext({
                       ...context.state,
                       template: { ...context.state.template, subtasks: filteredSubtasks },
diff --git a/tasks/components/TaskDetailModal.tsx b/tasks/components/TaskDetailModal.tsx
index 26a108f4..d0ee254d 100644
--- a/tasks/components/TaskDetailModal.tsx
+++ b/tasks/components/TaskDetailModal.tsx
@@ -10,8 +10,8 @@ export type TaskDetailModalProps = ModalProps & TaskDetailViewProps
  * A Modal Wrapper for the task detail view
  */
 export const TaskDetailModal = ({
-  taskID,
-  patientID,
+  taskId,
+  patientId,
   onClose,
   modalClassName,
   ...modalProps
@@ -21,7 +21,7 @@ export const TaskDetailModal = ({
       modalClassName={tx(modalClassName)}
       {...modalProps}
     >
-      <TaskDetailView patientID={patientID} taskID={taskID} onClose={onClose}/>
+      <TaskDetailView patientId={patientId} taskId={taskId} onClose={onClose}/>
     </Modal>
   )
 }
diff --git a/tasks/components/TaskTemplateListColumn.tsx b/tasks/components/TaskTemplateListColumn.tsx
index c10d1650..4150fcf1 100644
--- a/tasks/components/TaskTemplateListColumn.tsx
+++ b/tasks/components/TaskTemplateListColumn.tsx
@@ -29,7 +29,7 @@ export type TaskTemplateDTOExtension = {taskTemplate: TaskTemplateDTO, type: 'pe
 export type TaskTemplateListColumnProps = {
   taskTemplates: TaskTemplateDTOExtension[],
   onTileClick: (taskTemplate: TaskTemplateDTO) => void,
-  selectedID?: string,
+  selectedId?: string,
   onColumnEditClick?: () => void
 }
 
@@ -40,7 +40,7 @@ export const TaskTemplateListColumn = ({
   language,
   taskTemplates,
   onTileClick,
-  selectedID = '',
+  selectedId = '',
   onColumnEditClick
 }: PropsWithLanguage<TaskTemplateListColumnTranslation, TaskTemplateListColumnProps>) => {
   const translation = useTranslation(language, defaultTaskTemplateListColumnTranslation)
@@ -68,7 +68,7 @@ export const TaskTemplateListColumn = ({
                   key={taskTemplateExtension.taskTemplate.id}
                   name={taskTemplateExtension.taskTemplate.name}
                   subtaskCount={taskTemplateExtension.taskTemplate.subtasks.length}
-                  isSelected={selectedID === taskTemplateExtension.taskTemplate.id}
+                  isSelected={selectedId === taskTemplateExtension.taskTemplate.id}
                   onTileClick={() => onTileClick(taskTemplateExtension.taskTemplate)}
                   className={tx('border-2 border-gray-300 !pr-2', { 'mb-2': index === taskTemplates.length - 1 })}
                   typeForLabel={taskTemplateExtension.type}
diff --git a/tasks/components/TaskTemplateWardPreview.tsx b/tasks/components/TaskTemplateWardPreview.tsx
index 5a71aa10..c091146f 100644
--- a/tasks/components/TaskTemplateWardPreview.tsx
+++ b/tasks/components/TaskTemplateWardPreview.tsx
@@ -7,7 +7,7 @@ import { Button } from '@helpwave/common/components/Button'
 import { useRouter } from 'next/router'
 import { TaskTemplateCard } from './cards/TaskTemplateCard'
 import { useContext } from 'react'
-import { OrganizationOverviewContext } from '../pages/organizations/[uuid]'
+import { OrganizationOverviewContext } from '../pages/organizations/[id]'
 import { useWardTaskTemplateQuery } from '../mutations/task_template_mutations'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
@@ -28,7 +28,7 @@ const defaultTaskTemplateWardPreviewTranslation: Record<Languages, TaskTemplateW
 }
 
 export type TaskTemplateWardPreviewProps = {
-  wardID?: string,
+  wardId?: string,
   columns?: number
 }
 
@@ -37,7 +37,7 @@ export type TaskTemplateWardPreviewProps = {
  */
 export const TaskTemplateWardPreview = ({
   language,
-  wardID,
+  wardId,
   columns = 3
 }: PropsWithLanguage<TaskTemplateWardPreviewTranslation, TaskTemplateWardPreviewProps>) => {
   const translation = useTranslation(language, defaultTaskTemplateWardPreviewTranslation)
@@ -45,14 +45,14 @@ export const TaskTemplateWardPreview = ({
 
   const context = useContext(OrganizationOverviewContext)
 
-  const { data, isLoading, isError } = useWardTaskTemplateQuery(wardID)
+  const { data, isLoading, isError } = useWardTaskTemplateQuery(wardId)
 
-  wardID ??= context.state.wardID
+  wardId ??= context.state.wardId
   const taskTemplates = data
 
   return (
     <LoadingAndErrorComponent
-      isLoading={isLoading || !context.state.wardID}
+      isLoading={isLoading || !context.state.wardId}
       hasError={isError}
       loadingProps={{ classname: tw('border-2 border-gray-500 rounded-xl min-h-[200px]') }}
       errorProps={{ classname: tw('border-2 border-gray-500 rounded-xl min-h-[200px]') }}
@@ -63,7 +63,7 @@ export const TaskTemplateWardPreview = ({
             <Span type="tableName">{translation.taskTemplates(taskTemplates.length)}</Span>
             <Button
               className={tw('w-auto')}
-              onClick={() => router.push(`/ward/${wardID}/templates`)}
+              onClick={() => router.push(`/ward/${wardId}/templates`)}
             >
               {translation.showAllTaskTemplates}
             </Button>
@@ -75,7 +75,7 @@ export const TaskTemplateWardPreview = ({
                 name={taskTemplate.name}
                 subtaskCount={taskTemplate.subtasks.length}
                 onTileClick={() => {
-                  router.push(`/ward/${wardID}/templates?templateID=${taskTemplate.id}`).then()
+                  router.push(`/ward/${wardId}/templates?templateId=${taskTemplate.id}`).then()
                 }}
               />
             ))}
diff --git a/tasks/components/layout/OrganizationDetails.tsx b/tasks/components/layout/OrganizationDetails.tsx
index 82ff8246..77e67b1e 100644
--- a/tasks/components/layout/OrganizationDetails.tsx
+++ b/tasks/components/layout/OrganizationDetails.tsx
@@ -67,8 +67,8 @@ export const OrganizationDetail = ({
     updateContext
   } = useContext(OrganizationContext)
 
-  const isCreatingNewOrganization = contextState.organizationID === ''
-  const { data } = useOrganizationQuery(contextState.organizationID)
+  const isCreatingNewOrganization = contextState.organizationId === ''
+  const { data } = useOrganizationQuery(contextState.organizationId)
   const [isShowingConfirmDialog, setIsShowingConfirmDialog] = useState(false)
   const [organizationForm, setOrganizationForm] = useState<OrganizationFormType>(emptyOrganizationForm)
   const [organizationInvites, setOrganizationInvites] = useState<OrganisationInvitation[]>([])
@@ -83,14 +83,14 @@ export const OrganizationDetail = ({
     }
   }, [data, isCreatingNewOrganization])
 
-  const inviteMemberMutation = useInviteMemberMutation(contextState.organizationID)
+  const inviteMemberMutation = useInviteMemberMutation(contextState.organizationId)
 
   const createMutation = useOrganizationCreateMutation(organization => {
     organizationInvites.forEach(invite => inviteMemberMutation.mutate({
       email: invite.email,
-      organizationID: organization.id
+      organizationId: organization.id
     }))
-    updateContext({ organizationID: organization.id })
+    updateContext({ organizationId: organization.id })
   })
 
   const updateMutation = useOrganizationUpdateMutation(organization => {
@@ -104,12 +104,12 @@ export const OrganizationDetail = ({
   })
 
   const deleteMutation = useOrganizationDeleteMutation(() => updateContext({
-    organizationID: ''
+    organizationId: ''
   }))
 
   return (
     <div
-      key={contextState.organizationID}
+      key={contextState.organizationId}
       className={tw('flex flex-col py-4 px-6')}
     >
       <ConfirmDialog
@@ -120,7 +120,7 @@ export const OrganizationDetail = ({
         onBackgroundClick={() => setIsShowingConfirmDialog(false)}
         onConfirm={() => {
           setIsShowingConfirmDialog(false)
-          deleteMutation.mutate(contextState.organizationID)
+          deleteMutation.mutate(contextState.organizationId)
         }}
         confirmType="negative"
       />
@@ -142,7 +142,7 @@ export const OrganizationDetail = ({
         <OrganisationInvitationList
           onChange={setOrganizationInvites}
           invitations={isCreatingNewOrganization ? organizationInvites : undefined}
-          organizationID={contextState.organizationID}
+          organizationId={contextState.organizationId}
         />
         <div className={tw('flex flex-row justify-end')}>
           <Button
diff --git a/tasks/components/layout/OrganizationDisplay.tsx b/tasks/components/layout/OrganizationDisplay.tsx
index 1a43881e..8ae18f33 100644
--- a/tasks/components/layout/OrganizationDisplay.tsx
+++ b/tasks/components/layout/OrganizationDisplay.tsx
@@ -28,7 +28,7 @@ const defaultOrganizationDisplayTranslations: Record<Languages, OrganizationDisp
 }
 
 export type OrganizationDisplayProps = {
-  selectedOrganizationID?: string,
+  selectedOrganizationId?: string,
   organizations?: OrganizationDTO[],
   width?: number
 }
@@ -38,7 +38,7 @@ export type OrganizationDisplayProps = {
  */
 export const OrganizationDisplay = ({
   language,
-  selectedOrganizationID,
+  selectedOrganizationId,
   organizations,
   width
 }: PropsWithLanguage<OrganizationDisplayTranslation, OrganizationDisplayProps>) => {
@@ -51,7 +51,7 @@ export const OrganizationDisplay = ({
 
   const columns = !width ? 3 : Math.min(Math.max(Math.floor(width / 250), 1), 3)
 
-  const usedSelectedID = selectedOrganizationID ?? context.state.organizationID
+  const usedSelectedId = selectedOrganizationId ?? context.state.organizationId
   return (
     <div className={tw('py-4 px-6')}>
       <ColumnTitle title={translation.yourOrganizations}/>
@@ -60,15 +60,15 @@ export const OrganizationDisplay = ({
           <OrganizationCard
             key={organization.id}
             organization={organization}
-            isSelected={usedSelectedID === organization.id}
-            onEditClick={() => context.updateContext({ ...context.state, organizationID: organization.id })}
+            isSelected={usedSelectedId === organization.id}
+            onEditClick={() => context.updateContext({ ...context.state, organizationId: organization.id })}
             onTileClick={async () => await router.push(`/organizations/${organization.id}`)}
           />
         ))}
         <AddCard
           text={translation.addOrganization}
-          onTileClick={() => context.updateContext({ ...context.state, organizationID: '' })}
-          isSelected={usedSelectedID === ''}
+          onTileClick={() => context.updateContext({ ...context.state, organizationId: '' })}
+          isSelected={usedSelectedId === ''}
           className={tw('h-24')}
         />
       </div>
diff --git a/tasks/components/layout/PatientDetails.tsx b/tasks/components/layout/PatientDetails.tsx
index 7f043cbe..9c4ac849 100644
--- a/tasks/components/layout/PatientDetails.tsx
+++ b/tasks/components/layout/PatientDetails.tsx
@@ -19,9 +19,10 @@ import {
   usePatientUpdateMutation,
   useUnassignMutation
 } from '../../mutations/patient_mutations'
-import { WardOverviewContext } from '../../pages/ward/[uuid]'
+import { WardOverviewContext } from '../../pages/ward/[id]'
 import useSaveDelay from '@helpwave/common/hooks/useSaveDelay'
 import { RoomBedDropDown } from '../RoomBedDropDown'
+import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
 type PatientDetailTranslation = {
   patientDetails: string,
@@ -60,7 +61,7 @@ export type PatientDetailProps = {
 }
 
 /**
- * The right side of the ward/[uuid].tsx page showing the detailed information about the patient
+ * The right side of the ward/[id].tsx page showing the detailed information about the patient
  */
 export const PatientDetail = ({
   language,
@@ -72,12 +73,12 @@ export const PatientDetail = ({
   const context = useContext(WardOverviewContext)
 
   const updateMutation = usePatientUpdateMutation(() => undefined)
-  const dischargeMutation = usePatientDischargeMutation(() => context.updateContext({ wardID: context.state.wardID }))
-  const unassignMutation = useUnassignMutation(() => context.updateContext({ wardID: context.state.wardID }))
-  const { data, isError, isLoading } = usePatientDetailsQuery(context.state.patientID)
+  const dischargeMutation = usePatientDischargeMutation(() => context.updateContext({ wardId: context.state.wardId }))
+  const unassignMutation = useUnassignMutation(() => context.updateContext({ wardId: context.state.wardId }))
+  const { data, isError, isLoading } = usePatientDetailsQuery(context.state.patientId)
 
   const [newPatient, setNewPatient] = useState<PatientDetailsDTO>(patient)
-  const [taskID, setTaskID] = useState<string>()
+  const [taskId, setTaskId] = useState<string>()
   const [isShowingSavedNotification, setIsShowingSavedNotification] = useState(false)
 
   const maxHumanReadableIdentifierLength = 24
@@ -100,15 +101,7 @@ export const PatientDetail = ({
     restartTimer(() => updateMutation.mutate(patient))
   }
 
-  if (isError) {
-    return <div>Error in PatientDetails!</div>
-  }
-
-  if (isLoading) {
-    return <div>Loading PatientDetails!</div>
-  }
-
-  const isShowingTask = (!!taskID || taskID === '')
+  const isShowingTask = (!!taskId || taskId === '')
 
   return (
     <div className={tw('relative flex flex-col py-4 px-6')}>
@@ -132,69 +125,73 @@ export const PatientDetail = ({
         }}
         confirmType="negative"
       />
-      {/* taskID === '' is create and if set it's the tasks id */}
+      {/* taskId === '' is create and if set it's the tasks id */}
       {isShowingTask && (
         <TaskDetailModal
           isOpen={true}
-          onBackgroundClick={() => setTaskID(undefined)}
-          onClose={() => setTaskID(undefined)}
-          taskID={taskID}
-          patientID={newPatient.id}
+          onBackgroundClick={() => setTaskId(undefined)}
+          onClose={() => setTaskId(undefined)}
+          taskId={taskId}
+          patientId={newPatient.id}
         />
       )}
       <ColumnTitle title={translation.patientDetails}/>
-      <div className={tw('flex flex-row gap-x-6 mb-8')}>
-        <div className={tw('flex flex-col gap-y-2 w-5/12')}>
-          <div className={tw('h-12 w-full')}>
-            <ToggleableInput
-              maxLength={maxHumanReadableIdentifierLength}
-              labelClassName={tw('text-xl font-semibold')}
-              className={tw('text-lg font-semibold')}
-              id="humanReadableIdentifier"
-              value={newPatient.name}
-              onChange={name => changeSavedValue({ ...newPatient, name })}
+      <LoadingAndErrorComponent
+        isLoading={isLoading}
+        hasError={isError}
+      >
+        <div className={tw('flex flex-row gap-x-6 mb-8')}>
+          <div className={tw('flex flex-col gap-y-2 w-5/12')}>
+            <div className={tw('h-12 w-full')}>
+              <ToggleableInput
+                maxLength={maxHumanReadableIdentifierLength}
+                labelClassName={tw('text-xl font-semibold')}
+                className={tw('text-lg font-semibold')}
+                id="humanReadableIdentifier"
+                value={newPatient.name}
+                onChange={name => changeSavedValue({ ...newPatient, name })}
+              />
+            </div>
+            <RoomBedDropDown
+              initialRoomAndBed={{ roomId: context.state.roomId ?? '', bedId: context.state.bedId ?? '' }}
+              wardId={context.state.wardId}
+              onChange={roomBedDropDownIds => {
+                if (roomBedDropDownIds.bedId && context.state.patientId) {
+                  context.updateContext({ ...context.state, ...roomBedDropDownIds })
+                  assignBedMutation.mutate({ id: roomBedDropDownIds.bedId, patientId: context.state.patientId })
+                }
+              }}
+              isSubmitting={isSubmitting}
+            />
+          </div>
+          <div className={tw('flex-1')}>
+            <Textarea
+              headline={translation.notes}
+              value={newPatient.note}
+              onChange={text => changeSavedValue({ ...newPatient, note: text })}
             />
           </div>
-          <RoomBedDropDown
-            // TODO make this possible with a optional room id
-            initialRoomAndBed={{ roomID: context.state.roomID ?? '', bedID: context.state.bedID ?? '' }}
-            wardID={context.state.wardID}
-            onChange={roomBedDropDownIDs => {
-              if (roomBedDropDownIDs.bedID && context.state.patient) {
-                context.updateContext({ ...context.state, ...roomBedDropDownIDs })
-                assignBedMutation.mutate({ id: roomBedDropDownIDs.bedID, patientID: context.state.patient?.id })
-              }
-            }}
-            isSubmitting={isSubmitting}
-          />
         </div>
-        <div className={tw('flex-1')}>
-          <Textarea
-            headline={translation.notes}
-            value={newPatient.note}
-            onChange={text => changeSavedValue({ ...newPatient, note: text })}
+        {!!newPatient.id && (
+          <TasksKanbanBoard
+            key={newPatient.id}
+            patientId={newPatient.id}
+            editedTaskId={taskId}
+            onEditTask={task => {
+              setTaskId(task.id)
+            }}
           />
+        )}
+        <div className={tw('flex flex-row justify-end mt-8 gap-x-4')}>
+          <Button color="warn" onClick={() => unassignMutation.mutate(newPatient.id)}>{translation.unassign}</Button>
+          <Button color="negative"
+                  onClick={() => setIsShowingDischargeDialog(true)}>{translation.dischargePatient}</Button>
+          <Button color="accent" onClick={() => {
+            clearUpdateTimer(true)
+            updateMutation.mutate(newPatient)
+          }}>{translation.saveChanges}</Button>
         </div>
-      </div>
-      {!!newPatient.id && (
-        <TasksKanbanBoard
-          key={newPatient.id}
-          patientID={newPatient.id}
-          editedTaskID={taskID}
-          onEditTask={task => {
-            setTaskID(task.id)
-          }}
-        />
-      )}
-      <div className={tw('flex flex-row justify-end mt-8 gap-x-4')}>
-        <Button color="warn" onClick={() => unassignMutation.mutate(newPatient.id)}>{translation.unassign}</Button>
-        <Button color="negative"
-                onClick={() => setIsShowingDischargeDialog(true)}>{translation.dischargePatient}</Button>
-        <Button color="accent" onClick={() => {
-          clearUpdateTimer(true)
-          updateMutation.mutate(newPatient)
-        }}>{translation.saveChanges}</Button>
-      </div>
+      </LoadingAndErrorComponent>
     </div>
   )
 }
diff --git a/tasks/components/layout/PatientList.tsx b/tasks/components/layout/PatientList.tsx
index 4ae711fb..ff00898a 100644
--- a/tasks/components/layout/PatientList.tsx
+++ b/tasks/components/layout/PatientList.tsx
@@ -17,7 +17,7 @@ import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAnd
 import { HideableContentSection } from '@helpwave/common/components/HideableContentSection'
 import { Draggable } from '../dnd-kit/Draggable'
 import { Droppable } from '../dnd-kit/Droppable'
-import { WardOverviewContext } from '../../pages/ward/[uuid]'
+import { WardOverviewContext } from '../../pages/ward/[id]'
 import { AddPatientModal } from '../AddPatientModal'
 
 type PatientListTranslation = {
@@ -85,7 +85,7 @@ export type PatientListProps = {
 }
 
 /**
- * The right side of the ward/[uuid].tsx page showing the detailed information about the patients in the ward
+ * The right side of the ward/[id].tsx page showing the detailed information about the patients in the ward
  */
 export const PatientList = ({
   language,
@@ -112,7 +112,7 @@ export const PatientList = ({
         onConfirm={() => setIsShowingAddPatientModal(0)}
         onCancel={() => setIsShowingAddPatientModal(0)}
         onBackgroundClick={() => setIsShowingAddPatientModal(0)}
-        wardID={context.wardID}
+        wardId={context.wardId}
       />
       <div className={tw('flex flex-row gap-x-2 items-center')}>
         <Span type="subsectionTitle" className={tw('pr-4')}>{translation.patients}</Span>
@@ -145,7 +145,7 @@ export const PatientList = ({
                   {() => (
                     <div
                       className={tw('flex flex-row pt-2 border-b-2 justify-between items-center cursor-pointer')}
-                      onClick={() => updateContext({ ...context, patientID: patient.id, roomID: patient.room.id, bedID: patient.bed.id })}
+                      onClick={() => updateContext({ ...context, patientId: patient.id, roomId: patient.room.id, bedId: patient.bed.id })}
                     >
                       <Span className={tw('font-space font-bold w-1/3 text-ellipsis')}>{patient.name}</Span>
                       <div className={tw('flex flex-row flex-1 justify-between items-center')}>
@@ -180,7 +180,7 @@ export const PatientList = ({
                         <div
                           key={patient.id}
                           className={tw('flex flex-row pt-2 border-b-2 items-center cursor-pointer')}
-                          onClick={() => updateContext({ wardID: context.wardID, patientID: patient.id })}
+                          onClick={() => updateContext({ wardId: context.wardId, patientId: patient.id })}
                         >
                           <Span className={tw('font-space font-bold w-1/3 text-ellipsis')}>{patient.name}</Span>
                           <div className={tw('flex flex-row flex-1 justify-between items-center')}>
@@ -217,7 +217,7 @@ export const PatientList = ({
                         <div
                           key={patient.id}
                           className={tw('flex flex-row pt-2 border-b-2 justify-between items-center')}
-                          onClick={() => updateContext({ wardID: context.wardID, patientID: patient.id })}
+                          onClick={() => updateContext({ wardId: context.wardId, patientId: patient.id })}
                         >
                           <Span className={tw('font-space font-bold')}>{patient.name}</Span>
                           { /* TODO implement when backend endpoint exists
diff --git a/tasks/components/layout/TaskDetailView.tsx b/tasks/components/layout/TaskDetailView.tsx
index 8794c7e4..73a3c37b 100644
--- a/tasks/components/layout/TaskDetailView.tsx
+++ b/tasks/components/layout/TaskDetailView.tsx
@@ -85,8 +85,8 @@ const defaultTaskDetailViewTranslation: Record<Languages, TaskDetailViewTranslat
 }
 
 export type TaskDetailViewProps = {
-  taskID: string,
-  patientID: string,
+  taskId: string,
+  patientId: string,
   onClose: () => void
 }
 
@@ -95,31 +95,31 @@ export type TaskDetailViewProps = {
  */
 export const TaskDetailView = ({
   language,
-  patientID,
-  taskID,
+  patientId,
+  taskId,
   onClose
 }: PropsWithLanguage<TaskDetailViewTranslation, TaskDetailViewProps>) => {
   const translation = useTranslation(language, defaultTaskDetailViewTranslation)
   const [selectedTemplate, setSelectedTemplate] = useState<TaskTemplateDTO | undefined>(undefined)
   const router = useRouter()
-  const { uuid: wardId } = router.query
+  const { id: wardId } = router.query
   const { user } = useAuth()
 
   const minTaskNameLength = 4
   const maxTaskNameLength = 32
 
-  const isCreating = taskID === ''
-  const { data, isLoading, isError } = useTaskQuery(taskID)
+  const isCreating = taskId === ''
+  const { data, isLoading, isError } = useTaskQuery(taskId)
 
   const [task, setTask] = useState<TaskDTO>({ ...emptyTask })
 
-  const addSubtaskMutation = useSubTaskAddMutation(() => undefined, taskID)
+  const addSubtaskMutation = useSubTaskAddMutation(() => undefined, taskId)
 
   const createTaskMutation = useTaskCreateMutation(newTask => {
     newTask.subtasks.forEach(value =>
-      addSubtaskMutation.mutate({ ...value, taskID: newTask.id }))
+      addSubtaskMutation.mutate({ ...value, taskId: newTask.id }))
     onClose()
-  }, patientID)
+  }, patientId)
 
   const updateTaskMutation = useTaskUpdateMutation()
   const deleteTaskMutation = useTaskDeleteMutation(onClose)
@@ -128,10 +128,10 @@ export const TaskDetailView = ({
   const toDoneMutation = useTaskToDoneMutation()
 
   useEffect(() => {
-    if (data && taskID) {
+    if (data && taskId) {
       setTask(data)
     }
-  }, [data, taskID])
+  }, [data, taskId])
 
   const {
     data: personalTaskTemplatesData,
@@ -178,7 +178,7 @@ export const TaskDetailView = ({
               onChange={description => setTask({ ...task, notes: description })}
             />
           </div>
-          <SubtaskView subtasks={task.subtasks} taskID={taskID} onChange= {subtasks => {
+          <SubtaskView subtasks={task.subtasks} taskId={taskId} onChange= {subtasks => {
             setTask({ ...task, subtasks })
           }}/>
         </div>
@@ -288,7 +288,7 @@ export const TaskDetailView = ({
           }))),
           ...(wardTaskTemplatesData.map(taskTemplate => ({ taskTemplate, type: 'ward' as const })))]
             .sort((a, b) => a.taskTemplate.name.localeCompare(b.taskTemplate.name))}
-          selectedID={selectedTemplate?.id ?? ''}
+          selectedId={selectedTemplate?.id ?? ''}
           onTileClick={(taskTemplate) => {
             setSelectedTemplate(taskTemplate)
             setTask({
diff --git a/tasks/components/layout/TaskTemplateDisplay.tsx b/tasks/components/layout/TaskTemplateDisplay.tsx
index a38268ca..5ac98848 100644
--- a/tasks/components/layout/TaskTemplateDisplay.tsx
+++ b/tasks/components/layout/TaskTemplateDisplay.tsx
@@ -30,7 +30,7 @@ const defaultTaskTemplateDisplayTranslation: Record<Languages, TaskTemplateDispl
 }
 
 export type TaskTemplateDisplayProps = {
-  selectedID: string,
+  selectedId: string,
   onSelectChange: (taskTemplate: TaskTemplateDTO | undefined) => void,
   taskTemplates: TaskTemplateDTO[],
   variant: 'wardTemplates' | 'personalTemplates',
@@ -42,7 +42,7 @@ export type TaskTemplateDisplayProps = {
  */
 export const TaskTemplateDisplay = ({
   language,
-  selectedID,
+  selectedId,
   onSelectChange,
   taskTemplates,
   variant,
@@ -50,20 +50,20 @@ export const TaskTemplateDisplay = ({
 }: PropsWithLanguage<TaskTemplateDisplayTranslation, TaskTemplateDisplayProps>) => {
   const translation = useTranslation(language, defaultTaskTemplateDisplayTranslation)
   const router = useRouter()
-  const { uuid, wardID } = router.query
+  const { id, wardId } = router.query
   const columns = width === undefined ? 3 : Math.max(1, Math.floor(width / 180))
 
-  const switchToPersonalLink = uuid ? `/templates?wardID=${uuid}` : '/templates'
+  const switchToPersonalLink = id ? `/templates?wardId=${id}` : '/templates'
   return (
     <div className={tw('py-4 px-6')}>
       <div className={tw('flex flex-row items-center justify-between mb-4')}>
         <Span type="subsectionTitle">
           {variant === 'personalTemplates' ? translation.personalTaskTemplates : translation.wardTaskTemplates}
         </Span>
-        { (variant === 'wardTemplates' || wardID) && (
+        { (variant === 'wardTemplates' || wardId) && (
           <Button
             onClick={() => {
-              router.push(variant === 'personalTemplates' ? `/ward/${wardID}/templates` : switchToPersonalLink).then()
+              router.push(variant === 'personalTemplates' ? `/ward/${wardId}/templates` : switchToPersonalLink).then()
             }}
             className={tw('flex flex-row gap-x-1 items-center w-auto')}
           >
@@ -79,13 +79,13 @@ export const TaskTemplateDisplay = ({
             key={taskTemplate.id}
             name={taskTemplate.name}
             subtaskCount={taskTemplate.subtasks.length}
-            isSelected={selectedID === taskTemplate.id}
+            isSelected={selectedId === taskTemplate.id}
             onEditClick={() => onSelectChange(taskTemplate)}
             onTileClick={() => onSelectChange(taskTemplate)}
           />
         ))}
         <AddCard
-          isSelected={selectedID === ''}
+          isSelected={selectedId === ''}
           onTileClick={() => onSelectChange(undefined)}
           text={translation.addNewTaskTemplate}
           className={tw('h-auto')}
diff --git a/tasks/components/layout/TasksKanabanBoard.tsx b/tasks/components/layout/TasksKanabanBoard.tsx
index 29bc6da1..916fe728 100644
--- a/tasks/components/layout/TasksKanabanBoard.tsx
+++ b/tasks/components/layout/TasksKanabanBoard.tsx
@@ -25,15 +25,15 @@ import React, { useEffect, useState } from 'react'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
 export type KanbanBoardObject = {
-  draggedID?: string,
+  draggedId?: string,
   searchValue: string,
   overColumn?: TaskStatus
 }
 
 type KanbanBoardProps = {
-  patientID: string,
+  patientId: string,
   onEditTask: (task: TaskDTO) => void,
-  editedTaskID?: string
+  editedTaskId?: string
 }
 
 /**
@@ -42,11 +42,11 @@ type KanbanBoardProps = {
  * The State is managed by the parent component
  */
 export const TasksKanbanBoard = ({
-  patientID,
+  patientId,
   onEditTask,
-  editedTaskID
+  editedTaskId
 }: KanbanBoardProps) => {
-  const { data, isLoading, isError } = useTasksByPatientSortedByStatusQuery(patientID)
+  const { data, isLoading, isError } = useTasksByPatientSortedByStatusQuery(patientId)
   const [boardObject, setBoardObject] = useState<KanbanBoardObject>({ searchValue: '' })
   const [sortedTasks, setSortedTasks] = useState<SortedTasks>(emptySortedTasks)
 
@@ -68,18 +68,18 @@ export const TasksKanbanBoard = ({
   const taskToDoneMutation = useTaskToDoneMutation()
 
   const onEndChanging = () => {
-    if (!boardObject.draggedID) {
+    if (!boardObject.draggedId) {
       return
     }
     switch (boardObject.overColumn) {
       case TaskStatus.TASK_STATUS_TODO:
-        taskToToDoMutation.mutate(boardObject.draggedID)
+        taskToToDoMutation.mutate(boardObject.draggedId)
         break
       case TaskStatus.TASK_STATUS_IN_PROGRESS:
-        taskToInProgressMutation.mutate(boardObject.draggedID)
+        taskToInProgressMutation.mutate(boardObject.draggedId)
         break
       case TaskStatus.TASK_STATUS_DONE:
-        taskToDoneMutation.mutate(boardObject.draggedID)
+        taskToDoneMutation.mutate(boardObject.draggedId)
         break
       default:
         break
@@ -105,7 +105,7 @@ export const TasksKanbanBoard = ({
   }
 
   const handleDragStart = ({ active }: DragStartEvent) => {
-    setBoardObject({ ...boardObject, draggedID: active.id as string })
+    setBoardObject({ ...boardObject, draggedId: active.id as string })
   }
 
   const handleDragOver = ({ active, over }: DragOverEvent) => {
@@ -150,7 +150,7 @@ export const TasksKanbanBoard = ({
     const activeIndex = sortedTasks[activeColumn].findIndex(task => task.id === active.id)
     const overIndex = sortedTasks[overColumn].findIndex(task => task.id === over?.id)
 
-    setBoardObject({ ...boardObject, draggedID: undefined, overColumn: undefined })
+    setBoardObject({ ...boardObject, draggedId: undefined, overColumn: undefined })
     if (activeIndex !== overIndex) {
       const newSortedTasks = {
         ...sortedTasks,
@@ -167,8 +167,8 @@ export const TasksKanbanBoard = ({
     ...defaultDropAnimation,
   }
 
-  const task = boardObject.draggedID ?
-      [...sortedTasks[TaskStatus.TASK_STATUS_TODO], ...sortedTasks[TaskStatus.TASK_STATUS_IN_PROGRESS], ...sortedTasks[TaskStatus.TASK_STATUS_DONE]].find(value => value && value.id === boardObject.draggedID)
+  const task = boardObject.draggedId ?
+      [...sortedTasks[TaskStatus.TASK_STATUS_TODO], ...sortedTasks[TaskStatus.TASK_STATUS_IN_PROGRESS], ...sortedTasks[TaskStatus.TASK_STATUS_DONE]].find(value => value && value.id === boardObject.draggedId)
     : null
 
   function filterBySearch(tasks: TaskDTO[]): TaskDTO[] {
@@ -198,21 +198,21 @@ export const TasksKanbanBoard = ({
           <KanbanColumn
             type={TaskStatus.TASK_STATUS_TODO}
             tasks={filterBySearch(sortedTasks[TaskStatus.TASK_STATUS_TODO])}
-            draggedTileID={boardObject.draggedID ?? editedTaskID}
+            draggedTileId={boardObject.draggedId ?? editedTaskId}
             isDraggedOver={boardObject.overColumn === TaskStatus.TASK_STATUS_TODO}
             onEditTask={onEditTask}
           />
           <KanbanColumn
             type={TaskStatus.TASK_STATUS_IN_PROGRESS}
             tasks={filterBySearch(sortedTasks[TaskStatus.TASK_STATUS_IN_PROGRESS])}
-            draggedTileID={boardObject.draggedID ?? editedTaskID}
+            draggedTileId={boardObject.draggedId ?? editedTaskId}
             isDraggedOver={boardObject.overColumn === TaskStatus.TASK_STATUS_IN_PROGRESS}
             onEditTask={onEditTask}
           />
           <KanbanColumn
             type={TaskStatus.TASK_STATUS_DONE}
             tasks={filterBySearch(sortedTasks[TaskStatus.TASK_STATUS_DONE])}
-            draggedTileID={boardObject.draggedID ?? editedTaskID}
+            draggedTileId={boardObject.draggedId ?? editedTaskId}
             isDraggedOver={boardObject.overColumn === TaskStatus.TASK_STATUS_DONE}
             onEditTask={onEditTask}
           />
diff --git a/tasks/components/layout/WardDetails.tsx b/tasks/components/layout/WardDetails.tsx
index e06cb3fc..458cc909 100644
--- a/tasks/components/layout/WardDetails.tsx
+++ b/tasks/components/layout/WardDetails.tsx
@@ -18,7 +18,7 @@ import {
   useWardUpdateMutation,
   useWardDetailsQuery
 } from '../../mutations/ward_mutations'
-import { OrganizationOverviewContext } from '../../pages/organizations/[uuid]'
+import { OrganizationOverviewContext } from '../../pages/organizations/[id]'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
 type WardDetailTranslation = {
@@ -70,7 +70,7 @@ export type WardDetailProps = {
 }
 
 /**
- * The right side of the organizations/[uuid].tsx page showing the ward. This screen also affords to edit
+ * The right side of the organizations/[id].tsx page showing the ward. This screen also affords to edit
  * the Ward
  */
 export const WardDetail = ({
@@ -81,9 +81,9 @@ export const WardDetail = ({
   const translation = useTranslation(language, defaultWardDetailTranslations)
 
   const context = useContext(OrganizationOverviewContext)
-  const { data, isError, isLoading } = useWardDetailsQuery(context.state.wardID)
+  const { data, isError, isLoading } = useWardDetailsQuery(context.state.wardId)
 
-  const isCreatingNewWard = context.state.wardID === ''
+  const isCreatingNewWard = context.state.wardId === ''
   const [isShowingConfirmDialog, setIsShowingConfirmDialog] = useState(false)
 
   const [filledRequired, setFilledRequired] = useState(!isCreatingNewWard)
@@ -95,11 +95,11 @@ export const WardDetail = ({
     }
   }, [data, isCreatingNewWard])
 
-  const createWardMutation = useWardCreateMutation((ward) => context.updateContext({ ...context.state, wardID: ward.id }))
+  const createWardMutation = useWardCreateMutation((ward) => context.updateContext({ ...context.state, wardId: ward.id }))
   const updateWardMutation = useWardUpdateMutation((ward) => {
     setNewWard({ ...newWard, name: ward.name })
   })
-  const deleteWardMutation = useWardDeleteMutation(() => context.updateContext({ ...context.state, wardID: '' }))
+  const deleteWardMutation = useWardDeleteMutation(() => context.updateContext({ ...context.state, wardId: '' }))
 
   // the value of how much space a TaskTemplateCard and the surrounding gap requires, given in px
   const minimumWidthOfCards = 200
@@ -158,7 +158,7 @@ export const WardDetail = ({
         {newWard.id !== '' &&
           (
             <div className={tw('mt-6')}>
-              <TaskTemplateWardPreview wardID={newWard.id} columns={columns}/>
+              <TaskTemplateWardPreview wardId={newWard.id} columns={columns}/>
             </div>
           )
         }
diff --git a/tasks/components/layout/WardDisplay.tsx b/tasks/components/layout/WardDisplay.tsx
index 0669195f..2e37f944 100644
--- a/tasks/components/layout/WardDisplay.tsx
+++ b/tasks/components/layout/WardDisplay.tsx
@@ -7,7 +7,7 @@ import { AddCard } from '../cards/AddCard'
 import { WardCard } from '../cards/WardCard'
 import { useRouter } from 'next/router'
 import { useContext } from 'react'
-import { OrganizationOverviewContext } from '../../pages/organizations/[uuid]'
+import { OrganizationOverviewContext } from '../../pages/organizations/[id]'
 import { useWardOverviewsQuery } from '../../mutations/ward_mutations'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
@@ -28,16 +28,16 @@ const defaultWardDisplayTranslations: Record<Languages, WardDisplayTranslation>
 }
 
 export type WardDisplayProps = {
-  selectedWardID?: string,
+  selectedWardId?: string,
   width?: number
 }
 
 /**
- * The left side of the organizations/[uuid].tsx page showing the wards within the organizations
+ * The left side of the organizations/[id].tsx page showing the wards within the organizations
  */
 export const WardDisplay = ({
   language,
-  selectedWardID,
+  selectedWardId,
   width
 }: PropsWithLanguage<WardDisplayTranslation, WardDisplayProps>) => {
   const translation = useTranslation(language, defaultWardDisplayTranslations)
@@ -46,7 +46,7 @@ export const WardDisplay = ({
   const { data, isLoading, isError } = useWardOverviewsQuery()
 
   const wards = data
-  selectedWardID ??= context.state.wardID
+  selectedWardId ??= context.state.wardId
   const columns = width === undefined ? 3 : Math.max(Math.floor(width / 250), 1)
 
   return (
@@ -62,10 +62,10 @@ export const WardDisplay = ({
               <WardCard
                 key={ward.id}
                 ward={ward}
-                isSelected={selectedWardID === ward.id}
+                isSelected={selectedWardId === ward.id}
                 onEditClick={() => context.updateContext({
                   ...context.state,
-                  wardID: ward.id
+                  wardId: ward.id
                 })}
                 onTileClick={async () => await router.push(`/ward/${ward.id}`)}
               />
@@ -75,9 +75,9 @@ export const WardDisplay = ({
               text={translation.addWard}
               onTileClick={() => context.updateContext({
                 ...context.state,
-                wardID: ''
+                wardId: ''
               })}
-              isSelected={!selectedWardID}
+              isSelected={!selectedWardId}
             />
           </div>
         )}
diff --git a/tasks/components/layout/WardRoomList.tsx b/tasks/components/layout/WardRoomList.tsx
index 47bf33db..57036268 100644
--- a/tasks/components/layout/WardRoomList.tsx
+++ b/tasks/components/layout/WardRoomList.tsx
@@ -3,7 +3,7 @@ import { RoomOverview } from '../RoomOverview'
 import type { RoomOverviewDTO } from '../../mutations/room_mutations'
 import type { BedWithPatientWithTasksNumberDTO } from '../../mutations/bed_mutations'
 import { useContext } from 'react'
-import { WardOverviewContext } from '../../pages/ward/[uuid]'
+import { WardOverviewContext } from '../../pages/ward/[id]'
 import { useRoomOverviewsQuery } from '../../mutations/room_mutations'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 import type { Languages } from '@helpwave/common/hooks/useLanguage'
@@ -42,7 +42,7 @@ export const WardRoomList = ({
 }: PropsWithLanguage<WardRoomListTranslation, WardRoomListProps>) => {
   const translation = useTranslation(language, defaultWardRoomListTranslation)
   const context = useContext(WardOverviewContext)
-  const { data, isError, isLoading } = useRoomOverviewsQuery(context.state.wardID)
+  const { data, isError, isLoading } = useRoomOverviewsQuery(context.state.wardId)
 
   rooms ??= data
 
@@ -52,13 +52,13 @@ export const WardRoomList = ({
 
   return (
     <div className={tw('flex flex-col px-6 py-4')}
-      onClick={() => context.updateContext({ wardID: context.state.wardID })}
+      onClick={() => context.updateContext({ wardId: context.state.wardId })}
     >
       <div className={tw('flex flex-row justify-between items-center pb-4')}>
         <Span type="title">{translation.roomOverview}</Span>
         <Button onClick={event => {
           event.stopPropagation()
-          context.updateContext({ wardID: context.state.wardID })
+          context.updateContext({ wardId: context.state.wardId })
         }}>
           {translation.showPatientList}
         </Button>
diff --git a/tasks/mutations/bed_mutations.ts b/tasks/mutations/bed_mutations.ts
index c65d5670..760bcb8f 100644
--- a/tasks/mutations/bed_mutations.ts
+++ b/tasks/mutations/bed_mutations.ts
@@ -35,36 +35,36 @@ export const emptyBedWithPatientWithTasksNumber: BedWithPatientWithTasksNumberDT
   patient: undefined
 }
 
-export type BedWithRoomID = BedMinimalDTO & {
-  roomID: string
+export type BedWithRoomId = BedMinimalDTO & {
+  roomId: string
 }
 
 export type BedWithMinimalPatientDTO = BedMinimalDTO & {
   patient?: PatientMinimalDTO
 }
 
-export type BedWithPatientID = {
+export type BedWithPatientId = {
   id: string,
-  patientID: string
+  patientId: string
 }
 
 export const bedQueryKey = 'beds'
 
-export const useBedQuery = (bedID: string | undefined) => {
+export const useBedQuery = (bedId: string | undefined) => {
   return useQuery({
     queryKey: [bedQueryKey],
-    enabled: !!bedID,
+    enabled: !!bedId,
     queryFn: async () => {
       const req = new GetBedRequest()
-      if (bedID) {
-        req.setId(bedID)
+      if (bedId) {
+        req.setId(bedId)
       }
       const res = await bedService.getBed(req, getAuthenticatedGrpcMetadata())
 
-      const bed: BedWithRoomID = {
+      const bed: BedWithRoomId = {
         id: res.getId(),
         name: res.getName(),
-        roomID: res.getRoomId()
+        roomId: res.getRoomId()
       }
 
       return bed
@@ -75,9 +75,9 @@ export const useBedQuery = (bedID: string | undefined) => {
 export const useBedCreateMutation = (callback: (bed: BedMinimalDTO) => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (bed: BedWithRoomID) => {
+    mutationFn: async (bed: BedWithRoomId) => {
       const req = new CreateBedRequest()
-      req.setRoomId(bed.roomID)
+      req.setRoomId(bed.roomId)
       req.setName(bed.name)
       const res = await bedService.createBed(req, getAuthenticatedGrpcMetadata())
 
@@ -103,11 +103,11 @@ export const useBedCreateMutation = (callback: (bed: BedMinimalDTO) => void = no
 export const useBedUpdateMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (bed: BedWithRoomID) => {
+    mutationFn: async (bed: BedWithRoomId) => {
       const req = new UpdateBedRequest()
       req.setId(bed.id)
       req.setName(bed.name)
-      req.setRoomId(bed.roomID)
+      req.setRoomId(bed.roomId)
 
       const res = await bedService.updateBed(req, getAuthenticatedGrpcMetadata())
 
@@ -128,9 +128,9 @@ export const useBedUpdateMutation = (callback: () => void = noop) => {
 export const useBedDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (bedID: string) => {
+    mutationFn: async (bedId: string) => {
       const req = new DeleteBedRequest()
-      req.setId(bedID)
+      req.setId(bedId)
 
       const res = await bedService.deleteBed(req, getAuthenticatedGrpcMetadata())
 
diff --git a/tasks/mutations/organization_member_mutations.ts b/tasks/mutations/organization_member_mutations.ts
index 84d8afcc..777e30c9 100644
--- a/tasks/mutations/organization_member_mutations.ts
+++ b/tasks/mutations/organization_member_mutations.ts
@@ -20,12 +20,12 @@ export type OrgMemberMinimalDTO = {
 }
 
 // TODO MembersByOrganization
-export const useMembersByOrganizationQuery = (organizationID: string | undefined) => {
+export const useMembersByOrganizationQuery = (organizationId: string | undefined) => {
   return useQuery({
     queryKey: [organizationQueryKey],
-    enabled: !!organizationID,
+    enabled: !!organizationId,
     queryFn: async () => {
-      if (!organizationID) {
+      if (!organizationId) {
         return []
       }
       const members: OrgMember[] = []
diff --git a/tasks/mutations/organization_mutations.ts b/tasks/mutations/organization_mutations.ts
index d38681d8..a8b54d7e 100644
--- a/tasks/mutations/organization_mutations.ts
+++ b/tasks/mutations/organization_mutations.ts
@@ -68,10 +68,10 @@ export type OrganizationDisplayableDTO = {
   avatarURL: string
 }
 
-export type InvitationWithOrganizationID = {
+export type InvitationWithOrganizationId = {
   id: string,
   email: string,
-  organizationID: string,
+  organizationId: string,
   state: InvitationState
 }
 
@@ -82,17 +82,17 @@ export type Invitation = {
   state: InvitationState
 }
 
-export type InviteMemberType = { email: string, organizationID?: string }
+export type InviteMemberType = { email: string, organizationId?: string }
 
 export const singleOrganizationQueryKey = 'singleOrganization'
-export const useOrganizationQuery = (organizationID: string | undefined) => {
+export const useOrganizationQuery = (organizationId: string | undefined) => {
   return useQuery({
     queryKey: [organizationQueryKey, singleOrganizationQueryKey],
-    enabled: !!organizationID,
+    enabled: !!organizationId,
     queryFn: async () => {
       const req = new GetOrganizationRequest()
-      if (organizationID) {
-        req.setId(organizationID)
+      if (organizationId) {
+        req.setId(organizationId)
       }
 
       const res = await organizationService.getOrganization(req, getAuthenticatedGrpcMetadata())
@@ -184,15 +184,15 @@ export const useInvitationsByUserQuery = (state?: InvitationState) => {
   })
 }
 
-export const useInvitationsByOrganisationQuery = (organizationID: string | undefined) => {
+export const useInvitationsByOrganisationQuery = (organizationId: string | undefined) => {
   return useQuery({
     queryKey: [invitationsQueryKey, organizationQueryKey],
-    enabled: !!organizationID,
+    enabled: !!organizationId,
     queryFn: async () => {
       // TODO update later
       const req = new GetInvitationsByOrganizationRequest()
-      if (organizationID) {
-        req.setOrganizationId(organizationID)
+      if (organizationId) {
+        req.setOrganizationId(organizationId)
       }
       const res = await organizationService.getInvitationsByOrganization(req, getAuthenticatedGrpcMetadata())
 
@@ -200,10 +200,10 @@ export const useInvitationsByOrganisationQuery = (organizationID: string | undef
         console.error('error in OrganizationCreate')
       }
 
-      const invitations: InvitationWithOrganizationID[] = res.getInvitationsList().map(invite => ({
+      const invitations: InvitationWithOrganizationId[] = res.getInvitationsList().map(invite => ({
         id: invite.getId(),
         email: invite.getEmail(),
-        organizationID: invite.getOrganizationId(),
+        organizationId: invite.getOrganizationId(),
         state: invite.getState()
       }))
       return invitations
@@ -266,9 +266,9 @@ export const useOrganizationUpdateMutation = (callback: (organization: Organizat
 export const useOrganizationDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (organizationID: string) => {
+    mutationFn: async (organizationId: string) => {
       const req = new DeleteOrganizationRequest()
-      req.setId(organizationID)
+      req.setId(organizationId)
       const res = await organizationService.deleteOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
@@ -287,9 +287,9 @@ export const useOrganizationDeleteMutation = (callback: () => void = noop) => {
 export const useInviteDeclineMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (inviteID: string) => {
+    mutationFn: async (inviteId: string) => {
       const req = new DeclineInvitationRequest()
-      req.setInvitationId(inviteID)
+      req.setInvitationId(inviteId)
       const res = await organizationService.declineInvitation(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
@@ -308,9 +308,9 @@ export const useInviteDeclineMutation = (callback: () => void = noop) => {
 export const useInviteRevokeMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (inviteID: string) => {
+    mutationFn: async (inviteId: string) => {
       const req = new RevokeInvitationRequest()
-      req.setInvitationId(inviteID)
+      req.setInvitationId(inviteId)
       const res = await organizationService.revokeInvitation(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
@@ -326,21 +326,21 @@ export const useInviteRevokeMutation = (callback: () => void = noop) => {
   })
 }
 
-export const useInviteMemberMutation = (organizationID: string, callback: (inviteID: string) => void = noop) => {
+export const useInviteMemberMutation = (organizationId: string, callback: (inviteId: string) => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (invite: InviteMemberType) => {
       const req = new InviteMemberRequest()
 
-      if (!organizationID) {
-        if (invite.organizationID) {
-          organizationID = invite.organizationID
+      if (!organizationId) {
+        if (invite.organizationId) {
+          organizationId = invite.organizationId
         } else {
           console.error('InviteMember failed, provide an non null organization id either in the mutate or the hook')
         }
       }
       req.setEmail(invite.email)
-      req.setOrganizationId(organizationID)
+      req.setOrganizationId(organizationId)
 
       const res = await organizationService.inviteMember(req, getAuthenticatedGrpcMetadata())
 
@@ -360,9 +360,9 @@ export const useInviteMemberMutation = (organizationID: string, callback: (invit
 export const useInviteAcceptMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (inviteID: string) => {
+    mutationFn: async (inviteId: string) => {
       const req = new AcceptInvitationRequest()
-      req.setInvitationId(inviteID)
+      req.setInvitationId(inviteId)
       const res = await organizationService.acceptInvitation(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
@@ -378,13 +378,13 @@ export const useInviteAcceptMutation = (callback: () => void = noop) => {
   })
 }
 
-export const useAddMemberMutation = (callback: () => void, organizationID: string) => {
+export const useAddMemberMutation = (callback: () => void, organizationId: string) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (userID: string) => {
+    mutationFn: async (userId: string) => {
       const req = new AddMemberRequest()
-      req.setId(organizationID)
-      req.setUserId(userID)
+      req.setId(organizationId)
+      req.setUserId(userId)
 
       const res = await organizationService.addMember(req, getAuthenticatedGrpcMetadata())
 
@@ -401,13 +401,13 @@ export const useAddMemberMutation = (callback: () => void, organizationID: strin
   })
 }
 
-export const useRemoveMemberMutation = (organizationID: string, callback: () => void = noop) => {
+export const useRemoveMemberMutation = (organizationId: string, callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (userID: string) => {
+    mutationFn: async (userId: string) => {
       const req = new RemoveMemberRequest()
-      req.setId(organizationID)
-      req.setUserId(userID)
+      req.setId(organizationId)
+      req.setUserId(userId)
 
       const res = await organizationService.removeMember(req, getAuthenticatedGrpcMetadata())
 
diff --git a/tasks/mutations/patient_mutations.ts b/tasks/mutations/patient_mutations.ts
index f74a339f..30911eb7 100644
--- a/tasks/mutations/patient_mutations.ts
+++ b/tasks/mutations/patient_mutations.ts
@@ -14,7 +14,7 @@ import {
   GetPatientListRequest
 } from '@helpwave/proto-ts/proto/services/task_svc/v1/patient_svc_pb'
 import { patientService, getAuthenticatedGrpcMetadata } from '../utils/grpc'
-import type { BedWithPatientID } from './bed_mutations'
+import type { BedWithPatientId } from './bed_mutations'
 import type { RoomWithMinimalBedAndPatient } from './room_mutations'
 import { roomOverviewsQueryKey, roomsQueryKey } from './room_mutations'
 import { noop } from '@helpwave/common/util/noop'
@@ -63,9 +63,9 @@ export type PatientListDTO = {
   discharged: PatientMinimalDTO[]
 }
 
-export type PatientWithBedIDTO = PatientMinimalDTO &{
+export type PatientWithBedIdDTO = PatientMinimalDTO &{
   note: string,
-  bedID: string
+  bedId: string
 }
 
 export type PatientDetailsDTO = PatientMinimalDTO &{
@@ -82,17 +82,17 @@ export const emptyPatientDetails: PatientDetailsDTO = {
 
 const patientsQueryKey = 'patients'
 
-export const usePatientDetailsQuery = (patientID:string | undefined) => {
+export const usePatientDetailsQuery = (patientId: string | undefined) => {
   return useQuery({
-    queryKey: [patientsQueryKey, patientID],
-    enabled: !!patientID,
+    queryKey: [patientsQueryKey, patientId],
+    enabled: !!patientId,
     queryFn: async () => {
-      if (!patientID) {
+      if (!patientId) {
         return
       }
 
       const req = new GetPatientDetailsRequest()
-      req.setId(patientID)
+      req.setId(patientId)
 
       const res = await patientService.getPatientDetails(req, getAuthenticatedGrpcMetadata())
 
@@ -132,19 +132,19 @@ export const usePatientDetailsQuery = (patientID:string | undefined) => {
   })
 }
 
-export const usePatientsByWardQuery = (wardID: string) => {
+export const usePatientsByWardQuery = (wardId: string) => {
   return useQuery({
     queryKey: [patientsQueryKey, 'details'],
     queryFn: async () => {
       const req = new GetPatientsByWardRequest()
-      req.setWardId(wardID)
+      req.setWardId(wardId)
       const res = await patientService.getPatientsByWard(req, getAuthenticatedGrpcMetadata())
 
-      const patients: PatientWithBedIDTO[] = res.getPatientsList().map((patient) => ({
+      const patients: PatientWithBedIdDTO[] = res.getPatientsList().map((patient) => ({
         id: patient.getId(),
         name: patient.getHumanReadableIdentifier(),
         note: patient.getNotes(),
-        bedID: patient.getBedId(),
+        bedId: patient.getBedId(),
       }))
 
       return patients
@@ -152,13 +152,13 @@ export const usePatientsByWardQuery = (wardID: string) => {
   })
 }
 
-export const usePatientAssignmentByWardQuery = (wardID: string) => {
+export const usePatientAssignmentByWardQuery = (wardId: string) => {
   return useQuery({
     queryKey: [roomsQueryKey, 'patientAssignments'],
-    enabled: !!wardID,
+    enabled: !!wardId,
     queryFn: async () => {
       const req = new GetPatientAssignmentByWardRequest()
-      req.setWardId(wardID)
+      req.setWardId(wardId)
       const res = await patientService.getPatientAssignmentByWard(req, getAuthenticatedGrpcMetadata())
 
       const rooms: RoomWithMinimalBedAndPatient[] = res.getRoomsList().map((room) => ({
@@ -186,13 +186,13 @@ export const usePatientAssignmentByWardQuery = (wardID: string) => {
   })
 }
 
-export const usePatientListQuery = (organisationID?: string) => {
+export const usePatientListQuery = (organisationId?: string) => {
   return useQuery({
     queryKey: [patientsQueryKey, 'patientList'],
     queryFn: async () => {
       const req = new GetPatientListRequest()
-      if (organisationID) {
-        req.setOrganisationId(organisationID)
+      if (organisationId) {
+        req.setOrganisationId(organisationId)
       }
       const res = await patientService.getPatientList(req, getAuthenticatedGrpcMetadata())
 
@@ -285,9 +285,9 @@ export const usePatientUpdateMutation = (callback: (patient: PatientDTO) => void
 export const usePatientDischargeMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (patientID: string) => {
+    mutationFn: async (patientId: string) => {
       const req = new DischargePatientRequest()
-      req.setId(patientID)
+      req.setId(patientId)
 
       const res = await patientService.dischargePatient(req, getAuthenticatedGrpcMetadata())
 
@@ -305,12 +305,12 @@ export const usePatientDischargeMutation = (callback: () => void = noop) => {
   })
 }
 
-export const useAssignBedMutation = (callback: (bed: BedWithPatientID) => void = noop) => {
+export const useAssignBedMutation = (callback: (bed: BedWithPatientId) => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (bed: BedWithPatientID) => {
+    mutationFn: async (bed: BedWithPatientId) => {
       const req = new AssignBedRequest()
-      req.setId(bed.patientID)
+      req.setId(bed.patientId)
       req.setBedId(bed.id)
 
       const res = await patientService.assignBed(req, getAuthenticatedGrpcMetadata())
@@ -333,9 +333,9 @@ export const useAssignBedMutation = (callback: (bed: BedWithPatientID) => void =
 export const useUnassignMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (patientID: string) => {
+    mutationFn: async (patientId: string) => {
       const req = new UnassignBedRequest()
-      req.setId(patientID)
+      req.setId(patientId)
 
       const res = await patientService.unassignBed(req, getAuthenticatedGrpcMetadata())
 
diff --git a/tasks/mutations/room_mutations.ts b/tasks/mutations/room_mutations.ts
index b3b7dd31..74bc1253 100644
--- a/tasks/mutations/room_mutations.ts
+++ b/tasks/mutations/room_mutations.ts
@@ -8,6 +8,7 @@ import {
 import { getAuthenticatedGrpcMetadata, roomService } from '../utils/grpc'
 import type { BedDTO, BedWithPatientWithTasksNumberDTO, BedWithMinimalPatientDTO } from './bed_mutations'
 import { wardOverviewsQueryKey, wardsQueryKey } from './ward_mutations'
+import { noop } from '@helpwave/common/util/noop'
 
 export const roomsQueryKey = 'rooms'
 
@@ -45,14 +46,14 @@ export const useRoomQuery = () => {
 }
 
 export const roomOverviewsQueryKey = 'roomOverview'
-export const useRoomOverviewsQuery = (wardUUID: string | undefined) => {
+export const useRoomOverviewsQuery = (wardId: string | undefined) => {
   return useQuery({
     queryKey: [roomsQueryKey, roomOverviewsQueryKey],
-    enabled: !!wardUUID,
+    enabled: !!wardId,
     queryFn: async () => {
       const req = new GetRoomOverviewsByWardRequest()
-      if (wardUUID) {
-        req.setId(wardUUID)
+      if (wardId) {
+        req.setId(wardId)
       }
       const res = await roomService.getRoomOverviewsByWard(req, getAuthenticatedGrpcMetadata())
 
@@ -102,12 +103,12 @@ export const useRoomUpdateMutation = (callback: (room: RoomMinimalDTO) => void)
   })
 }
 
-export const useRoomCreateMutation = (callback: (room: RoomMinimalDTO) => void, wardUUID: string) => {
+export const useRoomCreateMutation = (callback: (room: RoomMinimalDTO) => void = noop, wardId: string) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (room: RoomMinimalDTO) => {
       const req = new CreateRoomRequest()
-      req.setWardId(wardUUID)
+      req.setWardId(wardId)
       req.setName(room.name)
       const res = await roomService.createRoom(req, getAuthenticatedGrpcMetadata())
 
@@ -125,12 +126,12 @@ export const useRoomCreateMutation = (callback: (room: RoomMinimalDTO) => void,
   })
 }
 
-export const useRoomDeleteMutation = (callback: () => void) => {
+export const useRoomDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (roomUUID: string) => {
+    mutationFn: async (roomId: string) => {
       const req = new DeleteRoomRequest()
-      req.setId(roomUUID)
+      req.setId(roomId)
       const res = await roomService.deleteRoom(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
diff --git a/tasks/mutations/task_mutations.ts b/tasks/mutations/task_mutations.ts
index f9020a57..30392191 100644
--- a/tasks/mutations/task_mutations.ts
+++ b/tasks/mutations/task_mutations.ts
@@ -29,7 +29,7 @@ export type SubTaskDTO = {
 }
 
 export type CreateSubTaskDTO = SubTaskDTO & {
-  taskID?: string
+  taskId?: string
 }
 
 export type TaskDTO = {
@@ -75,17 +75,17 @@ export const emptySortedTasks: SortedTasks = {
 
 export const tasksQueryKey = 'tasks'
 
-export const useTaskQuery = (taskID: string | undefined) => {
+export const useTaskQuery = (taskId: string | undefined) => {
   return useQuery({
     queryKey: [tasksQueryKey],
-    enabled: !!taskID,
+    enabled: !!taskId,
     queryFn: async () => {
-      if (!taskID) {
+      if (!taskId) {
         return emptyTask
       }
 
       const req = new GetTaskRequest()
-      req.setId(taskID)
+      req.setId(taskId)
 
       const res = await taskService.getTask(req, getAuthenticatedGrpcMetadata())
 
@@ -115,17 +115,17 @@ export const useTaskQuery = (taskID: string | undefined) => {
 }
 
 export const tasksByPatientQueryKey = 'tasksByPatient'
-export const useTasksByPatientQuery = (patientID: string | undefined) => {
+export const useTasksByPatientQuery = (patientId: string | undefined) => {
   return useQuery({
     queryKey: [tasksQueryKey, tasksByPatientQueryKey],
-    enabled: !!patientID,
+    enabled: !!patientId,
     queryFn: async () => {
-      if (!patientID) {
+      if (!patientId) {
         return
       }
 
       const req = new GetTasksByPatientRequest()
-      req.setPatientId(patientID)
+      req.setPatientId(patientId)
 
       const res = await taskService.getTasksByPatient(req, getAuthenticatedGrpcMetadata())
 
@@ -157,17 +157,17 @@ export const useTasksByPatientQuery = (patientID: string | undefined) => {
 }
 
 export const sortedTasksByPatientQueryKey = 'sortedTasksByPatient'
-export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefined) => {
+export const useTasksByPatientSortedByStatusQuery = (patientId: string | undefined) => {
   return useQuery({
     queryKey: [tasksQueryKey, sortedTasksByPatientQueryKey],
-    enabled: !!patientID,
+    enabled: !!patientId,
     queryFn: async () => {
-      if (!patientID) {
+      if (!patientId) {
         return emptySortedTasks
       }
 
       const req = new GetTasksByPatientSortedByStatusRequest()
-      req.setPatientId(patientID)
+      req.setPatientId(patientId)
 
       const res = await taskService.getTasksByPatientSortedByStatus(req, getAuthenticatedGrpcMetadata())
 
@@ -204,13 +204,13 @@ export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefin
   })
 }
 
-export const useTaskCreateMutation = (callback: (task: TaskDTO) => void = noop, patientID: string) => {
+export const useTaskCreateMutation = (callback: (task: TaskDTO) => void = noop, patientId: string) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (task: TaskDTO) => {
       const req = new CreateTaskRequest()
       req.setName(task.name)
-      req.setPatientId(patientID)
+      req.setPatientId(patientId)
       req.setDescription(task.notes)
       req.setPublic(task.isPublicVisible)
 
@@ -303,9 +303,9 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
 export const useTaskDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (taskID: string) => {
+    mutationFn: async (taskId: string) => {
       const req = new DeleteTaskRequest()
-      req.setId(taskID)
+      req.setId(taskId)
       await taskService.deleteTask(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -321,9 +321,9 @@ export const useTaskDeleteMutation = (callback: () => void = noop) => {
 export const useTaskToToDoMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (taskID: string) => {
+    mutationFn: async (taskId: string) => {
       const req = new TaskToToDoRequest()
-      req.setId(taskID)
+      req.setId(taskId)
       await taskService.taskToToDo(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -339,9 +339,9 @@ export const useTaskToToDoMutation = (callback: () => void = noop) => {
 export const useTaskToInProgressMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (taskID: string) => {
+    mutationFn: async (taskId: string) => {
       const req = new TaskToInProgressRequest()
-      req.setId(taskID)
+      req.setId(taskId)
       await taskService.taskToInProgress(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -357,9 +357,9 @@ export const useTaskToInProgressMutation = (callback: () => void = noop) => {
 export const useTaskToDoneMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (taskID: string) => {
+    mutationFn: async (taskId: string) => {
       const req = new TaskToDoneRequest()
-      req.setId(taskID)
+      req.setId(taskId)
       await taskService.taskToDone(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -372,18 +372,18 @@ export const useTaskToDoneMutation = (callback: () => void = noop) => {
   })
 }
 
-// TODO: taskID: string | undefined => taskID: string -> A taskID is always required to create a SubTask
-export const useSubTaskAddMutation = (callback: (subtask: SubTaskDTO) => void = noop, taskID: string | undefined) => {
+// TODO: taskId: string | undefined => taskId: string -> A taskId is always required to create a SubTask
+export const useSubTaskAddMutation = (callback: (subtask: SubTaskDTO) => void = noop, taskId: string | undefined) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (subtask: CreateSubTaskDTO) => {
-      const usedTaskID = subtask.taskID ?? taskID ?? ''
-      if (!usedTaskID) {
+      const usedTaskId = subtask.taskId ?? taskId ?? ''
+      if (!usedTaskId) {
         return
       }
       const req = new AddSubTaskRequest()
       req.setName(subtask.name)
-      req.setTaskId(usedTaskID)
+      req.setTaskId(usedTaskId)
       req.setDone(subtask.isDone)
       const res = await taskService.addSubTask(req, getAuthenticatedGrpcMetadata())
 
@@ -424,9 +424,9 @@ export const useSubTaskUpdateMutation = (callback: (subtask: SubTaskDTO) => void
 export const useSubTaskDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (subtaskID: string) => {
+    mutationFn: async (subtaskId: string) => {
       const req = new RemoveSubTaskRequest()
-      req.setId(subtaskID)
+      req.setId(subtaskId)
       await taskService.removeSubTask(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -441,9 +441,9 @@ export const useSubTaskDeleteMutation = (callback: () => void = noop) => {
 export const useSubTaskToToDoMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (subtaskID: string) => {
+    mutationFn: async (subtaskId: string) => {
       const req = new SubTaskToToDoRequest()
-      req.setId(subtaskID)
+      req.setId(subtaskId)
       await taskService.subTaskToToDo(req, getAuthenticatedGrpcMetadata())
 
       callback()
@@ -458,9 +458,9 @@ export const useSubTaskToToDoMutation = (callback: () => void = noop) => {
 export const useSubTaskToDoneMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (subtaskID: string) => {
+    mutationFn: async (subtaskId: string) => {
       const req = new SubTaskToDoneRequest()
-      req.setId(subtaskID)
+      req.setId(subtaskId)
       await taskService.subTaskToDone(req, getAuthenticatedGrpcMetadata())
 
       callback()
diff --git a/tasks/mutations/task_template_mutations.ts b/tasks/mutations/task_template_mutations.ts
index 9ef9606b..be84a54c 100644
--- a/tasks/mutations/task_template_mutations.ts
+++ b/tasks/mutations/task_template_mutations.ts
@@ -160,7 +160,7 @@ export const useUpdateMutation = (queryKey: QueryKey, setTemplate: (taskTemplate
 export const useCreateMutation = (queryKey: QueryKey, setTemplate: (taskTemplate:TaskTemplateDTO | undefined) => void) => {
   const queryClient = useQueryClient()
   const router = useRouter()
-  const { uuid: wardId } = router.query
+  const { id: wardId } = router.query
 
   return useMutation({
     mutationFn: async (taskTemplate: TaskTemplateDTO) => {
@@ -228,9 +228,9 @@ export const useDeleteMutation = (queryKey: QueryKey, setTemplate: (task:TaskTem
 export const useSubTaskTemplateDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (subtaskID: string) => {
+    mutationFn: async (subtaskId: string) => {
       const deleteSubtaskTaskTemplate = new DeleteTaskTemplateSubTaskRequest()
-      deleteSubtaskTaskTemplate.setId(subtaskID)
+      deleteSubtaskTaskTemplate.setId(subtaskId)
       await taskTemplateService.deleteTaskTemplateSubTask(deleteSubtaskTaskTemplate, getAuthenticatedGrpcMetadata())
       queryClient.refetchQueries(['personalTaskTemplates']).then()
       callback()
diff --git a/tasks/mutations/ward_mutations.ts b/tasks/mutations/ward_mutations.ts
index f9c26dc4..b0b0e28f 100644
--- a/tasks/mutations/ward_mutations.ts
+++ b/tasks/mutations/ward_mutations.ts
@@ -83,15 +83,15 @@ export const useWardOverviewsQuery = () => {
   })
 }
 
-export const useWardDetailsQuery = (wardID?: string) => {
+export const useWardDetailsQuery = (wardId?: string) => {
   return useQuery({
-    queryKey: [wardsQueryKey, wardID],
-    enabled: !!wardID,
+    queryKey: [wardsQueryKey, wardId],
+    enabled: !!wardId,
     queryFn: async () => {
-      if (wardID === undefined) return
+      if (wardId === undefined) return
 
       const req = new GetWardDetailsRequest()
-      req.setId(wardID)
+      req.setId(wardId)
       const res = await wardService.getWardDetails(req, getAuthenticatedGrpcMetadata())
 
       const ward: WardDetailDTO = {
@@ -170,9 +170,9 @@ export const useWardCreateMutation = (callback: (ward: WardDTO) => void) => {
 export const useWardDeleteMutation = (callback: () => void) => {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (wardID: string) => {
+    mutationFn: async (wardId: string) => {
       const req = new DeleteWardRequest()
-      req.setId(wardID)
+      req.setId(wardId)
       await wardService.deleteWard(req, getAuthenticatedGrpcMetadata())
 
       callback()
diff --git a/tasks/pages/examples/table.tsx b/tasks/pages/examples/table.tsx
index 9e26e22a..c82da20c 100644
--- a/tasks/pages/examples/table.tsx
+++ b/tasks/pages/examples/table.tsx
@@ -92,14 +92,14 @@ const TablePage: NextPage = () => {
         ]}
         header={[
           <SortButton
-            key="headerID"
+            key="headerId"
             ascending={sortingKey === 'id' ? ascending : undefined}
             onClick={newTableSorting => {
               setSorting(['id', newTableSorting])
               setData(data.sort(sortingFunctions.id[newTableSorting]))
             }}
           >
-            <Span type="tableHeader">ID</Span>
+            <Span type="tableHeader">Id</Span>
           </SortButton>,
           <SortButton
             key="name"
diff --git a/tasks/pages/organizations.tsx b/tasks/pages/organizations.tsx
index b65cef22..d77cec67 100644
--- a/tasks/pages/organizations.tsx
+++ b/tasks/pages/organizations.tsx
@@ -24,11 +24,11 @@ const defaultOrganizationsPageTranslation = {
 }
 
 export type OrganizationContextState = {
-  organizationID: string
+  organizationId: string
 }
 
 export const emptyOrganizationContextState: OrganizationContextState = {
-  organizationID: ''
+  organizationId: ''
 }
 
 export type OrganizationContextType = {
@@ -47,14 +47,14 @@ export const OrganizationContext = createContext<OrganizationContextType>({
 const OrganizationsPage: NextPage = ({ language }: PropsWithLanguage<OrganizationsPageTranslation>) => {
   const translation = useTranslation(language, defaultOrganizationsPageTranslation)
   const router = useRouter()
-  const { organizationID } = router.query
+  const { organizationId } = router.query
   const [usedQueryParam, setUsedQueryParam] = useState(false)
   const [context, setContext] = useState<OrganizationContextState>(emptyOrganizationContextState)
 
-  if (organizationID && !usedQueryParam && organizationID) {
+  if (organizationId && !usedQueryParam && organizationId) {
     setContext({
       ...context,
-      organizationID: organizationID as string
+      organizationId: organizationId as string
     })
     setUsedQueryParam(true)
   }
@@ -77,7 +77,7 @@ const OrganizationsPage: NextPage = ({ language }: PropsWithLanguage<Organizatio
           )}
           right={width => (
             <OrganizationDetail
-              key={context.organizationID}
+              key={context.organizationId}
               width={width}
             />
           )}
diff --git a/tasks/pages/organizations/[uuid].tsx b/tasks/pages/organizations/[id].tsx
similarity index 87%
rename from tasks/pages/organizations/[uuid].tsx
rename to tasks/pages/organizations/[id].tsx
index d791a3d6..c88f24d6 100644
--- a/tasks/pages/organizations/[uuid].tsx
+++ b/tasks/pages/organizations/[id].tsx
@@ -28,15 +28,15 @@ const defaultWardsPageTranslation = {
 
 export type OrganizationOverviewContextState = {
   /**
-   wardID === "" means creating a new ward
+   wardId === "" means creating a new ward
    */
-  wardID: string,
-  organizationID: string
+  wardId: string,
+  organizationId: string
 }
 
 const emptyOrganizationOverviewContextState = {
-  organizationID: '',
-  wardID: ''
+  organizationId: '',
+  wardId: ''
 }
 
 export type OrganizationOverviewContextType = {
@@ -58,14 +58,14 @@ const WardsPage: NextPage = ({ language }: PropsWithLanguage<WardsPageTranslatio
   const [usedQueryParam, setUsedQueryParam] = useState(false)
 
   const router = useRouter()
-  const { uuid, wardID } = router.query
-  const organizationID = uuid as string
+  const { id, wardId } = router.query
+  const organizationId = id as string
 
-  if (wardID && !usedQueryParam) {
+  if (wardId && !usedQueryParam) {
     setContextState({
       ...emptyOrganizationOverviewContextState,
-      wardID: wardID as string,
-      organizationID
+      wardId: wardId as string,
+      organizationId
     })
     setUsedQueryParam(true)
   }
@@ -73,8 +73,8 @@ const WardsPage: NextPage = ({ language }: PropsWithLanguage<WardsPageTranslatio
   return (
     <PageWithHeader
       crumbs={[
-        { display: translation.organizations, link: `/organizations?organizationID=${organizationID}` },
-        { display: translation.wards, link: `/organizations/${organizationID}` }
+        { display: translation.organizations, link: `/organizations?organizationId=${organizationId}` },
+        { display: translation.wards, link: `/organizations/${organizationId}` }
       ]}
     >
       <Head>
@@ -86,7 +86,7 @@ const WardsPage: NextPage = ({ language }: PropsWithLanguage<WardsPageTranslatio
           left={width => (<WardDisplay width={width}/>)}
           right={width => (
             <WardDetail
-              key={contextState.wardID}
+              key={contextState.wardId}
               width={width}
             />
           )}
diff --git a/tasks/pages/templates.tsx b/tasks/pages/templates.tsx
index 08dec987..a63e347d 100644
--- a/tasks/pages/templates.tsx
+++ b/tasks/pages/templates.tsx
@@ -80,7 +80,7 @@ export const TaskTemplateContext = createContext<TaskTemplateContextType>({
 const PersonalTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<PersonalTaskTemplateTranslation>) => {
   const translation = useTranslation(language, defaultPersonalTaskTemplateTranslations)
   const router = useRouter()
-  const { templateID } = router.query
+  const { templateId } = router.query
   const [usedQueryParam, setUsedQueryParam] = useState(false)
   const { user } = useAuth()
   const { isLoading, isError, data } = usePersonalTaskTemplateQuery(user?.id)
@@ -112,8 +112,8 @@ const PersonalTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<Per
       template: taskTemplate ?? emptyTaskTemplate
     }))
 
-  if (!contextState.hasChanges && templateID && !usedQueryParam) {
-    const newSelected = data?.find(value => value.id === templateID) ?? emptyTaskTemplate
+  if (!contextState.hasChanges && templateId && !usedQueryParam) {
+    const newSelected = data?.find(value => value.id === templateId) ?? emptyTaskTemplate
     setContextState({
       ...contextState,
       isValid: newSelected.id !== '',
@@ -148,7 +148,7 @@ const PersonalTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<Per
                       deletedSubtaskIds: []
                     })
                   }}
-                  selectedID={contextState.template.id}
+                  selectedId={contextState.template.id}
                   taskTemplates={data}
                   variant="personalTemplates"
                 />
diff --git a/tasks/pages/ward/[uuid].tsx b/tasks/pages/ward/[id].tsx
similarity index 81%
rename from tasks/pages/ward/[uuid].tsx
rename to tasks/pages/ward/[id].tsx
index f4fe4e8f..f48f1e5b 100644
--- a/tasks/pages/ward/[uuid].tsx
+++ b/tasks/pages/ward/[id].tsx
@@ -1,7 +1,6 @@
 import { createContext, useCallback, useEffect, useState } from 'react'
 import type { NextPage } from 'next'
 import Head from 'next/head'
-import { useAuth } from '../../hooks/useAuth'
 import { useRouter } from 'next/router'
 import type { PropsWithLanguage } from '@helpwave/common/hooks/useTranslation'
 import { useTranslation } from '@helpwave/common/hooks/useTranslation'
@@ -15,7 +14,9 @@ import { PatientList } from '../../components/layout/PatientList'
 import type { PatientDTO, PatientMinimalDTO } from '../../mutations/patient_mutations'
 import {
   useAssignBedMutation,
-  usePatientCreateMutation, usePatientDischargeMutation, useUnassignMutation
+  usePatientCreateMutation,
+  usePatientDischargeMutation,
+  useUnassignMutation
 } from '../../mutations/patient_mutations'
 import type {
   DragEndEvent,
@@ -65,17 +66,17 @@ const defaultWardOverviewTranslation = {
 export type WardOverviewContextState = {
   /**
    patient set means creating patient
-   patientID is the current patient
+   patientId is the current patient
    */
   patient?: PatientDTO,
-  patientID?: string,
-  bedID?: string,
-  roomID?: string,
-  wardID: string
+  patientId?: string,
+  bedId?: string,
+  roomId?: string,
+  wardId: string
 }
 
 const emptyWardOverviewContextState = {
-  wardID: ''
+  wardId: ''
 }
 
 export type WardOverviewContextType = {
@@ -92,44 +93,36 @@ const WardOverview: NextPage = ({ language }: PropsWithLanguage<WardOverviewTran
   const translation = useTranslation(language, defaultWardOverviewTranslation)
   const router = useRouter()
   const [draggedPatient, setDraggedPatient] = useState<{ patient?: PatientMinimalDTO, bed?: BedWithPatientWithTasksNumberDTO }>()
-  const { user } = useAuth()
-  const { uuid } = router.query
-  const wardUUID = uuid as string
+  const { id } = router.query
+  const wardId = id as string
 
   const [contextState, setContextState] = useState<WardOverviewContextState>({
-    wardID: wardUUID
+    wardId
   })
-  const [draggingRoomID, setDraggingRoomID] = useState<string>()
+  const [draggingRoomId, setDraggingRoomId] = useState<string>()
   const assignBedMutation = useAssignBedMutation(bed => {
-    if (draggingRoomID) {
+    if (draggingRoomId) {
       setContextState({
         ...contextState,
-        bedID: bed.id,
-        patientID: bed.patientID,
-        roomID: draggingRoomID,
+        bedId: bed.id,
+        patientId: bed.patientId,
+        roomId: draggingRoomId,
         patient: undefined
       })
     } else {
       setContextState({
         ...contextState,
-        bedID: bed.id,
-        patientID: bed.patientID,
+        bedId: bed.id,
+        patientId: bed.patientId,
         patient: undefined
       })
     }
 
-    setDraggingRoomID(undefined)
+    setDraggingRoomId(undefined)
   })
   const unassignMutation = useUnassignMutation()
   const dischargeMutation = usePatientDischargeMutation()
 
-  const createMutation = usePatientCreateMutation(patient => {
-    if (contextState.bedID) {
-      assignBedMutation.mutate({ id: contextState.bedID, patientID: patient.id })
-    }
-    setContextState({ ...contextState, patient: undefined })
-  })
-
   const sensorOptions = { activationConstraint: { distance: 8 } }
   const sensors = useSensors(
     useSensor(MouseSensor, sensorOptions),
@@ -151,19 +144,19 @@ const WardOverview: NextPage = ({ language }: PropsWithLanguage<WardOverviewTran
   const handleDragEnd = useCallback((event: DragEndEvent) => {
     const { active, over } = event
     const overData = over?.data.current
-    const patientID = draggedPatient?.patient?.id ?? draggedPatient?.bed?.patient?.id ?? ''
+    const patientId = draggedPatient?.patient?.id ?? draggedPatient?.bed?.patient?.id ?? ''
     if (overData && active.data.current) {
       if (overData.patientListSection) {
         // Moving in patientlist
         if (overData.patientListSection === 'unassigned') {
-          unassignMutation.mutate(patientID) // TODO this doesn't work for unassigned patients
+          unassignMutation.mutate(patientId) // TODO this doesn't work for unassigned patients
         } else if (overData.patientListSection === 'discharged') {
-          dischargeMutation.mutate(patientID)
+          dischargeMutation.mutate(patientId)
         }
       } else {
         // Moving on bed cards
-        setDraggingRoomID(overData.room.id)
-        assignBedMutation.mutate({ id: overData.bed.id, patientID })
+        setDraggingRoomId(overData.room.id)
+        assignBedMutation.mutate({ id: overData.bed.id, patientId })
       }
     }
 
@@ -175,21 +168,29 @@ const WardOverview: NextPage = ({ language }: PropsWithLanguage<WardOverviewTran
   }, [])
 
   const isShowingPatientDialog = !!contextState.patient
-  const isShowingPatientList = contextState.patientID === undefined || isShowingPatientDialog
+  const isShowingPatientList = contextState.patientId === undefined || isShowingPatientDialog
 
-  const organizationUUID = 'org1' // TODO get this information somewhere
+  const organizationId = 'org1' // TODO get this information somewhere
   useEffect(() => {
-    setContextState({ wardID: wardUUID })
-  }, [wardUUID])
+    setContextState({ wardId })
+  }, [wardId])
 
-  if (!user) return null
+  const createMutation = usePatientCreateMutation(patient => {
+    const updatedContext = contextState
+    updatedContext.patient = patient
+
+    if (contextState.bedId) {
+      assignBedMutation.mutate({ id: contextState.bedId, patientId: patient.id })
+    }
+    setContextState(updatedContext)
+  })
 
   return (
     <PageWithHeader
       crumbs={[
-        { display: translation.organization, link: `/organizations?organizationID=${organizationUUID}` },
-        { display: translation.ward, link: `/organizations/${organizationUUID}?wardID=${wardUUID}` },
-        { display: translation.room, link: `/ward/${wardUUID}` }
+        { display: translation.organization, link: `/organizations?organizationId=${organizationId}` },
+        { display: translation.ward, link: `/organizations/${organizationId}?wardId=${wardId}` },
+        { display: translation.room, link: `/ward/${wardId}` }
       ]}
     >
       <Head>
@@ -202,14 +203,14 @@ const WardOverview: NextPage = ({ language }: PropsWithLanguage<WardOverviewTran
           if (contextState.patient) {
             createMutation.mutate(contextState.patient)
           } else {
-            setContextState({ ...emptyWardOverviewContextState, wardID: contextState.wardID, patient: undefined })
+            setContextState({ ...emptyWardOverviewContextState, wardId: contextState.wardId, patient: undefined })
           }
         }}
         onCancel={() => {
-          setContextState({ ...emptyWardOverviewContextState, wardID: contextState.wardID, patient: undefined })
+          setContextState({ ...emptyWardOverviewContextState, wardId: contextState.wardId, patient: undefined })
         }}
         onBackgroundClick={() => {
-          setContextState({ ...emptyWardOverviewContextState, wardID: contextState.wardID, patient: undefined })
+          setContextState({ ...emptyWardOverviewContextState, wardId: contextState.wardId, patient: undefined })
         }}
       />
       <WardOverviewContext.Provider value={{ state: contextState, updateContext: setContextState }}>
@@ -223,12 +224,12 @@ const WardOverview: NextPage = ({ language }: PropsWithLanguage<WardOverviewTran
             disableResize={false}
             constraints={{ right: { min: '580px' }, left: { min: '33%' } }}
             baseLayoutValue="-580px"
-            left={() => (<WardRoomList key={wardUUID}/>)}
+            left={() => (<WardRoomList key={wardId}/>)}
             right={width =>
               isShowingPatientList ? (
                     <PatientList width={width}/>
               ) :
-                contextState.patientID && (
+                contextState.patientId && (
                   <div>
                     <PatientDetail
                       key={contextState.patient?.id}
diff --git a/tasks/pages/ward/[uuid]/templates.tsx b/tasks/pages/ward/[id]/templates.tsx
similarity index 75%
rename from tasks/pages/ward/[uuid]/templates.tsx
rename to tasks/pages/ward/[id]/templates.tsx
index 814412f5..0111e5e1 100644
--- a/tasks/pages/ward/[uuid]/templates.tsx
+++ b/tasks/pages/ward/[id]/templates.tsx
@@ -17,6 +17,7 @@ import { TaskTemplateDetails } from '../../../components/layout/TaskTemplateDeta
 import { useRouter } from 'next/router'
 import type { TaskTemplateContextState } from '../../templates'
 import { emptyTaskTemplate, TaskTemplateContext, taskTemplateContextState } from '../../templates'
+import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
 
 type WardTaskTemplateTranslation = {
   taskTemplates: string,
@@ -43,7 +44,7 @@ const defaultWardTaskTemplateTranslations = {
 const WardTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<WardTaskTemplateTranslation>) => {
   const translation = useTranslation(language, defaultWardTaskTemplateTranslations)
   const router = useRouter()
-  const { uuid: wardId, templateID } = router.query
+  const { id: wardId, templateId } = router.query
   const [usedQueryParam, setUsedQueryParam] = useState(false)
   const { isLoading, isError, data } = useWardTaskTemplateQuery(wardId?.toString())
 
@@ -76,8 +77,8 @@ const WardTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<WardTas
     })
   )
 
-  if (!contextState.hasChanges && templateID && !usedQueryParam) {
-    const newSelected = data?.find(value => value.id === templateID) ?? emptyTaskTemplate
+  if (!contextState.hasChanges && templateId && !usedQueryParam) {
+    const newSelected = data?.find(value => value.id === templateId) ?? emptyTaskTemplate
     setContextState({
       ...contextState,
       isValid: newSelected.id !== '',
@@ -88,24 +89,14 @@ const WardTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<WardTas
   }
 
   // TODO load organization id of ward
-  const organizationID = 'org1'
-
-  // TODO add view for loading
-  if (isLoading) {
-    return <div>Loading Widget</div>
-  }
-
-  // TODO add view for error or error handling
-  if (isError) {
-    return <div>Error Message</div>
-  }
+  const organizationId = 'org1'
 
   // TODO update breadcrumbs
   return (
     <PageWithHeader
       crumbs={[
-        { display: translation.organization, link: `/organizations?organizationID=${organizationID}` },
-        { display: translation.ward, link: `/organizations/${organizationID}?wardID=${wardId}` },
+        { display: translation.organization, link: `/organizations?organizationId=${organizationId}` },
+        { display: translation.ward, link: `/organizations/${organizationId}?wardId=${wardId}` },
         { display: translation.taskTemplates, link: `/ward/${wardId}/templates` }
       ]}
     >
@@ -116,21 +107,32 @@ const WardTaskTemplatesPage: NextPage = ({ language }: PropsWithLanguage<WardTas
         <TwoColumn
           disableResize={false}
           left={width => (
-            <TaskTemplateDisplay
-              width={width}
-              onSelectChange={taskTemplate => {
-                setContextState({
-                  ...contextState,
-                  template: taskTemplate ?? { ...emptyTaskTemplate, wardId: wardId as string | undefined },
-                  hasChanges: false,
-                  isValid: taskTemplate !== undefined,
-                  deletedSubtaskIds: []
-                })
-              }}
-              selectedID={contextState.template.id}
-              taskTemplates={data}
-              variant="wardTemplates"
-            />
+            <LoadingAndErrorComponent
+              isLoading={isLoading}
+              hasError={isError}
+              minimumLoadingDuration={3000}
+            >
+              {data && (
+                <TaskTemplateDisplay
+                  width={width}
+                  onSelectChange={taskTemplate => {
+                    setContextState({
+                      ...contextState,
+                      template: taskTemplate ?? {
+                        ...emptyTaskTemplate,
+                        wardId: wardId as string | undefined
+                      },
+                      hasChanges: false,
+                      isValid: taskTemplate !== undefined,
+                      deletedSubtaskIds: []
+                    })
+                  }}
+                  selectedId={contextState.template.id}
+                  taskTemplates={data}
+                  variant="wardTemplates"
+                />
+              )}
+            </LoadingAndErrorComponent>
           )}
           right={width => (
             <TaskTemplateDetails
diff --git a/tasks/utils/oauth.ts b/tasks/utils/oauth.ts
index 332b2862..e656f4d7 100644
--- a/tasks/utils/oauth.ts
+++ b/tasks/utils/oauth.ts
@@ -132,7 +132,7 @@ export const handleCodeExchange = async (): Promise<{ id_token: string, refresh_
     if (fakeToken) return { id_token: fakeToken, refresh_token: fakeToken }
   }
 
-  // issuerUrl -> WORK AROUND - Ory does not set the "iss"-Claim of the ID Token to "auth.helpwave.de". We will ask Ory about this.
+  // issuerUrl -> WORK AROUND - Ory does not set the "iss"-Claim of the Id Token to "auth.helpwave.de". We will ask Ory about this.
   const { authorizationServer, client } = await getCommonOAuthEntities()
 
   const state = retrieveState()