diff --git a/dev/generator/src/issues.ts b/dev/generator/src/issues.ts
index 860d9ef219..457e287cfb 100644
--- a/dev/generator/src/issues.ts
+++ b/dev/generator/src/issues.ts
@@ -23,7 +23,7 @@ const object: AttachedData<Issue> = {
   description: '',
   assignee: null,
   component: null,
-  sprint: null,
+  milestone: null,
   number: 0,
   rank: '',
   status: '' as Ref<IssueStatus>,
@@ -85,7 +85,7 @@ async function genIssue (client: TxOperations, statuses: Ref<IssueStatus>[]): Pr
     description: faker.lorem.paragraphs(),
     assignee: object.assignee,
     component: object.component,
-    sprint: object.sprint,
+    milestone: object.milestone,
     number: (incResult as any).object.sequence,
     status: faker.random.arrayElement(statuses),
     priority: faker.random.arrayElement(Object.values(IssuePriority)) as IssuePriority,
diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index c01cdb2efd..a51bc30218 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -69,8 +69,8 @@ import {
   Project,
   Scrum,
   ScrumRecord,
-  Sprint,
-  SprintStatus,
+  Milestone,
+  MilestoneStatus,
   TimeReportDayType,
   TimeSpendReport,
   trackerId
@@ -118,8 +118,8 @@ export function TypeComponentStatus (): Type<ComponentStatus> {
 /**
  * @public
  */
-export function TypeSprintStatus (): Type<SprintStatus> {
-  return { _class: tracker.class.TypeSprintStatus, label: 'TypeSprintStatus' as IntlString }
+export function TypeMilestoneStatus (): Type<MilestoneStatus> {
+  return { _class: tracker.class.TypeMilestoneStatus, label: 'TypeMilestoneStatus' as IntlString }
 }
 
 /**
@@ -131,8 +131,8 @@ export class TTypeComponentStatus extends TType {}
 /**
  * @public
  */
-@Model(tracker.class.TypeSprintStatus, core.class.Type, DOMAIN_MODEL)
-export class TTypeSprintStatus extends TType {}
+@Model(tracker.class.TypeMilestoneStatus, core.class.Type, DOMAIN_MODEL)
+export class TTypeMilestoneStatus extends TType {}
 
 /**
  * @public
@@ -243,9 +243,9 @@ export class TIssue extends TAttachedDoc implements Issue {
   @Hidden()
     rank!: string
 
-  @Prop(TypeRef(tracker.class.Sprint), tracker.string.Sprint, { icon: tracker.icon.Sprint })
+  @Prop(TypeRef(tracker.class.Milestone), tracker.string.Milestone, { icon: tracker.icon.Milestone })
   @Index(IndexKind.Indexed)
-    sprint!: Ref<Sprint> | null
+    milestone!: Ref<Milestone> | null
 
   @Prop(TypeNumber(), tracker.string.Estimation)
     estimation!: number
@@ -295,8 +295,8 @@ export class TIssueTemplate extends TDoc implements IssueTemplate {
   @Prop(TypeDate(DateRangeMode.DATETIME), tracker.string.DueDate)
     dueDate!: Timestamp | null
 
-  @Prop(TypeRef(tracker.class.Sprint), tracker.string.Sprint)
-    sprint!: Ref<Sprint> | null
+  @Prop(TypeRef(tracker.class.Milestone), tracker.string.Milestone)
+    milestone!: Ref<Milestone> | null
 
   @Prop(TypeNumber(), tracker.string.Estimation)
     estimation!: number
@@ -376,9 +376,9 @@ export class TComponent extends TDoc implements Component {
 /**
  * @public
  */
-@Model(tracker.class.Sprint, core.class.Doc, DOMAIN_TRACKER)
-@UX(tracker.string.Sprint, tracker.icon.Sprint)
-export class TSprint extends TDoc implements Sprint {
+@Model(tracker.class.Milestone, core.class.Doc, DOMAIN_TRACKER)
+@UX(tracker.string.Milestone, tracker.icon.Milestone)
+export class TMilestone extends TDoc implements Milestone {
   @Prop(TypeString(), tracker.string.Title)
   // @Index(IndexKind.FullText)
     label!: string
@@ -386,9 +386,9 @@ export class TSprint extends TDoc implements Sprint {
   @Prop(TypeMarkup(), tracker.string.Description)
     description?: Markup
 
-  @Prop(TypeSprintStatus(), tracker.string.Status)
+  @Prop(TypeMilestoneStatus(), tracker.string.Status)
   @Index(IndexKind.Indexed)
-    status!: SprintStatus
+    status!: MilestoneStatus
 
   @Prop(TypeRef(contact.class.Employee), tracker.string.ComponentLead)
     lead!: Ref<Employee> | null
@@ -402,9 +402,6 @@ export class TSprint extends TDoc implements Sprint {
   @Prop(Collection(attachment.class.Attachment), attachment.string.Attachments, { shortLabel: attachment.string.Files })
     attachments?: number
 
-  @Prop(TypeDate(), tracker.string.StartDate)
-    startDate!: Timestamp
-
   @Prop(TypeDate(), tracker.string.TargetDate)
     targetDate!: Timestamp
 
@@ -483,16 +480,16 @@ export function createModel (builder: Builder): void {
     TIssueStatus,
     TTypeIssuePriority,
     TTypeComponentStatus,
-    TSprint,
+    TMilestone,
     TScrum,
     TScrumRecord,
-    TTypeSprintStatus,
+    TTypeMilestoneStatus,
     TTimeSpendReport,
     TTypeReportedTime
   )
 
   const issuesOptions: ViewOptionsModel = {
-    groupBy: ['status', 'assignee', 'priority', 'component', 'sprint'],
+    groupBy: ['status', 'assignee', 'priority', 'component', 'milestone'],
     orderBy: [
       ['status', SortingOrder.Ascending],
       ['priority', SortingOrder.Ascending],
@@ -574,14 +571,14 @@ export function createModel (builder: Builder): void {
         },
         {
           key: '',
-          presenter: tracker.component.SprintEditor,
+          presenter: tracker.component.MilestoneEditor,
           props: {
             kind: 'list',
             size: 'small',
             shape: 'round',
             shouldShowPlaceholder: false,
             listProps: {
-              excludeByKey: 'sprint',
+              excludeByKey: 'milestone',
               compression: true,
               optional: true
             }
@@ -619,7 +616,7 @@ export function createModel (builder: Builder): void {
   )
 
   const subIssuesOptions: ViewOptionsModel = {
-    groupBy: ['status', 'assignee', 'priority', 'sprint'],
+    groupBy: ['status', 'assignee', 'priority', 'milestone'],
     orderBy: [
       ['rank', SortingOrder.Ascending],
       ['status', SortingOrder.Ascending],
@@ -662,14 +659,14 @@ export function createModel (builder: Builder): void {
         { key: '', presenter: tracker.component.DueDatePresenter, props: { kind: 'list' } },
         {
           key: '',
-          presenter: tracker.component.SprintEditor,
+          presenter: tracker.component.MilestoneEditor,
           props: {
             kind: 'list',
             size: 'small',
             shape: 'round',
             shouldShowPlaceholder: false,
             listProps: {
-              excludeByKey: 'sprint',
+              excludeByKey: 'milestone',
               optional: true
             }
           }
@@ -701,7 +698,7 @@ export function createModel (builder: Builder): void {
       attachTo: tracker.class.IssueTemplate,
       descriptor: view.viewlet.List,
       viewOptions: {
-        groupBy: ['assignee', 'priority', 'component', 'sprint'],
+        groupBy: ['assignee', 'priority', 'component', 'milestone'],
         orderBy: [
           ['priority', SortingOrder.Ascending],
           ['modifiedOn', SortingOrder.Descending],
@@ -726,7 +723,7 @@ export function createModel (builder: Builder): void {
         },
         {
           key: '',
-          presenter: tracker.component.SprintEditor,
+          presenter: tracker.component.MilestoneEditor,
           props: { kind: 'list', size: 'small', shape: 'round', shouldShowPlaceholder: false }
         },
         { key: '', presenter: tracker.component.TemplateEstimationEditor, props: { kind: 'list', size: 'small' } },
@@ -846,7 +843,7 @@ export function createModel (builder: Builder): void {
   const backlogId = 'backlog'
   const boardId = 'board'
   const componentsId = 'components'
-  const sprintsId = 'sprints'
+  const milestonesId = 'milestones'
   const templatesId = 'templates'
   const myIssuesId = 'my-issues'
   // const scrumsId = 'scrums'
@@ -895,8 +892,8 @@ export function createModel (builder: Builder): void {
     func: tracker.function.IssuePrioritySort
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.SortFuncs, {
-    func: tracker.function.SprintSort
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.SortFuncs, {
+    func: tracker.function.MilestoneSort
   })
 
   builder.mixin(tracker.class.TypeIssuePriority, core.class.Class, view.mixin.ObjectPresenter, {
@@ -942,12 +939,12 @@ export function createModel (builder: Builder): void {
     inlineEditor: tracker.component.ComponentSelector
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.ObjectPresenter, {
-    presenter: tracker.component.SprintPresenter
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.ObjectPresenter, {
+    presenter: tracker.component.MilestonePresenter
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.AttributePresenter, {
-    presenter: tracker.component.SprintRefPresenter
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.AttributePresenter, {
+    presenter: tracker.component.MilestoneRefPresenter
   })
 
   builder.mixin(tracker.class.Issue, core.class.Class, setting.mixin.Editable, {
@@ -966,8 +963,8 @@ export function createModel (builder: Builder): void {
     func: tracker.function.GetAllComponents
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.AllValuesFunc, {
-    func: tracker.function.GetAllSprints
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.AllValuesFunc, {
+    func: tracker.function.GetAllMilestones
   })
 
   builder.mixin(tracker.class.Issue, core.class.Class, view.mixin.LinkProvider, {
@@ -1071,10 +1068,10 @@ export function createModel (builder: Builder): void {
                 component: tracker.component.ProjectComponents
               },
               {
-                id: sprintsId,
-                label: tracker.string.Sprints,
-                icon: tracker.icon.Sprint,
-                component: tracker.component.Sprints
+                id: milestonesId,
+                label: tracker.string.Milestones,
+                icon: tracker.icon.Milestone,
+                component: tracker.component.Milestones
               },
               // {
               //   id: scrumsId,
@@ -1357,7 +1354,7 @@ export function createModel (builder: Builder): void {
       'priority',
       'labels',
       'title',
-      'sprint',
+      'milestone',
       'component',
       'dueDate',
       'createOn',
@@ -1372,23 +1369,23 @@ export function createModel (builder: Builder): void {
     filters: []
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.ClassFilters, {
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.ClassFilters, {
     filters: []
   })
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.ClassFilters, {
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.ClassFilters, {
     filters: ['status'],
     strict: true
   })
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.AttributeFilter, {
-    component: tracker.component.SprintFilter
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.AttributeFilter, {
+    component: tracker.component.MilestoneFilter
   })
 
-  builder.mixin(tracker.class.TypeSprintStatus, core.class.Class, view.mixin.AttributePresenter, {
-    presenter: tracker.component.SprintStatusPresenter
+  builder.mixin(tracker.class.TypeMilestoneStatus, core.class.Class, view.mixin.AttributePresenter, {
+    presenter: tracker.component.MilestoneStatusPresenter
   })
 
-  builder.mixin(tracker.class.TypeSprintStatus, core.class.Class, view.mixin.AttributeFilter, {
+  builder.mixin(tracker.class.TypeMilestoneStatus, core.class.Class, view.mixin.AttributeFilter, {
     component: view.component.ValueFilter
   })
 
@@ -1547,13 +1544,13 @@ export function createModel (builder: Builder): void {
     builder,
     {
       action: view.actionImpl.AttributeSelector,
-      actionPopup: tracker.component.SprintEditor,
+      actionPopup: tracker.component.MilestoneEditor,
       actionProps: {
-        attribute: 'sprint',
+        attribute: 'milestone',
         isAction: true
       },
-      label: tracker.string.Sprint,
-      icon: tracker.icon.Sprint,
+      label: tracker.string.Milestone,
+      icon: tracker.icon.Milestone,
       keyBinding: ['keyS->keyP'],
       input: 'any',
       category: tracker.category.Tracker,
@@ -1564,7 +1561,7 @@ export function createModel (builder: Builder): void {
         group: 'edit'
       }
     },
-    tracker.action.SetSprint
+    tracker.action.SetMilestone
   )
 
   createAction(
@@ -1779,19 +1776,19 @@ export function createModel (builder: Builder): void {
   createAction(
     builder,
     {
-      action: tracker.actionImpl.DeleteSprint,
+      action: tracker.actionImpl.DeleteMilestone,
       label: view.string.Delete,
       icon: view.icon.Delete,
       keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
       category: tracker.category.Tracker,
       input: 'any',
-      target: tracker.class.Sprint,
+      target: tracker.class.Milestone,
       context: { mode: ['context', 'browser'], group: 'tools' }
     },
-    tracker.action.DeleteSprint
+    tracker.action.DeleteMilestone
   )
 
-  builder.mixin(tracker.class.Sprint, core.class.Class, view.mixin.IgnoreActions, {
+  builder.mixin(tracker.class.Milestone, core.class.Class, view.mixin.IgnoreActions, {
     actions: [view.action.Delete]
   })
 
@@ -1802,10 +1799,9 @@ export function createModel (builder: Builder): void {
     tracker.component.ReportedTimeEditor
   )
 
-  const sprintOptions: ViewOptionsModel = {
+  const milestoneOptions: ViewOptionsModel = {
     groupBy: ['lead'],
     orderBy: [
-      ['startDate', SortingOrder.Descending],
       ['modifiedOn', SortingOrder.Descending],
       ['targetDate', SortingOrder.Descending],
       ['capacity', SortingOrder.Ascending]
@@ -1817,32 +1813,31 @@ export function createModel (builder: Builder): void {
     view.class.Viewlet,
     core.space.Model,
     {
-      attachTo: tracker.class.Sprint,
+      attachTo: tracker.class.Milestone,
       descriptor: view.viewlet.List,
-      viewOptions: sprintOptions,
+      viewOptions: milestoneOptions,
       config: [
         {
           key: 'status',
           props: { width: '1rem', kind: 'list', size: 'small', justify: 'center' }
         },
-        { key: '', presenter: tracker.component.SprintPresenter, props: { shouldUseMargin: true } },
+        { key: '', presenter: tracker.component.MilestonePresenter, props: { shouldUseMargin: true } },
         { key: '', presenter: view.component.GrowPresenter, props: { type: 'grow' } },
         {
           key: '',
           presenter: contact.component.MembersPresenter,
           props: {
             kind: 'link',
-            intlTitle: tracker.string.SprintMembersTitle,
-            intlSearchPh: tracker.string.SprintMembersSearchPlaceholder
+            intlTitle: tracker.string.MilestoneMembersTitle,
+            intlSearchPh: tracker.string.MilestoneMembersSearchPlaceholder
           }
         },
-        { key: '', presenter: tracker.component.SprintDatePresenter, props: { field: 'startDate' } },
-        { key: '', presenter: tracker.component.SprintDatePresenter, props: { field: 'targetDate' } },
+        { key: '', presenter: tracker.component.MilestoneDatePresenter, props: { field: 'targetDate' } },
         {
           key: 'lead',
-          presenter: tracker.component.SprintLeadPresenter,
+          presenter: tracker.component.MilestoneLeadPresenter,
           props: {
-            _class: tracker.class.Sprint,
+            _class: tracker.class.Milestone,
             defaultClass: contact.class.Employee,
             shouldShowLabel: false,
             size: 'x-small'
@@ -1850,7 +1845,7 @@ export function createModel (builder: Builder): void {
         }
       ]
     },
-    tracker.viewlet.SprintList
+    tracker.viewlet.MilestoneList
   )
 
   builder.createDoc(
@@ -1893,7 +1888,7 @@ export function createModel (builder: Builder): void {
     tracker.class.Issue,
     tracker.ids.TrackerNotificationGroup,
     [],
-    ['comments', 'status', 'priority', 'assignee', 'subIssues', 'blockedBy', 'sprint', 'dueDate']
+    ['comments', 'status', 'priority', 'assignee', 'subIssues', 'blockedBy', 'milestone', 'dueDate']
   )
 
   createAction(
@@ -1905,21 +1900,21 @@ export function createModel (builder: Builder): void {
         attribute: 'lead',
         _class: contact.class.Employee,
         query: {},
-        placeholder: tracker.string.SprintLead
+        placeholder: tracker.string.MilestoneLead
       },
-      label: tracker.string.SprintLead,
+      label: tracker.string.MilestoneLead,
       icon: contact.icon.Person,
       keyBinding: [],
       input: 'none',
       category: tracker.category.Tracker,
-      target: tracker.class.Sprint,
+      target: tracker.class.Milestone,
       context: {
         mode: ['context'],
         application: tracker.app.Tracker,
         group: 'edit'
       }
     },
-    tracker.action.SetSprintLead
+    tracker.action.SetMilestoneLead
   )
 
   const componentListViewOptions: ViewOptionsModel = {
diff --git a/models/tracker/src/migration.ts b/models/tracker/src/migration.ts
index 2608d1ddc0..4350c73c17 100644
--- a/models/tracker/src/migration.ts
+++ b/models/tracker/src/migration.ts
@@ -40,8 +40,8 @@ import {
   IssueTemplate,
   IssueTemplateChild,
   Project,
-  Sprint,
-  SprintStatus,
+  Milestone,
+  MilestoneStatus,
   TimeReportDayType
 } from '@hcengineering/tracker'
 import { DOMAIN_TRACKER } from '.'
@@ -387,11 +387,183 @@ async function upgradeIssues (tx: TxOperations): Promise<void> {
   }
 }
 
+async function renameSprintToMilestone (client: MigrationClient): Promise<void> {
+  await client.update(
+    DOMAIN_TRACKER,
+    {
+      _class: tracker.class.Issue,
+      sprint: { $exists: true }
+    },
+    {
+      $rename: { sprint: 'milestone' }
+    }
+  )
+  await client.update(
+    DOMAIN_TRACKER,
+    {
+      _class: 'tracker:class:Sprint' as Ref<Class<Doc>>
+    },
+    {
+      _class: tracker.class.Milestone
+    }
+  )
+  const milestones = await client.find(DOMAIN_TRACKER, { _class: tracker.class.Milestone })
+  for (const milestone of milestones) {
+    await client.update(
+      DOMAIN_TX,
+      {
+        objectId: milestone._id,
+        objectClass: 'tracker:class:Sprint' as Ref<Class<Doc>>
+      },
+      {
+        objectClass: tracker.class.Milestone
+      }
+    )
+  }
+
+  await client.update(
+    DOMAIN_TX,
+    {
+      _class: core.class.TxCollectionCUD,
+      'tx._class': core.class.TxCreateDoc,
+      'tx.objectClass': tracker.class.Issue,
+      'tx.attributes.sprint': { $exists: true }
+    },
+    {
+      $rename: { 'tx.attributes.sprint': 'tx.attributes.milestone' }
+    }
+  )
+  await client.update(
+    DOMAIN_TX,
+    {
+      _class: core.class.TxCollectionCUD,
+      'tx._class': core.class.TxUpdateDoc,
+      'tx.objectClass': tracker.class.Issue,
+      'tx.operations.sprint': { $exists: true }
+    },
+    {
+      $rename: { 'tx.operations.sprint': 'tx.operations.milestone' }
+    }
+  )
+  await client.update(
+    DOMAIN_TX,
+    {
+      objectClass: tracker.class.Issue,
+      _class: core.class.TxUpdateDoc,
+      'operations.sprint': { $exists: true }
+    },
+    {
+      $rename: { 'operations.sprint': 'operations.milestone' }
+    }
+  )
+
+  const templates = await client.find<IssueTemplate>(DOMAIN_TRACKER, {
+    _class: tracker.class.IssueTemplate,
+    sprint: { $exists: true }
+  })
+  for (const template of templates) {
+    const children: IssueTemplateChild[] = template.children.map((p) => {
+      const res = {
+        ...p,
+        milestone: p.milestone
+      }
+      delete (res as any).sprint
+      return res
+    })
+    await client.update<IssueTemplate>(
+      DOMAIN_TRACKER,
+      {
+        _id: template._id
+      },
+      {
+        children
+      }
+    )
+    await client.update(
+      DOMAIN_TRACKER,
+      {
+        _id: template._id
+      },
+      {
+        $rename: { sprint: 'milestone' }
+      }
+    )
+    const createTxes = await client.find<TxCreateDoc<IssueTemplate>>(DOMAIN_TX, {
+      objectId: template._id,
+      _class: core.class.TxCreateDoc
+    })
+    for (const createTx of createTxes) {
+      const children: IssueTemplateChild[] = createTx.attributes.children.map((p) => {
+        const res = {
+          ...p,
+          milestone: p.milestone
+        }
+        delete (res as any).sprint
+        return res
+      })
+      await client.update<TxCreateDoc<IssueTemplate>>(
+        DOMAIN_TX,
+        {
+          _id: createTx._id
+        },
+        {
+          children
+        }
+      )
+      await client.update(
+        DOMAIN_TX,
+        {
+          _id: createTx._id
+        },
+        {
+          $rename: { 'attributes.sprint': 'attributes.milestone' }
+        }
+      )
+    }
+    const updateTxes = await client.find<TxUpdateDoc<IssueTemplate>>(DOMAIN_TX, {
+      objectId: template._id,
+      _class: core.class.TxUpdateDoc
+    })
+    for (const updateTx of updateTxes) {
+      if ((updateTx.operations as any).sprint !== undefined) {
+        await client.update(
+          DOMAIN_TX,
+          {
+            _id: updateTx._id
+          },
+          {
+            $rename: { 'operations.sprint': 'operations.milestone' }
+          }
+        )
+      }
+      if (updateTx.operations.children !== undefined) {
+        const children: IssueTemplateChild[] = updateTx.operations.children.map((p) => {
+          const res = {
+            ...p,
+            milestone: p.milestone
+          }
+          delete (res as any).sprint
+          return res
+        })
+        await client.update(
+          DOMAIN_TX,
+          {
+            _id: updateTx._id
+          },
+          {
+            children
+          }
+        )
+      }
+    }
+  }
+}
+
 async function renameProject (client: MigrationClient): Promise<void> {
   await client.update(
     DOMAIN_TRACKER,
     {
-      _class: { $in: [tracker.class.Issue, tracker.class.Sprint] },
+      _class: { $in: [tracker.class.Issue, tracker.class.Milestone] },
       project: { $exists: true }
     },
     {
@@ -448,7 +620,7 @@ async function renameProject (client: MigrationClient): Promise<void> {
   await client.update(
     DOMAIN_TX,
     {
-      objectClass: tracker.class.Sprint,
+      objectClass: tracker.class.Milestone,
       _class: core.class.TxCreateDoc,
       'attributes.project': { $exists: true }
     },
@@ -459,7 +631,7 @@ async function renameProject (client: MigrationClient): Promise<void> {
   await client.update(
     DOMAIN_TX,
     {
-      objectClass: { $in: [tracker.class.Issue, tracker.class.Sprint] },
+      objectClass: { $in: [tracker.class.Issue, tracker.class.Milestone] },
       _class: core.class.TxUpdateDoc,
       'operations.project': { $exists: true }
     },
@@ -732,11 +904,11 @@ async function setCreate (client: MigrationClient): Promise<void> {
   }
 }
 
-async function fixSprintEmptyStatuses (client: MigrationClient): Promise<void> {
-  await client.update<Sprint>(
+async function fixMilestoneEmptyStatuses (client: MigrationClient): Promise<void> {
+  await client.update<Milestone>(
     DOMAIN_TRACKER,
-    { _class: tracker.class.Sprint, $or: [{ status: null }, { status: undefined }] },
-    { status: SprintStatus.Planned }
+    { _class: tracker.class.Milestone, $or: [{ status: null }, { status: undefined }] },
+    { status: MilestoneStatus.Planned }
   )
 }
 
@@ -754,6 +926,7 @@ export const trackerOperation: MigrateOperation = {
     await Promise.all([migrateIssueComponents(client), migrateParentIssues(client)])
     await migrateIssueParentInfo(client)
     await fillRank(client)
+    await renameSprintToMilestone(client)
     await renameProject(client)
     await setCreate(client)
 
@@ -773,7 +946,7 @@ export const trackerOperation: MigrateOperation = {
       }
     )
 
-    await fixSprintEmptyStatuses(client)
+    await fixMilestoneEmptyStatuses(client)
   },
   async upgrade (client: MigrationUpgradeClient): Promise<void> {
     const tx = new TxOperations(client, core.account.System)
diff --git a/models/tracker/src/plugin.ts b/models/tracker/src/plugin.ts
index 3934566731..1710e4a60d 100644
--- a/models/tracker/src/plugin.ts
+++ b/models/tracker/src/plugin.ts
@@ -49,11 +49,11 @@ export default mergeIds(trackerId, tracker, {
     PriorityIcon: '' as AnyComponent
   },
   component: {
-    SprintSelector: '' as AnyComponent,
+    MilestoneSelector: '' as AnyComponent,
     IssueStatistics: '' as AnyComponent,
     TimeSpendReportPopup: '' as AnyComponent,
     NotificationIssuePresenter: '' as AnyComponent,
-    SprintFilter: '' as AnyComponent
+    MilestoneFilter: '' as AnyComponent
   },
   app: {
     Tracker: '' as Ref<Application>
@@ -62,7 +62,7 @@ export default mergeIds(trackerId, tracker, {
     IssueList: '' as Ref<Viewlet>,
     IssueTemplateList: '' as Ref<Viewlet>,
     IssueKanban: '' as Ref<Viewlet>,
-    SprintList: '' as Ref<Viewlet>,
+    MilestoneList: '' as Ref<Viewlet>,
     ComponentList: '' as Ref<Viewlet>,
     ComponentsTimeline: '' as Ref<Viewlet>
   },
@@ -81,12 +81,12 @@ export default mergeIds(trackerId, tracker, {
     EditWorkflowStatuses: '' as ViewAction,
     EditProject: '' as ViewAction,
     DeleteProject: '' as ViewAction,
-    DeleteSprint: '' as ViewAction
+    DeleteMilestone: '' as ViewAction
   },
   action: {
     NewRelatedIssue: '' as Ref<Action<Doc, Record<string, any>>>,
-    DeleteSprint: '' as Ref<Action<Doc, Record<string, any>>>,
+    DeleteMilestone: '' as Ref<Action<Doc, Record<string, any>>>,
     DeleteProject: '' as Ref<Action<Doc, Record<string, any>>>,
-    SetSprintLead: '' as Ref<Action<Doc, Record<string, any>>>
+    SetMilestoneLead: '' as Ref<Action<Doc, Record<string, any>>>
   }
 })
diff --git a/plugins/recruit-resources/src/components/CreateVacancy.svelte b/plugins/recruit-resources/src/components/CreateVacancy.svelte
index b831b3b6b4..68a1d11ead 100644
--- a/plugins/recruit-resources/src/components/CreateVacancy.svelte
+++ b/plugins/recruit-resources/src/components/CreateVacancy.svelte
@@ -129,7 +129,7 @@
       description: template.description,
       assignee: template.assignee,
       component: template.component,
-      sprint: template.sprint,
+      milestone: template.milestone,
       number: (incResult as any).object.sequence,
       status: project?.defaultIssueStatus as Ref<IssueStatus>,
       priority: template.priority,
diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg
index cc7e433b01..cda57ee9c5 100644
--- a/plugins/tracker-assets/assets/icons.svg
+++ b/plugins/tracker-assets/assets/icons.svg
@@ -172,7 +172,7 @@
   <symbol id="duplicate" viewBox="0 0 24 24">
     <path d="M17.1,1.2h-4.2C9,1.2,7.2,3,7.2,6.9v0.4H6.9C3,7.2,1.2,9,1.2,12.9v4.2c0,3.9,1.7,5.7,5.6,5.7h4.2 c3.9,0,5.6-1.7,5.6-5.7v-0.3h0.3c3.9,0,5.7-1.7,5.7-5.6V6.9C22.8,3,21,1.2,17.1,1.2z M15.2,17.1c0,3.1-1,4.2-4.1,4.2H6.9 c-3.1,0-4.1-1-4.1-4.2v-4.2c0-3.1,1-4.1,4.1-4.1H8h3.1c3.1,0,4.1,1,4.1,4.1V16V17.1z M21.2,11.1c0,3.1-1,4.1-4.2,4.1h-0.3v-2.4 c0-3.9-1.7-5.6-5.6-5.6H8.8V6.9c0-3.1,1-4.1,4.1-4.1h4.2c3.1,0,4.2,1,4.2,4.1V11.1z" />
   </symbol>
-  <symbol id="sprint" viewBox="0 0 16 16">
+  <symbol id="milestone" viewBox="0 0 16 16">
     <path d="M3,6c0-0.6,0.4-1,1-1h8.1l-1.8,1.8L11,7.5l3-3l-3-3l-0.7,0.7L12.1,4H4C2.9,4,2,4.9,2,6v2h1V6z" />
     <path d="M13,8v2c0,0.6-0.4,1-1,1H3.9l1.8-1.8L5,8.5l-3,3l3,3l0.7-0.7L3.9,12H12c1.1,0,2-0.9,2-2V8H13z" />
   </symbol>
diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index d9519a0731..6bcdf59195 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -203,27 +203,27 @@
     "NewSubIssue": "Add sub-issue...",
     "AddLabel": "Add label",
 
-    "Sprint": "Sprint",
-    "NoSprint": "No Sprint",
-    "MoveToSprint": "Select Sprint",
-    "Sprints": "Sprints",
-    "AllSprints": "All",
-    "PlannedSprints": "Planned",
-    "ActiveSprints": "Active",
-    "ClosedSprints": "Done",
-    "AddToSprint": "Add to Sprint",
-    "SprintNamePlaceholder": "Sprint name",
-    "SprintLead": "Lead",
-    "SprintLeadTitle": "Sprint lead",
-    "SprintLeadSearchPlaceholder": "Set sprint lead\u2026",
-    "SprintMembersTitle": "Sprint members",
-    "SprintMembersSearchPlaceholder": "Change sprint members\u2026",
+    "Milestone": "Milestone",
+    "NoMilestone": "No Milestone",
+    "MoveToMilestone": "Select Milestone",
+    "Milestones": "Milestones",
+    "AllMilestones": "All",
+    "PlannedMilestones": "Planned",
+    "ActiveMilestones": "Active",
+    "ClosedMilestones": "Done",
+    "AddToMilestone": "Add to Milestone",
+    "MilestoneNamePlaceholder": "Milestone name",
+    "MilestoneLead": "Lead",
+    "MilestoneLeadTitle": "Milestone lead",
+    "MilestoneLeadSearchPlaceholder": "Set milestone lead\u2026",
+    "MilestoneMembersTitle": "Milestone members",
+    "MilestoneMembersSearchPlaceholder": "Change milestone members\u2026",
 
-    "NewSprint": "New Sprint",
-    "CreateSprint": "Create",
+    "NewMilestone": "New Milestone",
+    "CreateMilestone": "Create",
 
-    "MoveAndDeleteSprint": "Move Issues to {newSprint} and Delete {deleteSprint}",
-    "MoveAndDeleteSprintConfirm": "Do you want to delete sprint and move issues to another sprint?",
+    "MoveAndDeleteMilestone": "Move Issues to {newMilestone} and Delete {deleteMilestone}",
+    "MoveAndDeleteMilestoneConfirm": "Do you want to delete milestone and move issues to another milestone?",
 
     "Scrums": "Scrums",
     "Scrum": "Scrum",
@@ -256,7 +256,6 @@
     "TimeSpendReportDescription": "Description",
     "TimeSpendValue": "{value}d",
     "TimeSpendHours": "{value}h",
-    "SprintPassed": "{from}d/{to}d",
     "ChildEstimation": "Subissues Estimation",
     "ChildReportedTime": "Subissues Time",
     "Capacity": "Capacity",
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index 7c218b7131..4266749705 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -203,27 +203,27 @@
     "NewSubIssue": "Добавить под-задачу...",
     "AddLabel": "Добавить метку",
 
-    "Sprint": "Спринт",
-    "NoSprint": "Без Спринта",
-    "MoveToSprint": "Выбрать Спринт",
-    "Sprints": "Спринты",
-    "AllSprints": "Все",
-    "PlannedSprints": "Запланировано",
-    "ActiveSprints": "Активно",
-    "ClosedSprints": "Завершено",
-    "AddToSprint": "Добавить в Спринт",
-    "SprintNamePlaceholder": "Название спринта",
-    "SprintLead": "Руководитель",
-    "SprintLeadTitle": "Руководитель спринта",
-    "SprintLeadSearchPlaceholder": "Назначьте руководителя спринта\u2026",
-    "SprintMembersTitle": "Участники спринта",
-    "SprintMembersSearchPlaceholder": "Измененить участников спринта\u2026",
+    "Milestone": "Майлстоун",
+    "NoMilestone": "Без Майлстоуна",
+    "MoveToMilestone": "Выбрать Майлстоун",
+    "Milestones": "Майлстоуны",
+    "AllMilestones": "Все",
+    "PlannedMilestones": "Запланировано",
+    "ActiveMilestones": "Активно",
+    "ClosedMilestones": "Завершено",
+    "AddToMilestone": "Добавить в Майлстоун",
+    "MilestoneNamePlaceholder": "Название майлстоуна",
+    "MilestoneLead": "Руководитель",
+    "MilestoneLeadTitle": "Руководитель майлстоуна",
+    "MilestoneLeadSearchPlaceholder": "Назначьте руководителя майлстоуна\u2026",
+    "MilestoneMembersTitle": "Участники майлстоуна",
+    "MilestoneMembersSearchPlaceholder": "Измененить участников майлстоуна\u2026",
 
-    "NewSprint": "Новый Спринт",
-    "CreateSprint": "Создать",
+    "NewMilestone": "Новый Майлстоун",
+    "CreateMilestone": "Создать",
 
-    "MoveAndDeleteSprint": "Переместить Задачи в {newSprint} и Удалить {deleteSprint}",
-    "MoveAndDeleteSprintConfirm": "Вы действительно хотите удалить спринт и перенести задачи в другой спринт?",
+    "MoveAndDeleteMilestone": "Переместить Задачи в {newMilestone} и Удалить {deleteMilestone}",
+    "MoveAndDeleteMilestoneConfirm": "Вы действительно хотите удалить майлстоун и перенести задачи в другой майлстоун?",
 
     "Scrums": "Скрамы",
     "Scrum": "Скрам",
@@ -256,7 +256,6 @@
     "TimeSpendReportDescription": "Описание",
     "TimeSpendValue": "{value}d",
     "TimeSpendHours": "{value}h",
-    "SprintPassed": "{from}d/{to}d",
     "ChildEstimation": "Оценка подзадач",
     "ChildReportedTime": "Время водзадач",
     "Capacity": "Вместимость",
diff --git a/plugins/tracker-assets/src/index.ts b/plugins/tracker-assets/src/index.ts
index 07481c8413..d7baf9d064 100644
--- a/plugins/tracker-assets/src/index.ts
+++ b/plugins/tracker-assets/src/index.ts
@@ -35,7 +35,7 @@ loadMetadata(tracker.icon, {
   Labels: `${icons}#priority-nopriority`, // TODO: add icon
   DueDate: `${icons}#inbox`, // TODO: add icon
   Parent: `${icons}#myissues`, // TODO: add icon
-  Sprint: `${icons}#sprint`,
+  Milestone: `${icons}#milestone`,
   IssueTemplates: `${icons}#issuetemplates`,
   Scrum: `${icons}#scrum`,
   Start: `${icons}#start`,
@@ -62,11 +62,11 @@ loadMetadata(tracker.icon, {
   ComponentStatusCompleted: `${icons}#component-status-completed`,
   ComponentStatusCanceled: `${icons}#component-status-canceled`,
 
-  SprintStatusPlanned: `${icons}#component-status-planned`,
-  SprintStatusInProgress: `${icons}#component-status-in-progress`,
-  SprintStatusPaused: `${icons}#component-status-paused`,
-  SprintStatusCompleted: `${icons}#component-status-completed`,
-  SprintStatusCanceled: `${icons}#component-status-canceled`,
+  MilestoneStatusPlanned: `${icons}#component-status-planned`,
+  MilestoneStatusInProgress: `${icons}#component-status-in-progress`,
+  MilestoneStatusPaused: `${icons}#component-status-paused`,
+  MilestoneStatusCompleted: `${icons}#component-status-completed`,
+  MilestoneStatusCanceled: `${icons}#component-status-canceled`,
 
   CopyID: `${icons}#copyID`,
   CopyURL: `${icons}#copyURL`,
diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte
index 1c00a41245..bca41a5029 100644
--- a/plugins/tracker-resources/src/components/CreateIssue.svelte
+++ b/plugins/tracker-resources/src/components/CreateIssue.svelte
@@ -38,7 +38,7 @@
     IssueStatus,
     IssueTemplate,
     Project,
-    Sprint
+    Milestone
   } from '@hcengineering/tracker'
   import {
     ActionIcon,
@@ -58,7 +58,7 @@
   import view from '@hcengineering/view'
   import { ObjectBox } from '@hcengineering/view-resources'
   import { createEventDispatcher, onDestroy } from 'svelte'
-  import { activeComponent, activeSprint, generateIssueShortLink, getIssueId, updateIssueRelation } from '../issues'
+  import { activeComponent, activeMilestone, generateIssueShortLink, getIssueId, updateIssueRelation } from '../issues'
   import tracker from '../plugin'
   import ComponentSelector from './ComponentSelector.svelte'
   import AssigneeEditor from './issues/AssigneeEditor.svelte'
@@ -69,7 +69,7 @@
   import EstimationEditor from './issues/timereport/EstimationEditor.svelte'
   import SetDueDateActionPopup from './SetDueDateActionPopup.svelte'
   import SetParentIssueActionPopup from './SetParentIssueActionPopup.svelte'
-  import SprintSelector from './sprints/SprintSelector.svelte'
+  import MilestoneSelector from './milestones/MilestoneSelector.svelte'
   import SubIssues from './SubIssues.svelte'
 
   export let space: Ref<Project>
@@ -77,7 +77,7 @@
   export let priority: IssuePriority = IssuePriority.NoPriority
   export let assignee: Ref<Employee> | null = null
   export let component: Ref<ComponentType> | null = $activeComponent ?? null
-  export let sprint: Ref<Sprint> | null = $activeSprint ?? null
+  export let milestone: Ref<Milestone> | null = $activeMilestone ?? null
   export let relatedTo: Doc | undefined
   export let shouldSaveDraft: boolean = false
   export let parentIssue: Issue | undefined
@@ -138,7 +138,7 @@
       dueDate: null,
       attachments: 0,
       estimation: 0,
-      sprint,
+      milestone,
       status,
       assignee,
       labels: [],
@@ -187,7 +187,7 @@
     parentIssue: parentIssue?._id,
     description: '<p></p>',
     component,
-    sprint,
+    milestone,
     priority,
     space
   }
@@ -339,7 +339,7 @@
       description: object.description,
       assignee: object.assignee,
       component: object.component,
-      sprint: object.sprint,
+      milestone: object.milestone,
       number: (incResult as any).object.sequence,
       status: object.status,
       priority: object.priority,
@@ -463,12 +463,12 @@
     object.component = componentId
   }
 
-  const handleSprintIdChanged = async (sprintId: Ref<Sprint> | null | undefined) => {
-    if (sprintId === undefined) {
+  const handleMilestoneIdChanged = async (milestoneId: Ref<Milestone> | null | undefined) => {
+    if (milestoneId === undefined) {
       return
     }
 
-    object.sprint = sprintId
+    object.milestone = milestoneId
   }
 
   function addTagRef (tag: TagElement): void {
@@ -626,7 +626,7 @@
     projectId={_space}
     parendIssueId={object._id}
     project={currentProject}
-    sprint={object.sprint}
+    milestone={object.milestone}
     component={object.component}
     {shouldSaveDraft}
     bind:subIssues={object.subIssues}
@@ -707,10 +707,10 @@
       kind={'secondary'}
       size={'large'}
     />
-    <SprintSelector
+    <MilestoneSelector
       focusIndex={9}
-      value={object.sprint}
-      onChange={handleSprintIdChanged}
+      value={object.milestone}
+      onChange={handleMilestoneIdChanged}
       useComponent={(!originalIssue && object.component) || undefined}
       kind={'secondary'}
       size={'large'}
diff --git a/plugins/tracker-resources/src/components/SubIssues.svelte b/plugins/tracker-resources/src/components/SubIssues.svelte
index b2e6519bc7..37919a53b2 100644
--- a/plugins/tracker-resources/src/components/SubIssues.svelte
+++ b/plugins/tracker-resources/src/components/SubIssues.svelte
@@ -18,7 +18,7 @@
   import core, { AttachedData, Doc, Ref, SortingOrder } from '@hcengineering/core'
   import { DraftController, draftsStore, getClient } from '@hcengineering/presentation'
   import tags from '@hcengineering/tags'
-  import { Component, Issue, IssueDraft, IssueParentInfo, Project, Sprint, calcRank } from '@hcengineering/tracker'
+  import { Component, Issue, IssueDraft, IssueParentInfo, Project, Milestone, calcRank } from '@hcengineering/tracker'
   import { Button, ExpandCollapse, IconAdd, Scroller, closeTooltip } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import tracker from '../plugin'
@@ -30,7 +30,7 @@
   export let parendIssueId: Ref<Issue>
   export let projectId: Ref<Project>
   export let project: Project | undefined
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<Component> | null = null
   export let subIssues: IssueDraft[] = []
   export let shouldSaveDraft: boolean = false
@@ -86,7 +86,7 @@
         description: subIssue.description,
         assignee: subIssue.assignee,
         component: subIssue.component,
-        sprint: subIssue.sprint,
+        milestone: subIssue.milestone,
         number: (incResult as any).object.sequence,
         status: subIssue.status ?? project.defaultIssueStatus,
         priority: subIssue.priority,
@@ -220,7 +220,7 @@
       <Scroller>
         <DraftIssueChildList
           {component}
-          {sprint}
+          {milestone}
           bind:issues={subIssues}
           project={projectId}
           on:move={handleIssueSwap}
@@ -237,7 +237,7 @@
       {parendIssueId}
       {project}
       {component}
-      {sprint}
+      {milestone}
       {shouldSaveDraft}
       on:close={() => {
         isManualCreating = false
diff --git a/plugins/tracker-resources/src/components/components/ComponentPopup.svelte b/plugins/tracker-resources/src/components/components/ComponentPopup.svelte
index c2866a072a..1c6706770e 100644
--- a/plugins/tracker-resources/src/components/components/ComponentPopup.svelte
+++ b/plugins/tracker-resources/src/components/components/ComponentPopup.svelte
@@ -20,7 +20,7 @@
 
   export let _class: Ref<Class<Component>>
   export let selected: Ref<Component> | undefined
-  export let sprintQuery: DocumentQuery<Component> = {}
+  export let milestoneQuery: DocumentQuery<Component> = {}
   export let create: ObjectCreate | undefined = undefined
   export let allowDeselect = false
 
@@ -36,7 +36,7 @@
 <ObjectPopup
   {_class}
   {selected}
-  bind:docQuery={sprintQuery}
+  bind:docQuery={milestoneQuery}
   searchField={'label'}
   multiSelect={false}
   {allowDeselect}
@@ -45,7 +45,7 @@
   on:update
   on:close
 >
-  <svelte:fragment slot="item" let:item={sprint}>
-    <ComponentTitlePresenter value={sprint} />
+  <svelte:fragment slot="item" let:item={milestone}>
+    <ComponentTitlePresenter value={milestone} />
   </svelte:fragment>
 </ObjectPopup>
diff --git a/plugins/tracker-resources/src/components/issues/IssuesFilterMenu.svelte b/plugins/tracker-resources/src/components/issues/IssuesFilterMenu.svelte
index 762718b398..fd4df2d861 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesFilterMenu.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesFilterMenu.svelte
@@ -26,7 +26,7 @@
   import FilterMenu from '../FilterMenu.svelte'
   import PriorityFilterMenuSection from './PriorityFilterMenuSection.svelte'
   import ComponentFilterMenuSection from './ComponentFilterMenuSection.svelte'
-  import SprintFilterMenuSection from './SprintFilterMenuSection.svelte'
+  import MilestoneFilterMenuSection from './MilestoneFilterMenuSection.svelte'
   import StatusFilterMenuSection from './StatusFilterMenuSection.svelte'
 
   export let targetHtml: HTMLElement
@@ -43,7 +43,7 @@
   $: groupedByStatus = getGroupedIssues('status', issues, defaultStatusIds)
   $: groupedByPriority = getGroupedIssues('priority', issues, defaultPriorities)
   $: groupedByComponent = getGroupedIssues('component', issues)
-  $: groupedBySprint = getGroupedIssues('sprint', issues)
+  $: groupedByMilestone = getGroupedIssues('milestone', issues)
 
   const handleStatusFilterMenuSectionOpened = () => {
     const statusGroups: { [key: string]: number } = {}
@@ -105,17 +105,17 @@
     )
   }
 
-  const handleSprintFilterMenuSectionOpened = () => {
-    const sprintGroups: { [key: string]: number } = {}
+  const handleMilestoneFilterMenuSectionOpened = () => {
+    const milestoneGroups: { [key: string]: number } = {}
 
-    for (const [sprint, value] of Object.entries(groupedBySprint)) {
-      sprintGroups[sprint] = value?.length ?? 0
+    for (const [milestone, value] of Object.entries(groupedByMilestone)) {
+      milestoneGroups[milestone] = value?.length ?? 0
     }
     showPopup(
-      SprintFilterMenuSection,
+      MilestoneFilterMenuSection,
       {
-        groups: sprintGroups,
-        selectedElements: currentFilterQuery?.sprint?.[currentFilterMode] ?? [],
+        groups: milestoneGroups,
+        selectedElements: currentFilterQuery?.milestone?.[currentFilterMode] ?? [],
         index,
         onUpdate,
         onBack
@@ -138,8 +138,8 @@
       onSelect: handleComponentFilterMenuSectionOpened
     },
     {
-      ...getIssueFilterAssetsByType('sprint'),
-      onSelect: handleSprintFilterMenuSectionOpened
+      ...getIssueFilterAssetsByType('milestone'),
+      onSelect: handleMilestoneFilterMenuSectionOpened
     }
   ]
 </script>
diff --git a/plugins/tracker-resources/src/components/issues/KanbanView.svelte b/plugins/tracker-resources/src/components/issues/KanbanView.svelte
index f0f455d7cc..10cfb5f65b 100644
--- a/plugins/tracker-resources/src/components/issues/KanbanView.svelte
+++ b/plugins/tracker-resources/src/components/issues/KanbanView.svelte
@@ -142,7 +142,7 @@
     space: tracker.class.Project,
     status: tracker.class.IssueStatus,
     component: tracker.class.Component,
-    sprint: tracker.class.Sprint,
+    milestone: tracker.class.Milestone,
     _id: {
       subIssues: tracker.class.Issue,
       labels: tags.class.TagReference
diff --git a/plugins/tracker-resources/src/components/issues/SprintFilterMenuSection.svelte b/plugins/tracker-resources/src/components/issues/MilestoneFilterMenuSection.svelte
similarity index 80%
rename from plugins/tracker-resources/src/components/issues/SprintFilterMenuSection.svelte
rename to plugins/tracker-resources/src/components/issues/MilestoneFilterMenuSection.svelte
index e88e82f04e..9339dac1c0 100644
--- a/plugins/tracker-resources/src/components/issues/SprintFilterMenuSection.svelte
+++ b/plugins/tracker-resources/src/components/issues/MilestoneFilterMenuSection.svelte
@@ -30,22 +30,22 @@
     const elements: FilterSectionElement[] = []
 
     const client = getClient()
-    const sprints = await client.findAll(tracker.class.Sprint, {})
+    const milestones = await client.findAll(tracker.class.Milestone, {})
     for (const [key, value] of Object.entries(groups)) {
-      const sprint = key === 'null' ? null : key
-      const label = sprint
-        ? sprints.find(({ _id }) => _id === sprint)?.label
-        : await translate(tracker.string.NoSprint, {})
+      const milestone = key === 'null' ? null : key
+      const label = milestone
+        ? milestones.find(({ _id }) => _id === milestone)?.label
+        : await translate(tracker.string.NoMilestone, {})
 
       if (!label) {
         continue
       }
-      elements.splice(sprint ? 1 : 0, 0, {
-        icon: tracker.icon.Sprint,
+      elements.splice(milestone ? 1 : 0, 0, {
+        icon: tracker.icon.Milestone,
         title: label,
         count: value,
-        isSelected: selected.includes(sprint),
-        onSelect: () => onUpdate({ sprint }, index)
+        isSelected: selected.includes(milestone),
+        onSelect: () => onUpdate({ milestone }, index)
       })
     }
     return onBack
diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
index b69ea17a70..2039a516d5 100644
--- a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
@@ -24,7 +24,7 @@
   import { ObjectBox, getFiltredKeys, isCollectionAttr } from '@hcengineering/view-resources'
   import tracker from '../../../plugin'
   import ComponentEditor from '../../components/ComponentEditor.svelte'
-  import SprintEditor from '../../sprints/SprintEditor.svelte'
+  import MilestoneEditor from '../../milestones/MilestoneEditor.svelte'
   import AssigneeEditor from '../AssigneeEditor.svelte'
   import DueDateEditor from '../DueDateEditor.svelte'
   import PriorityEditor from '../PriorityEditor.svelte'
@@ -82,7 +82,7 @@
     'assignee',
     'component',
     'dueDate',
-    'sprint',
+    'milestone',
     'relations',
     'blockedBy'
   ])
@@ -176,9 +176,9 @@
   <ComponentEditor value={issue} size={'medium'} />
 
   <span class="label">
-    <Label label={tracker.string.Sprint} />
+    <Label label={tracker.string.Milestone} />
   </span>
-  <SprintEditor value={issue} size={'medium'} />
+  <MilestoneEditor value={issue} size={'medium'} />
 
   {#if issue.dueDate !== null}
     <div class="divider" />
diff --git a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
index 9787fa389a..21d85cbb40 100644
--- a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
@@ -64,7 +64,7 @@
       component: parentIssue.component,
       priority: IssuePriority.NoPriority,
       dueDate: null,
-      sprint: parentIssue.sprint,
+      milestone: parentIssue.milestone,
       estimation: 0
     }
   }
@@ -75,7 +75,7 @@
     assignee: currentProject.defaultAssignee ?? null,
     component: parentIssue.component,
     priority: IssuePriority.NoPriority,
-    sprint: parentIssue.sprint
+    milestone: parentIssue.milestone
   }
 
   function objectChange (object: IssueDraft, empty: any) {
diff --git a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte b/plugins/tracker-resources/src/components/milestones/EditMilestone.svelte
similarity index 51%
rename from plugins/tracker-resources/src/components/sprints/EditSprint.svelte
rename to plugins/tracker-resources/src/components/milestones/EditMilestone.svelte
index 58e11c8484..1852463c27 100644
--- a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte
+++ b/plugins/tracker-resources/src/components/milestones/EditMilestone.svelte
@@ -1,85 +1,73 @@
 <script lang="ts">
   import { getClient } from '@hcengineering/presentation'
   import { StyledTextBox } from '@hcengineering/text-editor'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { Button, DatePresenter, EditBox, Icon, IconMoreH, Label, showPopup } from '@hcengineering/ui'
   import { ContextMenu, DocAttributeBar } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
   import { onDestroy } from 'svelte'
-  import { activeSprint } from '../../issues'
+  import { activeMilestone } from '../../issues'
   import tracker from '../../plugin'
-  import { getDayOfSprint } from '../../utils'
   import Expanded from '../icons/Expanded.svelte'
   import IssuesView from '../issues/IssuesView.svelte'
-  import SprintPopup from './SprintPopup.svelte'
+  import MilestonePopup from './MilestonePopup.svelte'
 
-  export let sprint: Sprint
+  export let milestone: Milestone
 
   const client = getClient()
   const dispatch = createEventDispatcher()
 
   async function change (field: string, value: any) {
-    await client.update(sprint, { [field]: value })
+    await client.update(milestone, { [field]: value })
   }
   let container: HTMLElement
 
-  function selectSprint (): void {
-    showPopup(SprintPopup, { _class: tracker.class.Sprint }, container, (value) => {
+  function selectMilestone (): void {
+    showPopup(MilestonePopup, { _class: tracker.class.Milestone }, container, (value) => {
       if (value != null) {
-        sprint = value
-        dispatch('sprint', sprint._id)
+        milestone = value
+        dispatch('milestone', milestone._id)
       }
     })
   }
 
   function showMenu (ev?: Event): void {
-    if (sprint) {
-      showPopup(ContextMenu, { object: sprint }, (ev as MouseEvent).target as HTMLElement)
+    if (milestone) {
+      showPopup(ContextMenu, { object: milestone }, (ev as MouseEvent).target as HTMLElement)
     }
   }
 
-  $: $activeSprint = sprint?._id
+  $: $activeMilestone = milestone?._id
 
   onDestroy(() => {
-    $activeSprint = undefined
+    $activeMilestone = undefined
   })
 </script>
 
-<IssuesView query={{ sprint: sprint._id, space: sprint.space }} space={sprint.space} label={sprint.label}>
+<IssuesView
+  query={{ milestone: milestone._id, space: milestone.space }}
+  space={milestone.space}
+  label={milestone.label}
+>
   <svelte:fragment slot="label_selector">
     <div bind:this={container}>
-      <Button size={'small'} kind={'link'} on:click={selectSprint}>
+      <Button size={'small'} kind={'link'} on:click={selectMilestone}>
         <svelte:fragment slot="content">
-          <div class="ac-header__icon"><Icon icon={tracker.icon.Sprint} size={'small'} /></div>
-          <span class="ac-header__title mr-1">{sprint.label}</span>
+          <div class="ac-header__icon"><Icon icon={tracker.icon.Milestone} size={'small'} /></div>
+          <span class="ac-header__title mr-1">{milestone.label}</span>
           <Icon icon={Expanded} size={'small'} />
         </svelte:fragment>
       </Button>
     </div>
   </svelte:fragment>
   <svelte:fragment slot="afterHeader">
-    {@const now = Date.now()}
     <div class="p-1 ml-6 flex-row-center">
       <div class="flex-row-center">
-        <DatePresenter value={sprint.startDate} kind={'transparent'} />
-        <span class="p-1"> / </span><DatePresenter value={sprint.targetDate} kind={'transparent'} />
+        <DatePresenter value={milestone.targetDate} kind={'transparent'} />
       </div>
       <div class="flex-row-center ml-2">
-        <!-- Active sprint in time -->
-        <Label
-          label={tracker.string.SprintPassed}
-          params={{
-            from:
-              now < sprint.startDate
-                ? 0
-                : now > sprint.targetDate
-                ? getDayOfSprint(sprint.startDate, sprint.targetDate)
-                : getDayOfSprint(sprint.startDate, now),
-            to: getDayOfSprint(sprint.startDate, sprint.targetDate)
-          }}
-        />
-        {#if sprint?.capacity}
-          <Label label={tracker.string.CapacityValue} params={{ value: sprint?.capacity }} />
+        {#if milestone?.capacity}
+          <Label label={tracker.string.CapacityValue} params={{ value: milestone?.capacity }} />
         {/if}
         <Button icon={IconMoreH} kind={'transparent'} size={'medium'} on:click={showMenu} />
       </div>
@@ -88,18 +76,18 @@
   <svelte:fragment slot="aside">
     <div class="flex-grow p-4 w-60 left-divider">
       <div class="fs-title text-xl">
-        <EditBox bind:value={sprint.label} on:change={() => change('label', sprint.label)} />
+        <EditBox bind:value={milestone.label} on:change={() => change('label', milestone.label)} />
       </div>
       <div class="mt-2">
         <StyledTextBox
           alwaysEdit={true}
           showButtons={false}
           placeholder={tracker.string.Description}
-          content={sprint.description ?? ''}
+          content={milestone.description ?? ''}
           on:value={(evt) => change('description', evt.detail)}
         />
       </div>
-      <DocAttributeBar object={sprint} mixins={[]} ignoreKeys={['icon', 'label', 'description']} />
+      <DocAttributeBar object={milestone} mixins={[]} ignoreKeys={['icon', 'label', 'description']} />
     </div>
   </svelte:fragment>
 </IssuesView>
diff --git a/plugins/tracker-resources/src/components/sprints/IssueStatistics.svelte b/plugins/tracker-resources/src/components/milestones/IssueStatistics.svelte
similarity index 96%
rename from plugins/tracker-resources/src/components/sprints/IssueStatistics.svelte
rename to plugins/tracker-resources/src/components/milestones/IssueStatistics.svelte
index c1395d95e4..a35f4c3d01 100644
--- a/plugins/tracker-resources/src/components/sprints/IssueStatistics.svelte
+++ b/plugins/tracker-resources/src/components/milestones/IssueStatistics.svelte
@@ -82,9 +82,9 @@
   )
 </script>
 
-{#if docs && (category === 'sprint' || category === 'assignee')}
+{#if docs && (category === 'milestone' || category === 'assignee')}
   <FixedColumn key="estimation-editor">
-    <!-- <Label label={tracker.string.SprintDay} value={}/> -->
+    <!-- <Label label={tracker.string.MilestoneDay} value={}/> -->
     <div class="flex-row-center flex-no-shrink h-6" class:showWarning={totalEstimation > (capacity ?? 0)}>
       <EstimationProgressCircle value={totalReported} max={totalEstimation} />
       <div class="w-2 min-w-2" />
diff --git a/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneBrowser.svelte
similarity index 73%
rename from plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneBrowser.svelte
index bc3eb89fa2..4bdfbfd36a 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneBrowser.svelte
@@ -16,7 +16,7 @@
   import { DocumentQuery, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import {
     Button,
     IconAdd,
@@ -40,42 +40,42 @@
   } from '@hcengineering/view-resources'
   import { onDestroy } from 'svelte'
   import tracker from '../../plugin'
-  import { SprintViewMode, getIncludedSprintStatuses, sprintTitleMap } from '../../utils'
-  import NewSprint from './NewSprint.svelte'
-  import SprintContent from './SprintContent.svelte'
+  import { MilestoneViewMode, getIncludedMilestoneStatuses, milestoneTitleMap } from '../../utils'
+  import NewMilestone from './NewMilestone.svelte'
+  import MilestoneContent from './MilestoneContent.svelte'
 
   export let label: IntlString
-  export let query: DocumentQuery<Sprint> = {}
+  export let query: DocumentQuery<Milestone> = {}
   export let search: string = ''
-  export let mode: SprintViewMode = 'all'
+  export let mode: MilestoneViewMode = 'all'
 
   const space = typeof query.space === 'string' ? query.space : tracker.project.DefaultProject
   const showCreateDialog = async () => {
-    showPopup(NewSprint, { space, targetElement: null }, 'top')
+    showPopup(NewMilestone, { space, targetElement: null }, 'top')
   }
 
   export let panelWidth: number = 0
 
   let viewlet: WithLookup<Viewlet> | undefined = undefined
 
-  let searchQuery: DocumentQuery<Sprint> = { ...query }
+  let searchQuery: DocumentQuery<Milestone> = { ...query }
   function updateSearchQuery (search: string): void {
     searchQuery = search === '' ? { ...query } : { ...query, $search: search }
   }
   $: if (query) updateSearchQuery(search)
 
-  $: includedSprintStatuses = getIncludedSprintStatuses(mode)
-  $: title = sprintTitleMap[mode]
-  $: includedSprintsQuery = { status: { $in: includedSprintStatuses } }
+  $: includedMilestoneStatuses = getIncludedMilestoneStatuses(mode)
+  $: title = milestoneTitleMap[mode]
+  $: includedMilestonesQuery = { status: { $in: includedMilestoneStatuses } }
 
-  let resultQuery: DocumentQuery<Sprint> = { ...searchQuery }
+  let resultQuery: DocumentQuery<Milestone> = { ...searchQuery }
 
   let viewlets: WithLookup<Viewlet>[] | undefined
 
   $: viewlet = viewlets && updateActiveViewlet(viewlets, active)
 
   const viewletQuery = createQuery()
-  viewletQuery.query(view.class.Viewlet, { attachTo: tracker.class.Sprint }, (res) => (viewlets = res), {
+  viewletQuery.query(view.class.Viewlet, { attachTo: tracker.class.Milestone }, (res) => (viewlets = res), {
     lookup: {
       descriptor: view.class.ViewletDescriptor
     }
@@ -105,7 +105,7 @@
 
   $: viewOptions = getViewOptions(viewlet, $viewOptionStore)
 
-  const handleViewModeChanged = (newMode: SprintViewMode) => {
+  const handleViewModeChanged = (newMode: MilestoneViewMode) => {
     if (newMode === undefined || newMode === mode) {
       return
     }
@@ -114,10 +114,10 @@
   }
 
   const modeList: TabItem[] = [
-    { id: 'all', labelIntl: tracker.string.AllSprints, action: () => handleViewModeChanged('all') },
-    { id: 'planned', labelIntl: tracker.string.PlannedSprints, action: () => handleViewModeChanged('planned') },
-    { id: 'active', labelIntl: tracker.string.ActiveSprints, action: () => handleViewModeChanged('active') },
-    { id: 'closed', labelIntl: tracker.string.ClosedSprints, action: () => handleViewModeChanged('closed') }
+    { id: 'all', labelIntl: tracker.string.AllMilestones, action: () => handleViewModeChanged('all') },
+    { id: 'planned', labelIntl: tracker.string.PlannedMilestones, action: () => handleViewModeChanged('planned') },
+    { id: 'active', labelIntl: tracker.string.ActiveMilestones, action: () => handleViewModeChanged('active') },
+    { id: 'closed', labelIntl: tracker.string.ClosedMilestones, action: () => handleViewModeChanged('closed') }
   ]
 </script>
 
@@ -130,7 +130,7 @@
   </div>
 
   <div class="ac-header-full medium-gap mb-1">
-    <Button icon={IconAdd} label={tracker.string.Sprint} kind={'primary'} on:click={showCreateDialog} />
+    <Button icon={IconAdd} label={tracker.string.Milestone} kind={'primary'} on:click={showCreateDialog} />
   </div>
 </div>
 <div class="ac-header full divide search-start">
@@ -161,7 +161,7 @@
 </div>
 
 <FilterBar
-  _class={tracker.class.Sprint}
+  _class={tracker.class.Milestone}
   query={searchQuery}
   {viewOptions}
   on:change={(e) => (resultQuery = e.detail)}
@@ -169,7 +169,7 @@
 
 <div class="flex w-full h-full clear-mins">
   {#if viewlet}
-    <SprintContent {viewlet} query={{ ...resultQuery, ...includedSprintsQuery }} {space} {viewOptions} />
+    <MilestoneContent {viewlet} query={{ ...resultQuery, ...includedMilestonesQuery }} {space} {viewOptions} />
   {/if}
   {#if $$slots.aside !== undefined && asideShown}
     <div class="popupPanel-body__aside flex" class:float={asideFloat} class:shown={asideShown}>
diff --git a/plugins/tracker-resources/src/components/sprints/SprintContent.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
similarity index 77%
rename from plugins/tracker-resources/src/components/sprints/SprintContent.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
index f8122b1c33..b5a11b1dec 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintContent.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
@@ -1,23 +1,23 @@
 <script lang="ts">
   import contact from '@hcengineering/contact'
   import { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { Component } from '@hcengineering/ui'
   import { BuildModelKey, Viewlet, ViewOptions } from '@hcengineering/view'
   import tracker from '../../plugin'
-  import NewSprint from './NewSprint.svelte'
+  import NewMilestone from './NewMilestone.svelte'
 
   export let viewlet: WithLookup<Viewlet>
-  export let query: DocumentQuery<Sprint> = {}
+  export let query: DocumentQuery<Milestone> = {}
   export let space: Ref<Space> | undefined
 
   // Extra properties
   export let viewOptions: ViewOptions
 
-  const createItemDialog = NewSprint
-  const createItemLabel = tracker.string.CreateSprint
+  const createItemDialog = NewMilestone
+  const createItemLabel = tracker.string.CreateMilestone
 
-  const retrieveMembers = (s: Sprint) => s.members
+  const retrieveMembers = (s: Milestone) => s.members
 
   function updateConfig (config: (string | BuildModelKey)[]): (string | BuildModelKey)[] {
     return config.map((it) => {
@@ -35,7 +35,7 @@
   <Component
     is={viewlet.$lookup.descriptor.component}
     props={{
-      _class: tracker.class.Sprint,
+      _class: tracker.class.Milestone,
       config: updateConfig(viewlet.config),
       options: viewlet.options,
       createItemDialog,
diff --git a/plugins/tracker-resources/src/components/sprints/SprintDatePresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneDatePresenter.svelte
similarity index 94%
rename from plugins/tracker-resources/src/components/sprints/SprintDatePresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneDatePresenter.svelte
index 9368336ad5..e0a126721c 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintDatePresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneDatePresenter.svelte
@@ -16,10 +16,10 @@
   import { Timestamp } from '@hcengineering/core'
 
   import { getClient } from '@hcengineering/presentation'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { DatePresenter } from '@hcengineering/ui'
 
-  export let value: Sprint
+  export let value: Milestone
   export let field = 'targetDate'
   export let kind: 'transparent' | 'primary' | 'link' | 'list' = 'primary'
 
diff --git a/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneEditor.svelte
similarity index 60%
rename from plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneEditor.svelte
index dc5192b17f..d1a194cea8 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneEditor.svelte
@@ -16,7 +16,7 @@
   import { Ref } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import { Issue, IssueTemplate, Sprint } from '@hcengineering/tracker'
+  import { Issue, IssueTemplate, Milestone } from '@hcengineering/tracker'
   import {
     ButtonKind,
     ButtonShape,
@@ -24,17 +24,15 @@
     DatePresenter,
     deviceOptionsStore as deviceInfo
   } from '@hcengineering/ui'
-  import { activeSprint } from '../../issues'
+  import { activeMilestone } from '../../issues'
   import tracker from '../../plugin'
-  import { getDayOfSprint } from '../../utils'
-  import TimePresenter from '../issues/timereport/TimePresenter.svelte'
-  import SprintSelector from './SprintSelector.svelte'
+  import MilestoneSelector from './MilestoneSelector.svelte'
   import { createEventDispatcher } from 'svelte'
 
   export let value: Issue | IssueTemplate
   export let isEditable: boolean = true
   export let shouldShowLabel: boolean = true
-  export let popupPlaceholder: IntlString = tracker.string.MoveToSprint
+  export let popupPlaceholder: IntlString = tracker.string.MoveToMilestone
   export let shouldShowPlaceholder = true
   export let size: ButtonSize = 'large'
   export let kind: ButtonKind = 'link'
@@ -51,27 +49,27 @@
   const client = getClient()
   const dispatch = createEventDispatcher()
 
-  const handleSprintIdChanged = async (newSprintId: Ref<Sprint> | null | undefined) => {
-    if (!isEditable || newSprintId === undefined || value.sprint === newSprintId) {
+  const handleMilestoneIdChanged = async (newMilestoneId: Ref<Milestone> | null | undefined) => {
+    if (!isEditable || newMilestoneId === undefined || value.milestone === newMilestoneId) {
       return
     }
     if (Array.isArray(value)) {
       await Promise.all(
         value.map(async (p) => {
-          await client.update(p, { sprint: newSprintId })
+          await client.update(p, { milestone: newMilestoneId })
         })
       )
     } else {
-      await client.update(value, { sprint: newSprintId })
+      await client.update(value, { milestone: newMilestoneId })
     }
     if (isAction) dispatch('close')
   }
 
-  const sprintQuery = createQuery()
-  let sprint: Sprint | undefined
-  $: if (value.sprint) {
-    sprintQuery.query(tracker.class.Sprint, { _id: value.sprint }, (res) => {
-      sprint = res.shift()
+  const milestoneQuery = createQuery()
+  let milestone: Milestone | undefined
+  $: if (value.milestone) {
+    milestoneQuery.query(tracker.class.Milestone, { _id: value.milestone }, (res) => {
+      milestone = res.shift()
     })
   }
 
@@ -79,9 +77,9 @@
 </script>
 
 {#if kind === 'list'}
-  {#if value.sprint}
+  {#if value.milestone}
     <div class="clear-mins" class:label-wrapper={compression}>
-      <SprintSelector
+      <MilestoneSelector
         {kind}
         {size}
         {shape}
@@ -93,9 +91,9 @@
         {onlyIcon}
         {enlargedText}
         short={compression}
-        showTooltip={{ label: value.sprint ? tracker.string.MoveToSprint : tracker.string.AddToSprint }}
-        value={value.sprint}
-        onChange={handleSprintIdChanged}
+        showTooltip={{ label: value.milestone ? tracker.string.MoveToMilestone : tracker.string.AddToMilestone }}
+        value={value.milestone}
+        onChange={handleMilestoneIdChanged}
         {isAction}
       />
     </div>
@@ -107,9 +105,9 @@
     class:label-wrapper={compression}
     style:flex-direction={twoRows ? 'column' : 'row'}
   >
-    {#if (value.sprint && value.sprint !== $activeSprint && groupBy !== 'sprint') || shouldShowPlaceholder}
+    {#if (value.milestone && value.milestone !== $activeMilestone && groupBy !== 'milestone') || shouldShowPlaceholder}
       <div class="flex-row-center" class:minus-margin-vSpace={kind === 'list-header'} class:compression style:width>
-        <SprintSelector
+        <MilestoneSelector
           {kind}
           {size}
           {shape}
@@ -120,33 +118,18 @@
           {popupPlaceholder}
           {onlyIcon}
           {enlargedText}
-          showTooltip={{ label: value.sprint ? tracker.string.MoveToSprint : tracker.string.AddToSprint }}
-          value={value.sprint}
-          onChange={handleSprintIdChanged}
+          showTooltip={{ label: value.milestone ? tracker.string.MoveToMilestone : tracker.string.AddToMilestone }}
+          value={value.milestone}
+          onChange={handleMilestoneIdChanged}
           {isAction}
         />
       </div>
     {/if}
 
-    {#if sprint && kind === 'list-header'}
+    {#if milestone && kind === 'list-header'}
       <div class="flex-row-center" class:minus-margin-space={kind === 'list-header'} class:text-sm={twoRows}>
-        {#if sprint}
-          {@const now = Date.now()}
-          {@const sprintDaysFrom =
-            now < sprint.startDate
-              ? 0
-              : now > sprint.targetDate
-              ? getDayOfSprint(sprint.startDate, sprint.targetDate)
-              : getDayOfSprint(sprint.startDate, now)}
-          {@const sprintDaysTo = getDayOfSprint(sprint.startDate, sprint.targetDate)}
-          <DatePresenter value={sprint.startDate} kind={'transparent'} />
-          <span class="p-1"> / </span>
-          <DatePresenter value={sprint.targetDate} kind={'transparent'} />
-          <div class="w-2 min-w-2" />
-          <!-- Active sprint in time -->
-          <TimePresenter value={sprintDaysFrom} />
-          /
-          <TimePresenter value={sprintDaysTo} />
+        {#if milestone}
+          <DatePresenter value={milestone.targetDate} kind={'transparent'} />
         {/if}
       </div>
     {/if}
diff --git a/plugins/tracker-resources/src/components/sprints/SprintFilter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
similarity index 80%
rename from plugins/tracker-resources/src/components/sprints/SprintFilter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
index f45c0911b7..f175652f81 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintFilter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
@@ -16,14 +16,14 @@
   import { DocumentQuery, FindResult, Ref, SortingOrder } from '@hcengineering/core'
   import { translate } from '@hcengineering/platform'
   import presentation, { getClient } from '@hcengineering/presentation'
-  import { Project, Sprint, SprintStatus } from '@hcengineering/tracker'
+  import { Project, Milestone, MilestoneStatus } from '@hcengineering/tracker'
   import ui, { CheckBox, Icon, Label, Loading, deviceOptionsStore, resizeObserver } from '@hcengineering/ui'
   import { FILTER_DEBOUNCE_MS, sortFilterValues } from '@hcengineering/view-resources'
   import view, { Filter } from '@hcengineering/view'
   import { createEventDispatcher, onMount } from 'svelte'
   import tracker from '../../plugin'
-  import { sprintStatusAssets } from '../../types'
-  import SprintTitlePresenter from './SprintTitlePresenter.svelte'
+  import { milestoneStatusAssets } from '../../types'
+  import MilestoneTitlePresenter from './MilestoneTitlePresenter.svelte'
 
   export let space: Ref<Project> | undefined = undefined
   export let filter: Filter
@@ -40,9 +40,9 @@
     phTraslate = res
   })
 
-  let values: Sprint[] = []
-  let objectsPromise: Promise<FindResult<Sprint>> | undefined = undefined
-  let selectedValues: Set<Ref<Sprint> | undefined | null> = new Set()
+  let values: Milestone[] = []
+  let objectsPromise: Promise<FindResult<Milestone>> | undefined = undefined
+  let selectedValues: Set<Ref<Milestone> | undefined | null> = new Set()
 
   let filterUpdateTimeout: number | undefined
 
@@ -53,15 +53,15 @@
     }
     values = []
     selectedValues.clear()
-    const spaceQuery: DocumentQuery<Sprint> = space ? { space } : {}
-    const resultQuery: DocumentQuery<Sprint> =
+    const spaceQuery: DocumentQuery<Milestone> = space ? { space } : {}
+    const resultQuery: DocumentQuery<Milestone> =
       search !== ''
         ? {
             label: { $like: '%' + search + '%' }
           }
         : {}
     objectsPromise = client.findAll(
-      tracker.class.Sprint,
+      tracker.class.Milestone,
       { ...resultQuery, ...spaceQuery },
       {
         sort: { label: SortingOrder.Ascending }
@@ -77,11 +77,11 @@
     objectsPromise = undefined
   }
 
-  function isSelected (value: Ref<Sprint> | undefined, values: Set<Ref<Sprint> | undefined | null>): boolean {
+  function isSelected (value: Ref<Milestone> | undefined, values: Set<Ref<Milestone> | undefined | null>): boolean {
     return values.has(value)
   }
 
-  function handleFilterToggle (value: Ref<Sprint> | undefined): void {
+  function handleFilterToggle (value: Ref<Milestone> | undefined): void {
     if (isSelected(value, selectedValues)) {
       selectedValues.delete(value)
     } else {
@@ -92,7 +92,7 @@
     updateFilter(selectedValues)
   }
 
-  function updateFilter (newValues: Set<Ref<Sprint> | null | undefined>) {
+  function updateFilter (newValues: Set<Ref<Milestone> | null | undefined>) {
     clearTimeout(filterUpdateTimeout)
 
     filterUpdateTimeout = setTimeout(() => {
@@ -101,12 +101,12 @@
     }, FILTER_DEBOUNCE_MS)
   }
 
-  function getStatusItem (status: SprintStatus, docs: Sprint[]): Sprint[] {
+  function getStatusItem (status: MilestoneStatus, docs: Milestone[]): Milestone[] {
     return docs.filter((p) => p.status === status)
   }
 
-  function getStatuses (): SprintStatus[] {
-    const res = Array.from(Object.values(SprintStatus).filter((v) => !isNaN(Number(v)))) as SprintStatus[]
+  function getStatuses (): MilestoneStatus[] {
+    const res = Array.from(Object.values(MilestoneStatus).filter((v) => !isNaN(Number(v)))) as MilestoneStatus[]
     return res
   }
 
@@ -148,7 +148,7 @@
           </div>
         </button>
         {#each getStatuses() as group}
-          {@const status = sprintStatusAssets[group]}
+          {@const status = milestoneStatusAssets[group]}
           {@const items = getStatusItem(group, values)}
           {#if items.length > 0}
             <div class="flex-row-center p-1">
@@ -168,7 +168,7 @@
                   <div class="check pointer-events-none">
                     <CheckBox checked={isSelected(doc._id, selectedValues)} primary />
                   </div>
-                  <SprintTitlePresenter value={doc} />
+                  <MilestoneTitlePresenter value={doc} />
                 </div>
               </button>
             {/each}
diff --git a/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneLeadPresenter.svelte
similarity index 97%
rename from plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneLeadPresenter.svelte
index b7498836c0..9271b9f5f6 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneLeadPresenter.svelte
@@ -18,7 +18,7 @@
   import { IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import { UsersPopup } from '@hcengineering/contact-resources'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { eventToHTMLElement, IconSize, showPopup } from '@hcengineering/ui'
   import { AttributeModel } from '@hcengineering/view'
   import { getObjectPresenter } from '@hcengineering/view-resources'
@@ -27,7 +27,7 @@
 
   export let value: Employee | null
   export let size: IconSize = 'x-small'
-  export let object: Sprint
+  export let object: Milestone
   export let defaultClass: Ref<Class<Doc>> | undefined = undefined
   export let isEditable: boolean = true
   export let shouldShowLabel: boolean = false
diff --git a/plugins/tracker-resources/src/components/sprints/SprintPopup.svelte b/plugins/tracker-resources/src/components/milestones/MilestonePopup.svelte
similarity index 64%
rename from plugins/tracker-resources/src/components/sprints/SprintPopup.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestonePopup.svelte
index b29846f2f0..2c8cd27554 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintPopup.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestonePopup.svelte
@@ -15,36 +15,36 @@
 <script lang="ts">
   import type { Class, Doc, DocumentQuery, Ref } from '@hcengineering/core'
   import { ObjectCreate, ObjectPopup } from '@hcengineering/presentation'
-  import { Sprint, SprintStatus } from '@hcengineering/tracker'
+  import { Milestone, MilestoneStatus } from '@hcengineering/tracker'
   import { Icon, Label } from '@hcengineering/ui'
-  import { sprintStatusAssets } from '../../utils'
-  import SprintTitlePresenter from './SprintTitlePresenter.svelte'
-  export let _class: Ref<Class<Sprint>>
-  export let selected: Ref<Sprint> | undefined = undefined
-  export let sprintQuery: DocumentQuery<Sprint> = {}
+  import { milestoneStatusAssets } from '../../utils'
+  import MilestoneTitlePresenter from './MilestoneTitlePresenter.svelte'
+  export let _class: Ref<Class<Milestone>>
+  export let selected: Ref<Milestone> | undefined = undefined
+  export let milestoneQuery: DocumentQuery<Milestone> = {}
   export let create: ObjectCreate | undefined = undefined
   export let allowDeselect = false
   export let closeAfterSelect: boolean = true
   export let shadows = true
   export let width: 'medium' | 'large' | 'full' = 'medium'
-  export let ignoreSprints: Sprint[] | undefined = undefined
+  export let ignoreMilestones: Milestone[] | undefined = undefined
 
-  $: ignoreObjects = ignoreSprints?.filter((s) => '_id' in s).map((s) => s._id)
+  $: ignoreObjects = ignoreMilestones?.filter((s) => '_id' in s).map((s) => s._id)
   $: _create =
     create !== undefined
       ? {
           ...create,
-          update: (doc: Doc) => (doc as Sprint).label
+          update: (doc: Doc) => (doc as Milestone).label
         }
       : undefined
-  const getStatus = (sprint: Sprint): SprintStatus => sprint.status
+  const getStatus = (milestone: Milestone): MilestoneStatus => milestone.status
 </script>
 
 <ObjectPopup
   {_class}
   {selected}
   {ignoreObjects}
-  bind:docQuery={sprintQuery}
+  bind:docQuery={milestoneQuery}
   searchField={'label'}
   multiSelect={false}
   {allowDeselect}
@@ -56,12 +56,12 @@
   on:close
   groupBy={'status'}
 >
-  <svelte:fragment slot="item" let:item={sprint}>
-    <SprintTitlePresenter value={sprint} />
+  <svelte:fragment slot="item" let:item={milestone}>
+    <MilestoneTitlePresenter value={milestone} />
   </svelte:fragment>
 
-  <svelte:fragment slot="category" let:item={sprint}>
-    {@const status = sprintStatusAssets[getStatus(sprint)]}
+  <svelte:fragment slot="category" let:item={milestone}>
+    {@const status = milestoneStatusAssets[getStatus(milestone)]}
     {#if status}
       <div class="flex-row-center p-1">
         <Icon icon={status.icon} size={'small'} />
diff --git a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
similarity index 82%
rename from plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
index e4481831b8..1e775085fc 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
@@ -14,17 +14,17 @@
 -->
 <script lang="ts">
   import { WithLookup } from '@hcengineering/core'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { Icon, getCurrentResolvedLocation, navigate, tooltip } from '@hcengineering/ui'
   import tracker from '../../plugin'
 
-  export let value: WithLookup<Sprint>
+  export let value: WithLookup<Milestone>
   export let shouldShowAvatar: boolean = true
   export let onClick: (() => void) | undefined = undefined
   export let disabled = false
   export let inline: boolean = false
 
-  function navigateToSprint () {
+  function navigateToMilestone () {
     if (disabled) {
       return
     }
@@ -33,7 +33,7 @@
     }
 
     const loc = getCurrentResolvedLocation()
-    loc.path[4] = 'sprints'
+    loc.path[4] = 'milestones'
     loc.path[5] = value._id
     loc.path.length = 6
     loc.fragment = undefined
@@ -43,10 +43,10 @@
 
 {#if value}
   <!-- svelte-ignore a11y-click-events-have-key-events -->
-  <div class="flex-presenter" class:inline-presenter={inline} on:click={navigateToSprint}>
+  <div class="flex-presenter" class:inline-presenter={inline} on:click={navigateToMilestone}>
     {#if !inline && shouldShowAvatar}
-      <div class="icon" use:tooltip={{ label: tracker.string.Sprint }}>
-        <Icon icon={tracker.icon.Sprint} size={'small'} />
+      <div class="icon" use:tooltip={{ label: tracker.string.Milestone }}>
+        <Icon icon={tracker.icon.Milestone} size={'small'} />
       </div>
     {/if}
     <span title={value.label} class="label nowrap">
diff --git a/plugins/tracker-resources/src/components/sprints/SprintRefPresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneRefPresenter.svelte
similarity index 51%
rename from plugins/tracker-resources/src/components/sprints/SprintRefPresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneRefPresenter.svelte
index a793c27922..0f80894568 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintRefPresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneRefPresenter.svelte
@@ -15,20 +15,18 @@
 <script lang="ts">
   import { Ref } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { ButtonKind, DatePresenter, deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
   import tracker from '../../plugin'
-  import { getDayOfSprint } from '../../utils'
-  import TimePresenter from '../issues/timereport/TimePresenter.svelte'
-  import SprintSelector from './SprintSelector.svelte'
+  import MilestoneSelector from './MilestoneSelector.svelte'
 
-  export let value: Ref<Sprint>
+  export let value: Ref<Milestone>
   export let kind: ButtonKind = 'link'
 
-  const sprintQuery = createQuery()
-  let sprint: Sprint | undefined
-  $: sprintQuery.query(tracker.class.Sprint, { _id: value }, (res) => {
-    ;[sprint] = res
+  const milestoneQuery = createQuery()
+  let milestone: Milestone | undefined
+  $: milestoneQuery.query(tracker.class.Milestone, { _id: value }, (res) => {
+    ;[milestone] = res
   })
 
   $: twoRows = $deviceInfo.twoRows
@@ -40,28 +38,13 @@
   style:flex-direction={twoRows ? 'column' : 'row'}
 >
   <div class="flex-row-center" class:minus-margin-vSpace={kind === 'list-header'}>
-    <SprintSelector {kind} isEditable={false} enlargedText {value} />
+    <MilestoneSelector {kind} isEditable={false} enlargedText {value} />
   </div>
 
-  {#if sprint && kind === 'list-header'}
+  {#if milestone && kind === 'list-header'}
     <div class="flex-row-center" class:minus-margin-space={kind === 'list-header'} class:text-sm={twoRows}>
-      {#if sprint}
-        {@const now = Date.now()}
-        {@const sprintDaysFrom =
-          now < sprint.startDate
-            ? 0
-            : now > sprint.targetDate
-            ? getDayOfSprint(sprint.startDate, sprint.targetDate)
-            : getDayOfSprint(sprint.startDate, now)}
-        {@const sprintDaysTo = getDayOfSprint(sprint.startDate, sprint.targetDate)}
-        <DatePresenter value={sprint.startDate} kind={'transparent'} />
-        <span class="p-1"> / </span>
-        <DatePresenter value={sprint.targetDate} kind={'transparent'} />
-        <div class="w-2 min-w-2" />
-        <!-- Active sprint in time -->
-        <TimePresenter value={sprintDaysFrom} />
-        /
-        <TimePresenter value={sprintDaysTo} />
+      {#if milestone}
+        <DatePresenter value={milestone.targetDate} kind={'transparent'} />
       {/if}
     </div>
   {/if}
diff --git a/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneSelector.svelte
similarity index 60%
rename from plugins/tracker-resources/src/components/sprints/SprintSelector.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneSelector.svelte
index b4f177b271..6059101c47 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneSelector.svelte
@@ -16,17 +16,17 @@
   import { Ref, SortingOrder } from '@hcengineering/core'
   import { getEmbeddedLabel, IntlString, translate } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
-  import { Component, Sprint } from '@hcengineering/tracker'
+  import { Component, Milestone } from '@hcengineering/tracker'
   import type { ButtonKind, ButtonSize, LabelAndProps } from '@hcengineering/ui'
   import { Button, ButtonShape, eventToHTMLElement, SelectPopup, showPopup, Label } from '@hcengineering/ui'
   import tracker from '../../plugin'
-  import { sprintStatusAssets } from '../../types'
+  import { milestoneStatusAssets } from '../../types'
 
-  export let value: Ref<Sprint> | null | undefined
+  export let value: Ref<Milestone> | null | undefined
   export let shouldShowLabel: boolean = true
   export let isEditable: boolean = true
-  export let onChange: ((newSprintId: Ref<Sprint> | undefined) => void) | undefined = undefined
-  export let popupPlaceholder: IntlString = tracker.string.AddToSprint
+  export let onChange: ((newMilestoneId: Ref<Milestone> | undefined) => void) | undefined = undefined
+  export let popupPlaceholder: IntlString = tracker.string.AddToMilestone
   export let kind: ButtonKind = 'no-border'
   export let size: ButtonSize = 'small'
   export let shape: ButtonShape = undefined
@@ -41,69 +41,72 @@
   export let useComponent: Ref<Component> | undefined = undefined
   export let showTooltip: LabelAndProps | undefined = undefined
 
-  let selectedSprint: Sprint | undefined
-  let defaultSprintLabel = ''
+  let selectedMilestone: Milestone | undefined
+  let defaultMilestoneLabel = ''
 
   const query = createQuery()
-  let rawSprints: Sprint[] = []
+  let rawMilestones: Milestone[] = []
   query.query(
-    tracker.class.Sprint,
+    tracker.class.Milestone,
     useComponent ? { component: useComponent } : {},
     (res) => {
-      rawSprints = res
+      rawMilestones = res
     },
     {
-      sort: { startDate: SortingOrder.Descending }
+      sort: { targetDate: SortingOrder.Descending }
     }
   )
 
-  $: handleSelectedSprintIdUpdated(value, rawSprints)
+  $: handleSelectedMilestoneIdUpdated(value, rawMilestones)
 
-  $: translate(tracker.string.NoSprint, {}).then((result) => (defaultSprintLabel = result))
-  const sprintIcon = tracker.icon.Sprint
-  $: sprintText = shouldShowLabel ? selectedSprint?.label ?? defaultSprintLabel : undefined
+  $: translate(tracker.string.NoMilestone, {}).then((result) => (defaultMilestoneLabel = result))
+  const milestoneIcon = tracker.icon.Milestone
+  $: milestoneText = shouldShowLabel ? selectedMilestone?.label ?? defaultMilestoneLabel : undefined
 
-  const handleSelectedSprintIdUpdated = async (newSprintId: Ref<Sprint> | null | undefined, sprints: Sprint[]) => {
-    if (newSprintId === null || newSprintId === undefined) {
-      selectedSprint = undefined
+  const handleSelectedMilestoneIdUpdated = async (
+    newMilestoneId: Ref<Milestone> | null | undefined,
+    milestones: Milestone[]
+  ) => {
+    if (newMilestoneId === null || newMilestoneId === undefined) {
+      selectedMilestone = undefined
 
       return
     }
 
-    selectedSprint = sprints.find((it) => it._id === newSprintId)
+    selectedMilestone = milestones.find((it) => it._id === newMilestoneId)
   }
 
-  const getSprintInfo = (rawSprints: Sprint[], sp: Sprint | undefined) => {
+  const getMilestoneInfo = (rawMilestones: Milestone[], sp: Milestone | undefined) => {
     return [
       {
         id: null,
-        icon: tracker.icon.Sprint,
-        label: tracker.string.NoSprint,
+        icon: tracker.icon.Milestone,
+        label: tracker.string.NoMilestone,
         isSelected: sp === undefined
       },
-      ...rawSprints.map((p) => ({
+      ...rawMilestones.map((p) => ({
         id: p._id,
-        icon: tracker.icon.Sprint,
+        icon: tracker.icon.Milestone,
         text: p.label,
         isSelected: sp ? p._id === sp._id : false,
-        category: sprintStatusAssets[p.status]
+        category: milestoneStatusAssets[p.status]
       }))
     ]
   }
 
-  $: sprints = getSprintInfo(rawSprints, selectedSprint)
+  $: milestones = getMilestoneInfo(rawMilestones, selectedMilestone)
 
-  const handleSprintEditorOpened = async (event: MouseEvent): Promise<void> => {
+  const handleMilestoneEditorOpened = async (event: MouseEvent): Promise<void> => {
     event.stopPropagation()
     if (!isEditable) {
       return
     }
 
-    const sprintInfo = sprints
+    const milestoneInfo = milestones
 
     showPopup(
       SelectPopup,
-      { value: sprintInfo, placeholder: popupPlaceholder, searchable: true },
+      { value: milestoneInfo, placeholder: popupPlaceholder, searchable: true },
       eventToHTMLElement(event),
       onChange
     )
@@ -112,14 +115,14 @@
 
 {#if isAction}
   <SelectPopup
-    value={sprints}
+    value={milestones}
     placeholder={popupPlaceholder}
     searchable
     on:close={(evt) => {
       if (onChange !== undefined) onChange(evt.detail)
     }}
   />
-{:else if onlyIcon || sprintText === undefined}
+{:else if onlyIcon || milestoneText === undefined}
   <Button
     {focusIndex}
     {kind}
@@ -128,10 +131,10 @@
     {width}
     {justify}
     {showTooltip}
-    icon={sprintIcon}
+    icon={milestoneIcon}
     disabled={!isEditable}
     {short}
-    on:click={handleSprintEditorOpened}
+    on:click={handleMilestoneEditorOpened}
   />
 {:else}
   <Button
@@ -142,15 +145,15 @@
     {width}
     {justify}
     {showTooltip}
-    icon={sprintIcon}
+    icon={milestoneIcon}
     disabled={!isEditable}
     notSelected={!value}
     {short}
-    on:click={handleSprintEditorOpened}
+    on:click={handleMilestoneEditorOpened}
   >
     <svelte:fragment slot="content">
       <span class="label {enlargedText ? 'text-base' : 'text-md'} overflow-label pointer-events-none">
-        <Label label={getEmbeddedLabel(sprintText)} />
+        <Label label={getEmbeddedLabel(milestoneText)} />
       </span>
     </svelte:fragment>
   </Button>
diff --git a/plugins/tracker-resources/src/components/sprints/SprintStatusPresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneStatusPresenter.svelte
similarity index 66%
rename from plugins/tracker-resources/src/components/sprints/SprintStatusPresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneStatusPresenter.svelte
index 1420fe1dca..d772124782 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintStatusPresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneStatusPresenter.svelte
@@ -13,37 +13,37 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { SprintStatus } from '@hcengineering/tracker'
+  import { MilestoneStatus } from '@hcengineering/tracker'
   import type { ButtonKind, ButtonSize } from '@hcengineering/ui'
   import tracker from '../../plugin'
 
-  import SprintStatusSelector from './SprintStatusSelector.svelte'
+  import MilestoneStatusSelector from './MilestoneStatusSelector.svelte'
 
-  export let value: SprintStatus
-  export let onChange: ((value: SprintStatus) => void) | undefined = undefined
+  export let value: MilestoneStatus
+  export let onChange: ((value: MilestoneStatus) => void) | undefined = undefined
   export let kind: ButtonKind = 'link'
   export let size: ButtonSize = 'large'
   export let justify: 'left' | 'center' = 'left'
   export let width: string | undefined = '100%'
 
-  function handleComponentStatusChange (newSprintStatus: SprintStatus | undefined) {
-    if (newSprintStatus === undefined || onChange === undefined) {
+  function handleComponentStatusChange (newMilestoneStatus: MilestoneStatus | undefined) {
+    if (newMilestoneStatus === undefined || onChange === undefined) {
       return
     }
 
-    onChange(newSprintStatus)
+    onChange(newMilestoneStatus)
   }
 
   $: isEditable = onChange !== undefined
 </script>
 
-<SprintStatusSelector
+<MilestoneStatusSelector
   {kind}
   {size}
   {width}
   {justify}
   {isEditable}
   showTooltip={isEditable ? { label: tracker.string.SetStatus } : undefined}
-  selectedSprintStatus={value}
-  onSprintStatusChange={handleComponentStatusChange}
+  selectedMilestoneStatus={value}
+  onMilestoneStatusChange={handleComponentStatusChange}
 />
diff --git a/plugins/tracker-resources/src/components/sprints/SprintStatusSelector.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneStatusSelector.svelte
similarity index 65%
rename from plugins/tracker-resources/src/components/sprints/SprintStatusSelector.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneStatusSelector.svelte
index 19ae404c5d..9bedc6ef91 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintStatusSelector.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneStatusSelector.svelte
@@ -13,15 +13,16 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { SprintStatus } from '@hcengineering/tracker'
+  import { MilestoneStatus } from '@hcengineering/tracker'
   import { Button, showPopup, SelectPopup, eventToHTMLElement } from '@hcengineering/ui'
   import type { ButtonKind, ButtonSize, LabelAndProps } from '@hcengineering/ui'
   import tracker from '../../plugin'
-  import { defaultSprintStatuses, sprintStatusAssets } from '../../utils'
+  import { defaultMilestoneStatuses, milestoneStatusAssets } from '../../utils'
 
-  export let selectedSprintStatus: SprintStatus | undefined
+  export let selectedMilestoneStatus: MilestoneStatus | undefined
   export let shouldShowLabel: boolean = true
-  export let onSprintStatusChange: ((newSprintStatus: SprintStatus | undefined) => void) | undefined = undefined
+  export let onMilestoneStatusChange: ((newMilestoneStatus: MilestoneStatus | undefined) => void) | undefined =
+    undefined
   export let isEditable: boolean = true
 
   export let kind: ButtonKind = 'no-border'
@@ -30,23 +31,23 @@
   export let width: string | undefined = 'min-content'
   export let showTooltip: LabelAndProps | undefined = undefined
 
-  $: selectedStatusIcon = selectedSprintStatus
-    ? sprintStatusAssets[selectedSprintStatus].icon
-    : tracker.icon.SprintStatusPlanned
+  $: selectedStatusIcon = selectedMilestoneStatus
+    ? milestoneStatusAssets[selectedMilestoneStatus].icon
+    : tracker.icon.MilestoneStatusPlanned
 
   $: selectedStatusLabel = shouldShowLabel
-    ? selectedSprintStatus
-      ? sprintStatusAssets[selectedSprintStatus].label
+    ? selectedMilestoneStatus
+      ? milestoneStatusAssets[selectedMilestoneStatus].label
       : tracker.string.Planned
     : undefined
 
-  $: statusesInfo = defaultSprintStatuses.map((s) => ({
+  $: statusesInfo = defaultMilestoneStatuses.map((s) => ({
     id: s,
-    isSelected: sprintStatusAssets[s].label === selectedStatusLabel,
-    ...sprintStatusAssets[s]
+    isSelected: milestoneStatusAssets[s].label === selectedStatusLabel,
+    ...milestoneStatusAssets[s]
   }))
 
-  const handleSprintStatusEditorOpened = (event: MouseEvent) => {
+  const handleMilestoneStatusEditorOpened = (event: MouseEvent) => {
     if (!isEditable) {
       return
     }
@@ -54,7 +55,7 @@
       SelectPopup,
       { value: statusesInfo, placeholder: tracker.string.SetStatus, searchable: true },
       eventToHTMLElement(event),
-      onSprintStatusChange
+      onMilestoneStatusChange
     )
   }
 </script>
@@ -68,5 +69,5 @@
   icon={selectedStatusIcon}
   label={selectedStatusLabel}
   {showTooltip}
-  on:click={handleSprintStatusEditorOpened}
+  on:click={handleMilestoneStatusEditorOpened}
 />
diff --git a/plugins/tracker-resources/src/components/sprints/SprintTitlePresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneTitlePresenter.svelte
similarity index 80%
rename from plugins/tracker-resources/src/components/sprints/SprintTitlePresenter.svelte
rename to plugins/tracker-resources/src/components/milestones/MilestoneTitlePresenter.svelte
index 7a4b7a2f7a..5f071fc491 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintTitlePresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneTitlePresenter.svelte
@@ -13,22 +13,19 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Sprint } from '@hcengineering/tracker'
+  import { Milestone } from '@hcengineering/tracker'
   import { getMonthName, Icon } from '@hcengineering/ui'
   import tracker from '../../plugin'
-  export let value: Sprint | undefined
+  export let value: Milestone | undefined
 </script>
 
 {#if value}
   <span class="overflow-label flex-row-center flex-grow">
-    <Icon icon={tracker.icon.Sprint} size={'small'} />
+    <Icon icon={tracker.icon.Milestone} size={'small'} />
     <div class="ml-2 mr-2">
       {value.label}
     </div>
     <span class="flex flex-grow justify-end">
-      {new Date(value.startDate).getDate()}
-      {getMonthName(new Date(value.startDate), 'short')}
-      -
       {new Date(value.targetDate).getDate()}
       {getMonthName(new Date(value.targetDate), 'short')}
     </span>
diff --git a/plugins/tracker-resources/src/components/sprints/Sprints.svelte b/plugins/tracker-resources/src/components/milestones/Milestones.svelte
similarity index 60%
rename from plugins/tracker-resources/src/components/sprints/Sprints.svelte
rename to plugins/tracker-resources/src/components/milestones/Milestones.svelte
index 283059e232..c69493b75c 100644
--- a/plugins/tracker-resources/src/components/sprints/Sprints.svelte
+++ b/plugins/tracker-resources/src/components/milestones/Milestones.svelte
@@ -16,7 +16,7 @@
   import { Ref } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
-  import { Sprint, Project } from '@hcengineering/tracker'
+  import { Milestone, Project } from '@hcengineering/tracker'
   import {
     closePopup,
     closeTooltip,
@@ -26,47 +26,47 @@
   } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import tracker from '../../plugin'
-  import { SprintViewMode } from '../../utils'
-  import EditSprint from './EditSprint.svelte'
-  import SprintBrowser from './SprintBrowser.svelte'
+  import { MilestoneViewMode } from '../../utils'
+  import EditMilestone from './EditMilestone.svelte'
+  import MilestoneBrowser from './MilestoneBrowser.svelte'
 
   export let currentSpace: Ref<Project>
-  export let label: IntlString = tracker.string.Sprints
+  export let label: IntlString = tracker.string.Milestones
   export let search: string = ''
-  export let mode: SprintViewMode = 'all'
+  export let mode: MilestoneViewMode = 'all'
 
-  let sprintId: Ref<Sprint> | undefined
-  let sprint: Sprint | undefined
+  let milestoneId: Ref<Milestone> | undefined
+  let milestone: Milestone | undefined
 
   onDestroy(
     resolvedLocationStore.subscribe(async (loc) => {
       closeTooltip()
       closePopup()
 
-      sprintId = loc.path[5] as Ref<Sprint>
+      milestoneId = loc.path[5] as Ref<Milestone>
     })
   )
 
-  const sprintQuery = createQuery()
-  $: if (sprintId !== undefined) {
-    sprintQuery.query(tracker.class.Sprint, { _id: sprintId }, (result) => {
-      sprint = result.shift()
+  const milestoneQuery = createQuery()
+  $: if (milestoneId !== undefined) {
+    milestoneQuery.query(tracker.class.Milestone, { _id: milestoneId }, (result) => {
+      milestone = result.shift()
     })
   } else {
-    sprintQuery.unsubscribe()
-    sprint = undefined
+    milestoneQuery.unsubscribe()
+    milestone = undefined
   }
 </script>
 
-{#if sprint}
-  <EditSprint
-    {sprint}
-    on:sprint={(evt) => {
+{#if milestone}
+  <EditMilestone
+    {milestone}
+    on:milestone={(evt) => {
       const loc = getCurrentResolvedLocation()
       loc.path[5] = evt.detail
       navigate(loc)
     }}
   />
 {:else}
-  <SprintBrowser {label} query={{ space: currentSpace }} {search} {mode} />
+  <MilestoneBrowser {label} query={{ space: currentSpace }} {search} {mode} />
 {/if}
diff --git a/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte b/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
similarity index 53%
rename from plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte
rename to plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
index 10ce150e54..239e2c7125 100644
--- a/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
@@ -18,35 +18,35 @@
   import tracker from '../../plugin'
   import { Card } from '@hcengineering/presentation'
   import { translate } from '@hcengineering/platform'
-  import SprintPopup from './SprintPopup.svelte'
-  import { Sprint } from '@hcengineering/tracker'
+  import MilestonePopup from './MilestonePopup.svelte'
+  import { Milestone } from '@hcengineering/tracker'
 
-  export let sprints: Sprint[]
-  export let moveAndDeleteSprint: (selectedSprint?: Sprint) => Promise<void>
+  export let milestones: Milestone[]
+  export let moveAndDeleteMilestone: (selectedMilestone?: Milestone) => Promise<void>
 
-  let selectedSprint: Sprint | undefined
-  let noSprintLabel: string
+  let selectedMilestone: Milestone | undefined
+  let noMilestoneLabel: string
 
-  $: translate(tracker.string.NoSprint, {}).then((label) => (noSprintLabel = label))
-  $: selectedSprintLabel = selectedSprint?.label ?? noSprintLabel
+  $: translate(tracker.string.NoMilestone, {}).then((label) => (noMilestoneLabel = label))
+  $: selectedMilestoneLabel = selectedMilestone?.label ?? noMilestoneLabel
 </script>
 
 <Card
   canSave
-  label={tracker.string.MoveAndDeleteSprint}
-  labelProps={{ newSprint: selectedSprintLabel, deleteSprint: sprints.map((p) => p.label) }}
+  label={tracker.string.MoveAndDeleteMilestone}
+  labelProps={{ newMilestone: selectedMilestoneLabel, deleteMilestone: milestones.map((p) => p.label) }}
   okLabel={tracker.string.Delete}
-  okAction={() => moveAndDeleteSprint(selectedSprint)}
+  okAction={() => moveAndDeleteMilestone(selectedMilestone)}
   on:close
   on:changeContent
 >
-  <SprintPopup
-    _class={tracker.class.Sprint}
-    ignoreSprints={sprints}
+  <MilestonePopup
+    _class={tracker.class.Milestone}
+    ignoreMilestones={milestones}
     allowDeselect
     closeAfterSelect={false}
     shadows={false}
     width="full"
-    on:update={({ detail }) => (selectedSprint = detail)}
+    on:update={({ detail }) => (selectedMilestone = detail)}
   />
 </Card>
diff --git a/plugins/tracker-resources/src/components/sprints/NewSprint.svelte b/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
similarity index 72%
rename from plugins/tracker-resources/src/components/sprints/NewSprint.svelte
rename to plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
index bbc326a36c..404a6513d2 100644
--- a/plugins/tracker-resources/src/components/sprints/NewSprint.svelte
+++ b/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
@@ -17,48 +17,47 @@
   import { IntlString } from '@hcengineering/platform'
   import { Card, getClient, SpaceSelector } from '@hcengineering/presentation'
   import { EmployeeBox, UserBoxList } from '@hcengineering/contact-resources'
-  import { Sprint, SprintStatus, Project } from '@hcengineering/tracker'
+  import { Milestone, MilestoneStatus, Project } from '@hcengineering/tracker'
   import ui, { DatePresenter, EditBox } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
-  import SprintStatusSelector from './SprintStatusSelector.svelte'
+  import MilestoneStatusSelector from './MilestoneStatusSelector.svelte'
   import { StyledTextArea } from '@hcengineering/text-editor'
 
   export let space: Ref<Project>
   const dispatch = createEventDispatcher()
   const client = getClient()
 
-  const object: Data<Sprint> = {
+  const object: Data<Milestone> = {
     label: '' as IntlString,
     description: '',
-    status: SprintStatus.Planned,
+    status: MilestoneStatus.Planned,
     lead: null,
     members: [],
     comments: 0,
     attachments: 0,
     capacity: 0,
-    startDate: Date.now(),
     targetDate: Date.now() + 14 * 24 * 60 * 60 * 1000
   }
 
   async function onSave () {
-    await client.createDoc(tracker.class.Sprint, space, object)
+    await client.createDoc(tracker.class.Milestone, space, object)
   }
 
-  const handleComponentStatusChanged = (newSprintStatus: SprintStatus | undefined) => {
-    if (newSprintStatus === undefined) {
+  const handleComponentStatusChanged = (newMilestoneStatus: MilestoneStatus | undefined) => {
+    if (newMilestoneStatus === undefined) {
       return
     }
 
-    object.status = newSprintStatus
+    object.status = newMilestoneStatus
   }
 </script>
 
 <Card
-  label={tracker.string.NewSprint}
+  label={tracker.string.NewMilestone}
   okAction={onSave}
   canSave={object.label !== ''}
-  okLabel={tracker.string.CreateSprint}
+  okLabel={tracker.string.CreateMilestone}
   on:close={() => dispatch('close')}
   on:changeContent
 >
@@ -71,21 +70,21 @@
       bind:space
     />
   </svelte:fragment>
-  <EditBox bind:value={object.label} placeholder={tracker.string.SprintNamePlaceholder} kind={'large-style'} focus />
+  <EditBox bind:value={object.label} placeholder={tracker.string.MilestoneNamePlaceholder} kind={'large-style'} focus />
   <StyledTextArea
     bind:content={object.description}
     placeholder={tracker.string.ComponentDescriptionPlaceholder}
     emphasized
   />
   <svelte:fragment slot="pool">
-    <SprintStatusSelector
-      selectedSprintStatus={object.status}
-      onSprintStatusChange={handleComponentStatusChanged}
+    <MilestoneStatusSelector
+      selectedMilestoneStatus={object.status}
+      onMilestoneStatusChange={handleComponentStatusChanged}
       kind={'secondary'}
       size={'large'}
     />
     <EmployeeBox
-      label={tracker.string.SprintLead}
+      label={tracker.string.MilestoneLead}
       placeholder={tracker.string.AssignTo}
       kind={'secondary'}
       size={'large'}
@@ -96,15 +95,7 @@
     />
     <UserBoxList
       bind:items={object.members}
-      label={tracker.string.SprintMembersSearchPlaceholder}
-      kind={'secondary'}
-      size={'large'}
-    />
-    <DatePresenter
-      bind:value={object.startDate}
-      editable
-      label={tracker.string.StartDate}
-      detail={ui.string.SelectDate}
+      label={tracker.string.MilestoneMembersSearchPlaceholder}
       kind={'secondary'}
       size={'large'}
     />
diff --git a/plugins/tracker-resources/src/components/scrums/ScrumRecordObjects.svelte b/plugins/tracker-resources/src/components/scrums/ScrumRecordObjects.svelte
index 38e06bce43..9805e604b8 100644
--- a/plugins/tracker-resources/src/components/scrums/ScrumRecordObjects.svelte
+++ b/plugins/tracker-resources/src/components/scrums/ScrumRecordObjects.svelte
@@ -27,7 +27,7 @@
     tracker.class.Issue,
     tracker.class.IssueTemplate,
     tracker.class.Component,
-    tracker.class.Sprint
+    tracker.class.Milestone
   ] as const
 
   let changedObjectTxes: TxCUD<Doc>[] = []
diff --git a/plugins/tracker-resources/src/components/scrums/ScrumRecordTimeSpend.svelte b/plugins/tracker-resources/src/components/scrums/ScrumRecordTimeSpend.svelte
index 7718cd5789..54bdecd362 100644
--- a/plugins/tracker-resources/src/components/scrums/ScrumRecordTimeSpend.svelte
+++ b/plugins/tracker-resources/src/components/scrums/ScrumRecordTimeSpend.svelte
@@ -169,14 +169,14 @@
     { key: '', presenter: tracker.component.DueDatePresenter, props: { kind: 'list', isEditable: false } },
     {
       key: '',
-      presenter: tracker.component.SprintEditor,
+      presenter: tracker.component.MilestoneEditor,
       props: {
         kind: 'list',
         size: 'small',
         shape: 'round',
         shouldShowPlaceholder: false,
         listProps: {
-          excludeByKey: 'sprint'
+          excludeByKey: 'milestone'
         },
         isEditable: false
       }
diff --git a/plugins/tracker-resources/src/components/scrums/ScrumsView.svelte b/plugins/tracker-resources/src/components/scrums/ScrumsView.svelte
index 3d71d509f5..6c736d3c8c 100644
--- a/plugins/tracker-resources/src/components/scrums/ScrumsView.svelte
+++ b/plugins/tracker-resources/src/components/scrums/ScrumsView.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import contact from '@hcengineering/contact'
   import { Ref, SortingOrder } from '@hcengineering/core'
-  import { ScrumRecord, Sprint, Project } from '@hcengineering/tracker'
+  import { ScrumRecord, Milestone, Project } from '@hcengineering/tracker'
   import { Button, Icon, IconAdd, Label, showPopup } from '@hcengineering/ui'
   import { ActionContext, List } from '@hcengineering/view-resources'
   import tracker from '../../plugin'
@@ -31,7 +31,7 @@
     showPopup(NewScrum, { space: currentSpace, targetElement: null }, null)
   }
 
-  const retrieveMembers = (s: Sprint) => s.members
+  const retrieveMembers = (s: Milestone) => s.members
 </script>
 
 <ActionContext
diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index 80ab915781..e4bdc2e526 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -18,15 +18,15 @@
   import { Card, getClient, KeyedAttribute, SpaceSelector } from '@hcengineering/presentation'
   import tags, { TagElement } from '@hcengineering/tags'
   import { StyledTextBox } from '@hcengineering/text-editor'
-  import { Component as ComponentType, IssuePriority, IssueTemplate, Project, Sprint } from '@hcengineering/tracker'
+  import { Component as ComponentType, IssuePriority, IssueTemplate, Project, Milestone } from '@hcengineering/tracker'
   import { Component, EditBox, Label } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { activeComponent, activeSprint } from '../../issues'
+  import { activeComponent, activeMilestone } from '../../issues'
   import tracker from '../../plugin'
   import ComponentSelector from '../ComponentSelector.svelte'
   import AssigneeEditor from '../issues/AssigneeEditor.svelte'
   import PriorityEditor from '../issues/PriorityEditor.svelte'
-  import SprintSelector from '../sprints/SprintSelector.svelte'
+  import MilestoneSelector from '../milestones/MilestoneSelector.svelte'
   import EstimationEditor from './EstimationEditor.svelte'
   import SubIssueTemplates from './IssueTemplateChilds.svelte'
 
@@ -34,7 +34,7 @@
   export let priority: IssuePriority = IssuePriority.NoPriority
   export let assignee: Ref<Employee> | null = null
   export let component: Ref<ComponentType> | null = $activeComponent ?? null
-  export let sprint: Ref<Sprint> | null = $activeSprint ?? null
+  export let milestone: Ref<Milestone> | null = $activeMilestone ?? null
   export let relatedTo: Doc | undefined
 
   let labels: TagElement[] = []
@@ -45,7 +45,7 @@
     description: '',
     assignee,
     component,
-    sprint,
+    milestone,
     priority,
     estimation: 0,
     children: [],
@@ -85,7 +85,7 @@
       description: object.description,
       assignee: object.assignee,
       component: object.component,
-      sprint: object.sprint,
+      milestone: object.milestone,
       priority: object.priority,
       estimation: object.estimation,
       children: object.children,
@@ -107,12 +107,12 @@
     object = { ...object, component: componentId }
   }
 
-  const handleSprintIdChanged = (sprintId: Ref<Sprint> | null | undefined) => {
-    if (sprintId === undefined) {
+  const handleMilestoneIdChanged = (milestoneId: Ref<Milestone> | null | undefined) => {
+    if (milestoneId === undefined) {
       return
     }
 
-    object = { ...object, sprint: sprintId }
+    object = { ...object, milestone: milestoneId }
   }
 
   function addTagRef (tag: TagElement): void {
@@ -155,7 +155,7 @@
   <SubIssueTemplates
     bind:children={object.children}
     component={object.component}
-    sprint={object.sprint}
+    milestone={object.milestone}
     project={_space}
     maxHeight="limited"
   />
@@ -201,9 +201,9 @@
       kind={'secondary'}
       size={'large'}
     />
-    <SprintSelector
-      value={object.sprint}
-      onChange={handleSprintIdChanged}
+    <MilestoneSelector
+      value={object.milestone}
+      onChange={handleMilestoneIdChanged}
       useComponent={object.component ?? undefined}
       kind={'secondary'}
       size={'large'}
diff --git a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
index 5b8897be05..123f763bed 100644
--- a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
@@ -17,7 +17,14 @@
   import { Account, Doc, generateId, Ref } from '@hcengineering/core'
   import presentation, { DraftController, getClient, KeyedAttribute } from '@hcengineering/presentation'
   import tags, { TagElement, TagReference } from '@hcengineering/tags'
-  import { Component as ComponentType, Issue, IssueDraft, IssuePriority, Project, Sprint } from '@hcengineering/tracker'
+  import {
+    Component as ComponentType,
+    Issue,
+    IssueDraft,
+    IssuePriority,
+    Project,
+    Milestone
+  } from '@hcengineering/tracker'
   import { Button, Component, EditBox } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
@@ -29,7 +36,7 @@
 
   export let parendIssueId: Ref<Issue>
   export let project: Project
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<ComponentType> | null = null
   export let childIssue: IssueDraft | undefined = undefined
   export let showBorder = false
@@ -66,7 +73,7 @@
       labels: [],
       component,
       priority: IssuePriority.NoPriority,
-      sprint,
+      milestone,
       estimation: 0
     }
   }
@@ -77,7 +84,7 @@
     assignee: project.defaultAssignee ?? null,
     component,
     priority: IssuePriority.NoPriority,
-    sprint
+    milestone
   }
 
   function objectChange (object: IssueDraft, empty: any) {
diff --git a/plugins/tracker-resources/src/components/templates/DraftIssueChildList.svelte b/plugins/tracker-resources/src/components/templates/DraftIssueChildList.svelte
index a307669d1d..6f6599512b 100644
--- a/plugins/tracker-resources/src/components/templates/DraftIssueChildList.svelte
+++ b/plugins/tracker-resources/src/components/templates/DraftIssueChildList.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Ref } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
-  import tracker, { Component, IssueDraft, Project, Sprint } from '@hcengineering/tracker'
+  import tracker, { Component, IssueDraft, Project, Milestone } from '@hcengineering/tracker'
   import { eventToHTMLElement, IconCircles, showPopup } from '@hcengineering/ui'
   import { ActionContext, FixedColumn } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
@@ -28,7 +28,7 @@
 
   export let issues: IssueDraft[]
   export let project: Ref<Project>
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<Component> | null = null
   const dispatch = createEventDispatcher()
 
@@ -41,7 +41,7 @@
       {
         showBorder: true,
         project: currentProject,
-        sprint,
+        milestone,
         component,
         childIssue: target
       },
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
index 411bf6c79f..62e455aaeb 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
@@ -17,7 +17,7 @@
   import presentation, { createQuery, getClient, KeyedAttribute } from '@hcengineering/presentation'
   import tags, { TagElement, TagReference } from '@hcengineering/tags'
   import { StyledTextArea } from '@hcengineering/text-editor'
-  import { IssuePriority, IssueTemplateChild, Component as ComponentType, Sprint } from '@hcengineering/tracker'
+  import { IssuePriority, IssueTemplateChild, Component as ComponentType, Milestone } from '@hcengineering/tracker'
   import { Button, Component, EditBox } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
@@ -25,7 +25,7 @@
   import PriorityEditor from '../issues/PriorityEditor.svelte'
   import EstimationEditor from './EstimationEditor.svelte'
 
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<ComponentType> | null = null
   export let childIssue: IssueTemplateChild | undefined = undefined
   export let showBorder = false
@@ -59,7 +59,7 @@
       assignee: null,
       component: null,
       priority: IssuePriority.NoPriority,
-      sprint,
+      milestone,
       estimation: 0
     }
   }
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChildList.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChildList.svelte
index 2b1638124e..8826948b2b 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChildList.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChildList.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Ref } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
-  import tracker, { Component, Issue, IssueTemplateChild, Project, Sprint } from '@hcengineering/tracker'
+  import tracker, { Component, Issue, IssueTemplateChild, Project, Milestone } from '@hcengineering/tracker'
   import { IconCircles, eventToHTMLElement, showPopup } from '@hcengineering/ui'
   import { ActionContext, FixedColumn } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
@@ -27,7 +27,7 @@
 
   export let issues: IssueTemplateChild[]
   export let project: Ref<Project>
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<Component> | null = null
 
   const dispatch = createEventDispatcher()
@@ -41,7 +41,7 @@
       IssueTemplateChildEditor,
       {
         showBorder: true,
-        sprint,
+        milestone,
         component,
         childIssue: target
       },
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
index 6b4a939030..677a9e2380 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Ref } from '@hcengineering/core'
-  import { Component, Issue, IssueTemplateChild, Project, Sprint } from '@hcengineering/tracker'
+  import { Component, Issue, IssueTemplateChild, Project, Milestone } from '@hcengineering/tracker'
   import { Button, ExpandCollapse, IconAdd, Scroller, closeTooltip } from '@hcengineering/ui'
   import { afterUpdate, createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
@@ -25,7 +25,7 @@
 
   export let children: IssueTemplateChild[] = []
   export let project: Ref<Project>
-  export let sprint: Ref<Sprint> | null = null
+  export let milestone: Ref<Milestone> | null = null
   export let component: Ref<Component> | null = null
   export let isScrollable: boolean = false
   export let maxHeight: 'max' | 'card' | 'limited' | string | undefined = undefined
@@ -92,7 +92,7 @@
       <Scroller>
         <IssueTemplateChildList
           {component}
-          {sprint}
+          {milestone}
           bind:issues={children}
           {project}
           on:move={handleIssueSwap}
@@ -106,7 +106,7 @@
   <ExpandCollapse isExpanded={!isCollapsed} on:changeContent>
     <IssueTemplateChildEditor
       {component}
-      {sprint}
+      {milestone}
       {isScrollable}
       {maxHeight}
       on:close={() => {
diff --git a/plugins/tracker-resources/src/components/templates/TemplateControlPanel.svelte b/plugins/tracker-resources/src/components/templates/TemplateControlPanel.svelte
index 85efaea91a..f98619688d 100644
--- a/plugins/tracker-resources/src/components/templates/TemplateControlPanel.svelte
+++ b/plugins/tracker-resources/src/components/templates/TemplateControlPanel.svelte
@@ -23,7 +23,7 @@
   import ComponentEditor from '../components/ComponentEditor.svelte'
   import AssigneeEditor from '../issues/AssigneeEditor.svelte'
   import PriorityEditor from '../issues/PriorityEditor.svelte'
-  import SprintEditor from '../sprints/SprintEditor.svelte'
+  import MilestoneEditor from '../milestones/MilestoneEditor.svelte'
 
   export let issue: WithLookup<IssueTemplate>
 
@@ -37,7 +37,7 @@
     keys = filtredKeys.filter((key) => !isCollectionAttr(hierarchy, key))
   }
 
-  $: updateKeys(['title', 'description', 'priority', 'number', 'assignee', 'component', 'sprint'])
+  $: updateKeys(['title', 'description', 'priority', 'number', 'assignee', 'component', 'milestone'])
 
   const key: KeyedAttribute = {
     key: 'labels',
@@ -104,11 +104,11 @@
   </span>
   <ComponentEditor value={issue} size={'medium'} />
 
-  {#if issue.sprint}
+  {#if issue.milestone}
     <span class="label">
-      <Label label={tracker.string.Sprint} />
+      <Label label={tracker.string.Milestone} />
     </span>
-    <SprintEditor value={issue} size={'medium'} />
+    <MilestoneEditor value={issue} size={'medium'} />
   {/if}
 
   {#if keys.length > 0}
diff --git a/plugins/tracker-resources/src/index.ts b/plugins/tracker-resources/src/index.ts
index 1720d0ce7b..ca94a65526 100644
--- a/plugins/tracker-resources/src/index.ts
+++ b/plugins/tracker-resources/src/index.ts
@@ -25,7 +25,7 @@ import {
 } from '@hcengineering/core'
 import { Resources, translate } from '@hcengineering/platform'
 import { getClient, MessageBox, ObjectSearchResult } from '@hcengineering/presentation'
-import { Issue, Project, Scrum, ScrumRecord, Sprint } from '@hcengineering/tracker'
+import { Issue, Project, Scrum, ScrumRecord, Milestone } from '@hcengineering/tracker'
 import { showPopup } from '@hcengineering/ui'
 import ComponentEditor from './components/components/ComponentEditor.svelte'
 import ComponentPresenter from './components/components/ComponentPresenter.svelte'
@@ -68,8 +68,8 @@ import NopeComponent from './components/NopeComponent.svelte'
 import RelationsPopup from './components/RelationsPopup.svelte'
 import SetDueDateActionPopup from './components/SetDueDateActionPopup.svelte'
 import SetParentIssueActionPopup from './components/SetParentIssueActionPopup.svelte'
-import SprintDatePresenter from './components/sprints/SprintDatePresenter.svelte'
-import SprintLeadPresenter from './components/sprints/SprintLeadPresenter.svelte'
+import MilestoneDatePresenter from './components/milestones/MilestoneDatePresenter.svelte'
+import MilestoneLeadPresenter from './components/milestones/MilestoneLeadPresenter.svelte'
 import CreateIssueTemplate from './components/templates/CreateIssueTemplate.svelte'
 import Views from './components/views/Views.svelte'
 import Statuses from './components/workflow/Statuses.svelte'
@@ -85,12 +85,12 @@ import {
 } from './issues'
 import tracker from './plugin'
 
-import SprintEditor from './components/sprints/SprintEditor.svelte'
-import SprintPresenter from './components/sprints/SprintPresenter.svelte'
-import Sprints from './components/sprints/Sprints.svelte'
-import SprintSelector from './components/sprints/SprintSelector.svelte'
-import SprintStatusPresenter from './components/sprints/SprintStatusPresenter.svelte'
-import SprintTitlePresenter from './components/sprints/SprintTitlePresenter.svelte'
+import MilestoneEditor from './components/milestones/MilestoneEditor.svelte'
+import MilestonePresenter from './components/milestones/MilestonePresenter.svelte'
+import Milestones from './components/milestones/Milestones.svelte'
+import MilestoneSelector from './components/milestones/MilestoneSelector.svelte'
+import MilestoneStatusPresenter from './components/milestones/MilestoneStatusPresenter.svelte'
+import MilestoneTitlePresenter from './components/milestones/MilestoneTitlePresenter.svelte'
 
 import ScrumRecordPanel from './components/scrums/ScrumRecordPanel.svelte'
 import Scrums from './components/scrums/Scrums.svelte'
@@ -109,17 +109,17 @@ import IssueTemplatePresenter from './components/templates/IssueTemplatePresente
 import IssueTemplates from './components/templates/IssueTemplates.svelte'
 
 import { deleteObject } from '@hcengineering/view-resources'
-import MoveAndDeleteSprintPopup from './components/sprints/MoveAndDeleteSprintPopup.svelte'
+import MoveAndDeleteMilestonePopup from './components/milestones/MoveAndDeleteMilestonePopup.svelte'
 import EditIssueTemplate from './components/templates/EditIssueTemplate.svelte'
 import TemplateEstimationEditor from './components/templates/EstimationEditor.svelte'
 import {
   getAllComponents,
   getAllPriority,
-  getAllSprints,
+  getAllMilestones,
   issuePrioritySort,
   issueStatusSort,
-  moveIssuesToAnotherSprint,
-  sprintSort,
+  moveIssuesToAnotherMilestone,
+  milestoneSort,
   subIssueQuery
 } from './utils'
 
@@ -134,9 +134,9 @@ import TimeSpendReportPopup from './components/issues/timereport/TimeSpendReport
 import CreateProject from './components/projects/CreateProject.svelte'
 import ProjectPresenter from './components/projects/ProjectPresenter.svelte'
 import ProjectSpacePresenter from './components/projects/ProjectSpacePresenter.svelte'
-import IssueStatistics from './components/sprints/IssueStatistics.svelte'
-import SprintRefPresenter from './components/sprints/SprintRefPresenter.svelte'
-import SprintFilter from './components/sprints/SprintFilter.svelte'
+import IssueStatistics from './components/milestones/IssueStatistics.svelte'
+import MilestoneRefPresenter from './components/milestones/MilestoneRefPresenter.svelte'
+import MilestoneFilter from './components/milestones/MilestoneFilter.svelte'
 
 export { default as SubIssueList } from './components/issues/edit/SubIssueList.svelte'
 
@@ -249,23 +249,30 @@ async function deleteProject (project: Project | undefined): Promise<void> {
   }
 }
 
-async function moveAndDeleteSprints (client: TxOperations, oldSprints: Sprint[], newSprint?: Sprint): Promise<void> {
-  const noSprintLabel = await translate(tracker.string.NoSprint, {})
+async function moveAndDeleteMilestones (
+  client: TxOperations,
+  oldMilestones: Milestone[],
+  newMilestone?: Milestone
+): Promise<void> {
+  const noMilestoneLabel = await translate(tracker.string.NoMilestone, {})
 
   showPopup(
     MessageBox,
     {
-      label: tracker.string.MoveAndDeleteSprint,
-      message: tracker.string.MoveAndDeleteSprintConfirm,
-      labelProps: { newSprint: newSprint?.label ?? noSprintLabel, deleteSprint: oldSprints.map((p) => p.label) }
+      label: tracker.string.MoveAndDeleteMilestone,
+      message: tracker.string.MoveAndDeleteMilestoneConfirm,
+      labelProps: {
+        newMilestone: newMilestone?.label ?? noMilestoneLabel,
+        deleteMilestone: oldMilestones.map((p) => p.label)
+      }
     },
     undefined,
     (result?: boolean) => {
       if (result === true) {
-        for (const oldSprint of oldSprints) {
-          void moveIssuesToAnotherSprint(client, oldSprint, newSprint).then((succes) => {
+        for (const oldMilestone of oldMilestones) {
+          void moveIssuesToAnotherMilestone(client, oldMilestone, newMilestone).then((succes) => {
             if (succes) {
-              void deleteObject(client, oldSprint)
+              void deleteObject(client, oldMilestone)
             }
           })
         }
@@ -274,25 +281,25 @@ async function moveAndDeleteSprints (client: TxOperations, oldSprints: Sprint[],
   )
 }
 
-async function deleteSprint (sprints: Sprint | Sprint[]): Promise<void> {
+async function deleteMilestone (milestones: Milestone | Milestone[]): Promise<void> {
   const client = getClient()
-  const sprintArray = Array.isArray(sprints) ? sprints : [sprints]
-  // Check if available to move issues to another sprint
-  const firstSearchedSprint = await client.findOne(tracker.class.Sprint, {
-    _id: { $nin: sprintArray.map((p) => p._id) }
+  const milestoneArray = Array.isArray(milestones) ? milestones : [milestones]
+  // Check if available to move issues to another milestone
+  const firstSearchedMilestone = await client.findOne(tracker.class.Milestone, {
+    _id: { $nin: milestoneArray.map((p) => p._id) }
   })
-  if (firstSearchedSprint !== undefined) {
+  if (firstSearchedMilestone !== undefined) {
     showPopup(
-      MoveAndDeleteSprintPopup,
+      MoveAndDeleteMilestonePopup,
       {
-        sprintArray,
-        moveAndDeleteSprint: async (selectedSprint?: Sprint) =>
-          await moveAndDeleteSprints(client, sprintArray, selectedSprint)
+        milestoneArray,
+        moveAndDeleteMilestone: async (selectedMilestone?: Milestone) =>
+          await moveAndDeleteMilestones(client, milestoneArray, selectedMilestone)
       },
       'top'
     )
   } else {
-    await moveAndDeleteSprints(client, sprintArray)
+    await moveAndDeleteMilestones(client, milestoneArray)
   }
 }
 
@@ -393,7 +400,7 @@ export default async (): Promise<Resources> => ({
     PriorityPresenter,
     PriorityEditor,
     PriorityRefPresenter,
-    SprintRefPresenter,
+    MilestoneRefPresenter,
     ComponentEditor,
     StatusPresenter,
     StatusEditor,
@@ -416,14 +423,14 @@ export default async (): Promise<Resources> => ({
     RelationsPopup,
     CreateIssue,
     CreateIssueTemplate,
-    Sprints,
-    SprintPresenter,
+    Milestones,
+    MilestonePresenter,
     Scrums,
     ScrumRecordPanel,
-    SprintStatusPresenter,
-    SprintTitlePresenter,
-    SprintSelector,
-    SprintEditor,
+    MilestoneStatusPresenter,
+    MilestoneTitlePresenter,
+    MilestoneSelector,
+    MilestoneEditor,
     ReportedTimeEditor,
     TimeSpendReport,
     EstimationEditor,
@@ -444,10 +451,10 @@ export default async (): Promise<Resources> => ({
     RelatedIssueSelector,
     DeleteComponentPresenter,
     TimeSpendReportPopup,
-    SprintDatePresenter,
-    SprintLeadPresenter,
+    MilestoneDatePresenter,
+    MilestoneLeadPresenter,
     NotificationIssuePresenter,
-    SprintFilter
+    MilestoneFilter
   },
   completion: {
     IssueQuery: async (client: Client, query: string, filter?: { in?: RelatedDocument[], nin?: RelatedDocument[] }) =>
@@ -461,17 +468,17 @@ export default async (): Promise<Resources> => ({
     GetIssueTitle: issueTitleProvider,
     IssueStatusSort: issueStatusSort,
     IssuePrioritySort: issuePrioritySort,
-    SprintSort: sprintSort,
+    MilestoneSort: milestoneSort,
     SubIssueQuery: subIssueQuery,
     GetAllPriority: getAllPriority,
     GetAllComponents: getAllComponents,
-    GetAllSprints: getAllSprints
+    GetAllMilestones: getAllMilestones
   },
   actionImpl: {
     Move: move,
     EditWorkflowStatuses: editWorkflowStatuses,
     EditProject: editProject,
-    DeleteSprint: deleteSprint,
+    DeleteMilestone: deleteMilestone,
     DeleteProject: deleteProject
   },
   resolver: {
diff --git a/plugins/tracker-resources/src/issues.ts b/plugins/tracker-resources/src/issues.ts
index 093b4ba17d..9aaac56ff0 100644
--- a/plugins/tracker-resources/src/issues.ts
+++ b/plugins/tracker-resources/src/issues.ts
@@ -1,13 +1,13 @@
 import { Doc, DocumentUpdate, Ref, RelatedDocument, TxOperations } from '@hcengineering/core'
 import { getClient } from '@hcengineering/presentation'
-import { Component, Issue, Project, Sprint, trackerId } from '@hcengineering/tracker'
+import { Component, Issue, Project, Milestone, trackerId } from '@hcengineering/tracker'
 import { Location, ResolvedLocation, getPanelURI, getCurrentResolvedLocation } from '@hcengineering/ui'
 import { workbenchId } from '@hcengineering/workbench'
 import { writable } from 'svelte/store'
 import tracker from './plugin'
 
 export const activeComponent = writable<Ref<Component> | undefined>(undefined)
-export const activeSprint = writable<Ref<Sprint> | undefined>(undefined)
+export const activeMilestone = writable<Ref<Milestone> | undefined>(undefined)
 
 export function getIssueId (project: Project, issue: Issue): string {
   return `${project.identifier}-${issue.number}`
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 3f3f2390fc..41208adb1b 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -229,27 +229,27 @@ export default mergeIds(trackerId, tracker, {
     StatusHistory: '' as IntlString,
     AddLabel: '' as IntlString,
 
-    Sprint: '' as IntlString,
-    Sprints: '' as IntlString,
-    AllSprints: '' as IntlString,
-    PlannedSprints: '' as IntlString,
-    ActiveSprints: '' as IntlString,
-    ClosedSprints: '' as IntlString,
-    SprintNamePlaceholder: '' as IntlString,
-    SprintLead: '' as IntlString,
-    SprintLeadTitle: '' as IntlString,
-    SprintLeadSearchPlaceholder: '' as IntlString,
-    SprintMembersTitle: '' as IntlString,
-    SprintMembersSearchPlaceholder: '' as IntlString,
+    Milestone: '' as IntlString,
+    Milestones: '' as IntlString,
+    AllMilestones: '' as IntlString,
+    PlannedMilestones: '' as IntlString,
+    ActiveMilestones: '' as IntlString,
+    ClosedMilestones: '' as IntlString,
+    MilestoneNamePlaceholder: '' as IntlString,
+    MilestoneLead: '' as IntlString,
+    MilestoneLeadTitle: '' as IntlString,
+    MilestoneLeadSearchPlaceholder: '' as IntlString,
+    MilestoneMembersTitle: '' as IntlString,
+    MilestoneMembersSearchPlaceholder: '' as IntlString,
 
-    NewSprint: '' as IntlString,
-    CreateSprint: '' as IntlString,
-    AddToSprint: '' as IntlString,
-    MoveToSprint: '' as IntlString,
-    NoSprint: '' as IntlString,
+    NewMilestone: '' as IntlString,
+    CreateMilestone: '' as IntlString,
+    AddToMilestone: '' as IntlString,
+    MoveToMilestone: '' as IntlString,
+    NoMilestone: '' as IntlString,
 
-    MoveAndDeleteSprint: '' as IntlString,
-    MoveAndDeleteSprintConfirm: '' as IntlString,
+    MoveAndDeleteMilestone: '' as IntlString,
+    MoveAndDeleteMilestoneConfirm: '' as IntlString,
 
     Scrum: '' as IntlString,
     Scrums: '' as IntlString,
@@ -281,7 +281,6 @@ export default mergeIds(trackerId, tracker, {
     TimeSpendReportDescription: '' as IntlString,
     TimeSpendValue: '' as IntlString,
     TimeSpendHours: '' as IntlString,
-    SprintPassed: '' as IntlString,
 
     ChildEstimation: '' as IntlString,
     ChildReportedTime: '' as IntlString,
@@ -338,7 +337,7 @@ export default mergeIds(trackerId, tracker, {
     PriorityEditor: '' as AnyComponent,
     PriorityRefPresenter: '' as AnyComponent,
     ComponentEditor: '' as AnyComponent,
-    SprintEditor: '' as AnyComponent,
+    MilestoneEditor: '' as AnyComponent,
     StatusPresenter: '' as AnyComponent,
     StatusRefPresenter: '' as AnyComponent,
     StatusEditor: '' as AnyComponent,
@@ -362,13 +361,13 @@ export default mergeIds(trackerId, tracker, {
     ProjectComponents: '' as AnyComponent,
     IssuePreview: '' as AnyComponent,
     RelationsPopup: '' as AnyComponent,
-    SprintRefPresenter: '' as AnyComponent,
-    Sprints: '' as AnyComponent,
-    SprintPresenter: '' as AnyComponent,
-    SprintStatusPresenter: '' as AnyComponent,
-    SprintTitlePresenter: '' as AnyComponent,
-    SprintDatePresenter: '' as AnyComponent,
-    SprintLeadPresenter: '' as AnyComponent,
+    MilestoneRefPresenter: '' as AnyComponent,
+    Milestones: '' as AnyComponent,
+    MilestonePresenter: '' as AnyComponent,
+    MilestoneStatusPresenter: '' as AnyComponent,
+    MilestoneTitlePresenter: '' as AnyComponent,
+    MilestoneDatePresenter: '' as AnyComponent,
+    MilestoneLeadPresenter: '' as AnyComponent,
     ReportedTimeEditor: '' as AnyComponent,
     TimeSpendReport: '' as AnyComponent,
     EstimationEditor: '' as AnyComponent,
@@ -396,10 +395,10 @@ export default mergeIds(trackerId, tracker, {
     GetIssueTitle: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<string>>,
     IssueStatusSort: '' as SortFunc,
     IssuePrioritySort: '' as SortFunc,
-    SprintSort: '' as SortFunc,
+    MilestoneSort: '' as SortFunc,
     SubIssueQuery: '' as ViewQueryAction,
     GetAllPriority: '' as GetAllValuesFunc,
     GetAllComponents: '' as GetAllValuesFunc,
-    GetAllSprints: '' as GetAllValuesFunc
+    GetAllMilestones: '' as GetAllValuesFunc
   }
 })
diff --git a/plugins/tracker-resources/src/types.ts b/plugins/tracker-resources/src/types.ts
index e63fbe5a0b..21383aadde 100644
--- a/plugins/tracker-resources/src/types.ts
+++ b/plugins/tracker-resources/src/types.ts
@@ -22,7 +22,7 @@ import {
   IssuesGrouping,
   IssuesOrdering,
   ComponentStatus,
-  SprintStatus
+  MilestoneStatus
 } from '@hcengineering/tracker'
 import tracker from './plugin'
 
@@ -39,7 +39,7 @@ export const issuesGroupByOptions: Record<IssuesGrouping, IntlString> = {
   [IssuesGrouping.Assignee]: tracker.string.Assignee,
   [IssuesGrouping.Priority]: tracker.string.Priority,
   [IssuesGrouping.Component]: tracker.string.Component,
-  [IssuesGrouping.Sprint]: tracker.string.Sprint,
+  [IssuesGrouping.Milestone]: tracker.string.Milestone,
   [IssuesGrouping.NoGrouping]: tracker.string.NoGrouping
 }
 
@@ -65,11 +65,11 @@ export const defaultComponentStatuses = [
   ComponentStatus.Canceled
 ]
 
-export const defaultSprintStatuses = [
-  SprintStatus.Planned,
-  SprintStatus.InProgress,
-  SprintStatus.Completed,
-  SprintStatus.Canceled
+export const defaultMilestoneStatuses = [
+  MilestoneStatus.Planned,
+  MilestoneStatus.InProgress,
+  MilestoneStatus.Completed,
+  MilestoneStatus.Canceled
 ]
 
 export const componentStatusAssets: Record<ComponentStatus, { icon: Asset, label: IntlString }> = {
@@ -81,11 +81,11 @@ export const componentStatusAssets: Record<ComponentStatus, { icon: Asset, label
   [ComponentStatus.Canceled]: { icon: tracker.icon.ComponentStatusCanceled, label: tracker.string.Canceled }
 }
 
-export const sprintStatusAssets: Record<SprintStatus, { icon: Asset, label: IntlString }> = {
-  [SprintStatus.Planned]: { icon: tracker.icon.SprintStatusPlanned, label: tracker.string.Planned },
-  [SprintStatus.InProgress]: { icon: tracker.icon.SprintStatusInProgress, label: tracker.string.InProgress },
-  [SprintStatus.Completed]: { icon: tracker.icon.SprintStatusCompleted, label: tracker.string.Completed },
-  [SprintStatus.Canceled]: { icon: tracker.icon.SprintStatusCanceled, label: tracker.string.Canceled }
+export const milestoneStatusAssets: Record<MilestoneStatus, { icon: Asset, label: IntlString }> = {
+  [MilestoneStatus.Planned]: { icon: tracker.icon.MilestoneStatusPlanned, label: tracker.string.Planned },
+  [MilestoneStatus.InProgress]: { icon: tracker.icon.MilestoneStatusInProgress, label: tracker.string.InProgress },
+  [MilestoneStatus.Completed]: { icon: tracker.icon.MilestoneStatusCompleted, label: tracker.string.Completed },
+  [MilestoneStatus.Canceled]: { icon: tracker.icon.MilestoneStatusCanceled, label: tracker.string.Canceled }
 }
 
 export const defaultPriorities = [
@@ -101,6 +101,6 @@ export const issuesGroupBySorting: Record<IssuesGrouping, SortingQuery<Issue>> =
   [IssuesGrouping.Assignee]: { assignee: SortingOrder.Ascending },
   [IssuesGrouping.Priority]: { priority: SortingOrder.Ascending },
   [IssuesGrouping.Component]: { '$lookup.component.label': SortingOrder.Ascending },
-  [IssuesGrouping.Sprint]: { '$lookup.sprint.label': SortingOrder.Ascending },
+  [IssuesGrouping.Milestone]: { '$lookup.milestone.label': SortingOrder.Ascending },
   [IssuesGrouping.NoGrouping]: { rank: SortingOrder.Ascending }
 }
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index 99c0863246..87a0767594 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -46,8 +46,8 @@ import {
   IssuesGrouping,
   IssuesOrdering,
   Project,
-  Sprint,
-  SprintStatus,
+  Milestone,
+  MilestoneStatus,
   TimeReportDayType
 } from '@hcengineering/tracker'
 import {
@@ -61,7 +61,7 @@ import {
 import { ViewletDescriptor } from '@hcengineering/view'
 import { CategoryQuery, groupBy, ListSelectionProvider, SelectDirection } from '@hcengineering/view-resources'
 import tracker from './plugin'
-import { defaultComponentStatuses, defaultPriorities, defaultSprintStatuses } from './types'
+import { defaultComponentStatuses, defaultPriorities, defaultMilestoneStatuses } from './types'
 
 export * from './types'
 
@@ -81,7 +81,7 @@ export interface Selection {
   currentSpecial?: string
 }
 
-export type IssuesGroupByKeys = keyof Pick<Issue, 'status' | 'priority' | 'assignee' | 'component' | 'sprint'>
+export type IssuesGroupByKeys = keyof Pick<Issue, 'status' | 'priority' | 'assignee' | 'component' | 'milestone'>
 export type IssuesOrderByKeys = keyof Pick<Issue, 'status' | 'priority' | 'modifiedOn' | 'dueDate' | 'rank'>
 
 export const issuesGroupKeyMap: Record<IssuesGrouping, IssuesGroupByKeys | undefined> = {
@@ -89,7 +89,7 @@ export const issuesGroupKeyMap: Record<IssuesGrouping, IssuesGroupByKeys | undef
   [IssuesGrouping.Priority]: 'priority',
   [IssuesGrouping.Assignee]: 'assignee',
   [IssuesGrouping.Component]: 'component',
-  [IssuesGrouping.Sprint]: 'sprint',
+  [IssuesGrouping.Milestone]: 'milestone',
   [IssuesGrouping.NoGrouping]: undefined
 }
 
@@ -109,12 +109,13 @@ export const issuesSortOrderMap: Record<IssuesOrderByKeys, SortingOrder> = {
   rank: SortingOrder.Ascending
 }
 
-export const issuesGroupEditorMap: Record<'status' | 'priority' | 'component' | 'sprint', AnyComponent | undefined> = {
-  status: tracker.component.StatusEditor,
-  priority: tracker.component.PriorityEditor,
-  component: tracker.component.ComponentEditor,
-  sprint: tracker.component.SprintEditor
-}
+export const issuesGroupEditorMap: Record<'status' | 'priority' | 'component' | 'milestone', AnyComponent | undefined> =
+  {
+    status: tracker.component.StatusEditor,
+    priority: tracker.component.PriorityEditor,
+    component: tracker.component.ComponentEditor,
+    milestone: tracker.component.MilestoneEditor
+  }
 
 export const getIssuesModificationDatePeriodTime = (period: IssuesDateModificationPeriod | null): number => {
   const today = new Date(Date.now())
@@ -200,10 +201,10 @@ export const getIssueFilterAssetsByType = (type: string): { icon: Asset, label:
         label: tracker.string.Component
       }
     }
-    case 'sprint': {
+    case 'milestone': {
       return {
-        icon: tracker.icon.Sprint,
-        label: tracker.string.Sprint
+        icon: tracker.icon.Milestone,
+        label: tracker.string.Milestone
       }
     }
     default: {
@@ -232,7 +233,7 @@ export const getArraysUnion = (a: any[], b: any[]): any[] => {
 
 export type ComponentsFilterMode = 'all' | 'backlog' | 'active' | 'closed'
 
-export type SprintViewMode = 'all' | 'planned' | 'active' | 'closed'
+export type MilestoneViewMode = 'all' | 'planned' | 'active' | 'closed'
 
 export type ScrumRecordViewMode = 'timeReports' | 'objects'
 
@@ -256,19 +257,19 @@ export const getIncludedComponentStatuses = (mode: ComponentsFilterMode): Compon
   }
 }
 
-export const getIncludedSprintStatuses = (mode: SprintViewMode): SprintStatus[] => {
+export const getIncludedMilestoneStatuses = (mode: MilestoneViewMode): MilestoneStatus[] => {
   switch (mode) {
     case 'all': {
-      return defaultSprintStatuses
+      return defaultMilestoneStatuses
     }
     case 'active': {
-      return [SprintStatus.InProgress]
+      return [MilestoneStatus.InProgress]
     }
     case 'planned': {
-      return [SprintStatus.Planned]
+      return [MilestoneStatus.Planned]
     }
     case 'closed': {
-      return [SprintStatus.Completed, SprintStatus.Canceled]
+      return [MilestoneStatus.Completed, MilestoneStatus.Canceled]
     }
     default: {
       return []
@@ -283,11 +284,11 @@ export const componentsTitleMap: Record<ComponentsFilterMode, IntlString> = Obje
   closed: tracker.string.ClosedComponents
 })
 
-export const sprintTitleMap: Record<SprintViewMode, IntlString> = Object.freeze({
-  all: tracker.string.AllSprints,
-  planned: tracker.string.PlannedSprints,
-  active: tracker.string.ActiveSprints,
-  closed: tracker.string.ClosedSprints
+export const milestoneTitleMap: Record<MilestoneViewMode, IntlString> = Object.freeze({
+  all: tracker.string.AllMilestones,
+  planned: tracker.string.PlannedMilestones,
+  active: tracker.string.ActiveMilestones,
+  closed: tracker.string.ClosedMilestones
 })
 
 export const scrumRecordTitleMap: Record<ScrumRecordViewMode, IntlString> = Object.freeze({
@@ -351,63 +352,39 @@ export async function issuePrioritySort (value: IssuePriority[]): Promise<IssueP
   return value
 }
 
-export async function sprintSort (value: Array<Ref<Sprint>>): Promise<Array<Ref<Sprint>>> {
+export async function milestoneSort (value: Array<Ref<Milestone>>): Promise<Array<Ref<Milestone>>> {
   return await new Promise((resolve) => {
     const query = createQuery(true)
-    query.query(tracker.class.Sprint, { _id: { $in: value } }, (res) => {
-      const sprints = toIdMap(res)
-      value.sort((a, b) => (sprints.get(b)?.startDate ?? 0) - (sprints.get(a)?.startDate ?? 0))
+    query.query(tracker.class.Milestone, { _id: { $in: value } }, (res) => {
+      const milestones = toIdMap(res)
+      value.sort((a, b) => (milestones.get(b)?.targetDate ?? 0) - (milestones.get(a)?.targetDate ?? 0))
       resolve(value)
       query.unsubscribe()
     })
   })
 }
 
-/**
- * @public
- */
-export function getSprintDays (value: Sprint): string {
-  const st = new Date(value.startDate).getDate()
-  const days = Math.floor(Math.abs((1 + value.targetDate - value.startDate) / 1000 / 60 / 60 / 24)) + 1
-  const stDate = new Date(value.startDate)
-  const stTime = stDate.getTime()
-  let ds = Array.from(Array(days).keys()).map((it) => st + it)
-  ds = ds.filter((it) => ![0, 6].includes(new Date(new Date(stTime).setDate(it)).getDay()))
-  return ds.join(' ')
-}
-
-export function getDayOfSprint (startDate: number, now: number): number {
-  startDate = new Date(startDate).setHours(0, 0)
-  now = new Date(now).setHours(0, 0)
-  const days = Math.floor(Math.abs((1 + now - startDate) / 1000 / 60 / 60 / 24))
-  const stDate = new Date(startDate)
-  const stDateDate = stDate.getDate()
-  const stTime = stDate.getTime()
-  const ds = Array.from(Array(days).keys()).map((it) => stDateDate + it)
-  return ds.filter((it) => !isWeekend(new Date(new Date(stTime).setDate(it)))).length
-}
-
-export async function moveIssuesToAnotherSprint (
+export async function moveIssuesToAnotherMilestone (
   client: TxOperations,
-  oldSprint: Sprint,
-  newSprint: Sprint | undefined
+  oldMilestone: Milestone,
+  newMilestone: Milestone | undefined
 ): Promise<boolean> {
   try {
-    // Find all Issues by Sprint
-    const movedIssues = await client.findAll(tracker.class.Issue, { sprint: oldSprint._id })
+    // Find all Issues by Milestone
+    const movedIssues = await client.findAll(tracker.class.Issue, { milestone: oldMilestone._id })
 
-    // Update Issues by new Sprint
+    // Update Issues by new Milestone
     const awaitedUpdates: Array<Promise<TxResult>> = []
     for (const issue of movedIssues) {
-      awaitedUpdates.push(client.update(issue, { sprint: newSprint?._id ?? null }))
+      awaitedUpdates.push(client.update(issue, { milestone: newMilestone?._id ?? null }))
     }
     await Promise.all(awaitedUpdates)
 
     return true
   } catch (error) {
     console.error(
-      `Error happened while moving issues between sprints from ${oldSprint.label} to ${
-        newSprint?.label ?? 'No Sprint'
+      `Error happened while moving issues between milestones from ${oldMilestone.label} to ${
+        newMilestone?.label ?? 'No Milestone'
       }: `,
       error
     )
@@ -485,12 +462,12 @@ export async function getAllComponents (
   return await getAllSomething(tracker.class.Component, query, onUpdate, queryId)
 }
 
-export async function getAllSprints (
+export async function getAllMilestones (
   query: DocumentQuery<Doc> | undefined,
   onUpdate: () => void,
   queryId: Ref<Doc>
 ): Promise<any[] | undefined> {
-  return await getAllSomething(tracker.class.Sprint, query, onUpdate, queryId)
+  return await getAllSomething(tracker.class.Milestone, query, onUpdate, queryId)
 }
 
 export function subIssueListProvider (subIssues: Issue[], target: Ref<Issue>): void {
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index 10c0f186db..37076f765f 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -81,7 +81,7 @@ export enum IssuesGrouping {
   Assignee = 'assignee',
   Priority = 'priority',
   Component = 'component',
-  Sprint = 'sprint',
+  Milestone = 'milestone',
   NoGrouping = '#no_category'
 }
 
@@ -108,7 +108,7 @@ export enum IssuesDateModificationPeriod {
 /**
  * @public
  */
-export enum SprintStatus {
+export enum MilestoneStatus {
   Planned,
   InProgress,
   Completed,
@@ -118,11 +118,11 @@ export enum SprintStatus {
 /**
  * @public
  */
-export interface Sprint extends Doc {
+export interface Milestone extends Doc {
   label: string
   description?: Markup
 
-  status: SprintStatus
+  status: MilestoneStatus
 
   lead: Ref<Employee> | null
   members: Ref<Employee>[]
@@ -132,7 +132,6 @@ export interface Sprint extends Doc {
   comments: number
   attachments?: number
 
-  startDate: Timestamp
   targetDate: Timestamp
 
   // Capacity in man days.
@@ -168,7 +167,7 @@ export interface Issue extends AttachedDoc {
 
   rank: string
 
-  sprint?: Ref<Sprint> | null
+  milestone?: Ref<Milestone> | null
 
   // Estimation in man days
   estimation: number
@@ -203,7 +202,7 @@ export interface IssueDraft {
   component: Ref<Component> | null
   space: Ref<Project>
   dueDate: Timestamp | null
-  sprint?: Ref<Sprint> | null
+  milestone?: Ref<Milestone> | null
 
   // Estimation in man days
   estimation: number
@@ -230,7 +229,7 @@ export interface IssueTemplateData {
   assignee: Ref<Employee> | null
   component: Ref<Component> | null
 
-  sprint?: Ref<Sprint> | null
+  milestone?: Ref<Milestone> | null
 
   // Estimation in man days
   estimation: number
@@ -388,10 +387,10 @@ export default plugin(trackerId, {
     IssueStatus: '' as Ref<Class<IssueStatus>>,
     TypeIssuePriority: '' as Ref<Class<Type<IssuePriority>>>,
     TypeComponentStatus: '' as Ref<Class<Type<ComponentStatus>>>,
-    Sprint: '' as Ref<Class<Sprint>>,
+    Milestone: '' as Ref<Class<Milestone>>,
     Scrum: '' as Ref<Class<Scrum>>,
     ScrumRecord: '' as Ref<Class<ScrumRecord>>,
-    TypeSprintStatus: '' as Ref<Class<Type<SprintStatus>>>,
+    TypeMilestoneStatus: '' as Ref<Class<Type<MilestoneStatus>>>,
     TimeSpendReport: '' as Ref<Class<TimeSpendReport>>,
     TypeReportedTime: '' as Ref<Class<Type<number>>>
   },
@@ -437,7 +436,7 @@ export default plugin(trackerId, {
     Labels: '' as Asset,
     DueDate: '' as Asset,
     Parent: '' as Asset,
-    Sprint: '' as Asset,
+    Milestone: '' as Asset,
     IssueTemplates: '' as Asset,
     Scrum: '' as Asset,
     Start: '' as Asset,
@@ -465,11 +464,11 @@ export default plugin(trackerId, {
     ComponentStatusCompleted: '' as Asset,
     ComponentStatusCanceled: '' as Asset,
 
-    SprintStatusPlanned: '' as Asset,
-    SprintStatusInProgress: '' as Asset,
-    SprintStatusPaused: '' as Asset,
-    SprintStatusCompleted: '' as Asset,
-    SprintStatusCanceled: '' as Asset,
+    MilestoneStatusPlanned: '' as Asset,
+    MilestoneStatusInProgress: '' as Asset,
+    MilestoneStatusPaused: '' as Asset,
+    MilestoneStatusCompleted: '' as Asset,
+    MilestoneStatusCanceled: '' as Asset,
 
     CopyID: '' as Asset,
     CopyURL: '' as Asset,
@@ -505,7 +504,7 @@ export default plugin(trackerId, {
     NewSubIssue: '' as Ref<Action>,
     EditWorkflowStatuses: '' as Ref<Action>,
     EditProject: '' as Ref<Action>,
-    SetSprint: '' as Ref<Action>,
+    SetMilestone: '' as Ref<Action>,
     SetLabels: '' as Ref<Action>
   },
   project: {
diff --git a/tests/sanity/tests/tracker.layout.spec.ts b/tests/sanity/tests/tracker.layout.spec.ts
index 55ed7823dd..4ea0ba1b60 100644
--- a/tests/sanity/tests/tracker.layout.spec.ts
+++ b/tests/sanity/tests/tracker.layout.spec.ts
@@ -3,7 +3,7 @@ import {
   checkIssueFromList,
   createIssue,
   createComponent,
-  createSprint,
+  createMilestone,
   DEFAULT_STATUSES,
   DEFAULT_USER,
   IssueProps,
@@ -24,14 +24,14 @@ async function createIssues (
   prefix: string,
   page: Page,
   components?: string[],
-  sprints?: string[]
+  milestones?: string[]
 ): Promise<IssueProps[]> {
   const issuesProps = []
   for (let index = 0; index < 5; index++) {
     const shiftedIndex = 4 - index
     const name =
-      sprints !== undefined
-        ? getIssueName(`${prefix}-layout-${shiftedIndex}-${sprints[index % sprints.length]}`)
+      milestones !== undefined
+        ? getIssueName(`${prefix}-layout-${shiftedIndex}-${milestones[index % milestones.length]}`)
         : getIssueName(`${prefix}-layout-${shiftedIndex}`)
     const issueProps = {
       name,
@@ -39,7 +39,7 @@ async function createIssues (
       assignee: shiftedIndex % 2 === 0 ? DEFAULT_USER : 'Chen Rosamund',
       priority: PRIORITIES[shiftedIndex],
       component: components !== undefined ? components[index % components.length] : undefined,
-      sprint: sprints !== undefined ? sprints[index % sprints.length] : undefined
+      milestone: milestones !== undefined ? milestones[index % milestones.length] : undefined
     }
     issuesProps.push(issueProps)
 
@@ -62,23 +62,23 @@ async function createComponents (page: Page): Promise<string[]> {
   return components
 }
 
-async function createSprints (page: Page): Promise<string[]> {
-  const sprints = []
+async function createMilestones (page: Page): Promise<string[]> {
+  const milestones = []
 
   for (let index = 0; index < 5; index++) {
-    const sprintId = `sprint-${generateId()}-${index}`
-    sprints.push(sprintId)
+    const milestoneId = `milestone-${generateId()}-${index}`
+    milestones.push(milestoneId)
 
-    await createSprint(page, sprintId)
+    await createMilestone(page, milestoneId)
   }
 
-  return sprints
+  return milestones
 }
 
 async function initIssues (prefix: string, page: Page): Promise<IssueProps[]> {
   const components = await createComponents(page)
-  const sprints = await createSprints(page)
-  const issuesProps = await createIssues(prefix, page, components, sprints)
+  const milestones = await createMilestones(page)
+  const issuesProps = await createIssues(prefix, page, components, milestones)
   await page.click('text="Issues"')
 
   return issuesProps
@@ -94,7 +94,7 @@ test.describe('tracker layout tests', () => {
 
   let issuesProps: IssueProps[] = []
   const orders = ['Status', 'Modified', 'Priority'] as const
-  const groups = ['Status', 'Assignee', 'Priority', 'Component', 'Sprint', 'No grouping'] as const
+  const groups = ['Status', 'Assignee', 'Priority', 'Component', 'Milestone', 'No grouping'] as const
   const groupsLabels: { [key in (typeof groups)[number]]?: string[] } = {
     Status: DEFAULT_STATUSES,
     Assignee: [DEFAULT_USER, 'Chen Rosamund'],
@@ -108,8 +108,8 @@ test.describe('tracker layout tests', () => {
       await setViewGroup(page, group)
 
       let groupLabels: any[]
-      if (group === 'Sprint') {
-        groupLabels = issuesProps.map((props) => props.sprint)
+      if (group === 'Milestone') {
+        groupLabels = issuesProps.map((props) => props.milestone)
       } else {
         groupLabels = groupsLabels[group] ?? []
       }
diff --git a/tests/sanity/tests/tracker.utils.ts b/tests/sanity/tests/tracker.utils.ts
index b3ede3c813..4fe597ea11 100644
--- a/tests/sanity/tests/tracker.utils.ts
+++ b/tests/sanity/tests/tracker.utils.ts
@@ -9,7 +9,7 @@ export interface IssueProps {
   priority?: string
   assignee?: string
   component?: string
-  sprint?: string
+  milestone?: string
 }
 
 export enum ViewletSelectors {
@@ -46,7 +46,7 @@ export async function setViewOrder (page: Page, orderName: string): Promise<void
 }
 
 export async function fillIssueForm (page: Page, props: IssueProps, issue: boolean): Promise<void> {
-  const { name, description, status, assignee, labels, priority, component, sprint } = props
+  const { name, description, status, assignee, labels, priority, component, milestone } = props
   const af = issue ? 'form ' : '[id="sub-issue-child-editor"] '
   const issueTitle = page.locator(af + '[placeholder="Issue\\ title"]')
   await issueTitle.fill(name)
@@ -80,9 +80,9 @@ export async function fillIssueForm (page: Page, props: IssueProps, issue: boole
     await page.click(af + 'button:has-text("Component")')
     await page.click(`.selectPopup button:has-text("${component}")`)
   }
-  if (sprint !== undefined) {
-    await page.click(af + '.button:has-text("No Sprint")')
-    await page.click(`.selectPopup button:has-text("${sprint}")`)
+  if (milestone !== undefined) {
+    await page.click(af + '.button:has-text("No Milestone")')
+    await page.click(`.selectPopup button:has-text("${milestone}")`)
   }
 }
 
@@ -105,12 +105,14 @@ export async function createComponent (page: Page, componentName: string): Promi
   await page.click('button:has-text("Create component")')
 }
 
-export async function createSprint (page: Page, sprintName: string): Promise<void> {
-  await page.click('text=Sprints')
-  await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Aproject%3ADefaultProject/sprints`)
-  await page.click('button:has-text("Sprint")')
-  await page.click('[placeholder="Sprint\\ name"]')
-  await page.fill('[placeholder="Sprint\\ name"]', sprintName)
+export async function createMilestone (page: Page, milestoneName: string): Promise<void> {
+  await page.click('text=Milestones')
+  await expect(page).toHaveURL(
+    `${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Aproject%3ADefaultProject/milestones`
+  )
+  await page.click('button:has-text("Milestone")')
+  await page.click('[placeholder="Milestone\\ name"]')
+  await page.fill('[placeholder="Milestone\\ name"]', milestoneName)
   await page.click('button:has-text("Create")')
 }
 
@@ -133,7 +135,7 @@ export async function createLabel (page: Page, label: string): Promise<void> {
 }
 
 export async function checkIssue (page: Page, props: IssueProps): Promise<void> {
-  const { name, description, status, assignee, labels, priority, component, sprint } = props
+  const { name, description, status, assignee, labels, priority, component, milestone } = props
 
   if (name !== undefined) {
     await expect(page.locator('.popupPanel')).toContainText(name)
@@ -157,8 +159,8 @@ export async function checkIssue (page: Page, props: IssueProps): Promise<void>
   if (component !== undefined) {
     await expect(asideLocator).toContainText(component)
   }
-  if (sprint !== undefined) {
-    await expect(asideLocator).toContainText(sprint)
+  if (milestone !== undefined) {
+    await expect(asideLocator).toContainText(milestone)
   }
 }