diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
index de071ed4f8..98adf7868e 100644
--- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
+++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
@@ -1,12 +1,12 @@
 <div class="t-swimlane s-swimlane l-swimlane {{ngModel.activitystate}} {{ngModel.swimlanestate}}"
-     warp-swimlane-drop="ngModel"
+     mct-swimlane-drop="ngModel"
      ng-class="{
                exceeded: ngModel.exceeded(),
                selected: ngModel.selected(swimlane),
                'drop-into': ngModel.highlight(),
                'drop-after': ngModel.highlightBottom()
                }">
-	<div class="l-cols">
+    <div class="l-cols">
         <span class="l-col l-col-icon l-plot-resource"
               ng-click="ngModel.toggleGraph()">
             <span class="ui-symbol"
@@ -20,17 +20,17 @@
                ng-href="{{ngModel.link()}}"
                ng-if="ngModel.link().length > 0"
                title="{{ngModel.link()}}"
-	           >
+               >
                 &#x00e8;
             </a>
         </span>
-		<span class="l-col l-title"
+        <span class="l-col l-title"
               ng-click="ngModel.select()"
               ng-style="{ 'margin-left': 15 * ngModel.depth + 'px' }">
             <mct-representation key="'label'"
                                 mct-object="ngModel.domainObject"
-                                warp-swimlane-drag="ngModel">
+                                mct-swimlane-drag="ngModel">
             </mct-representation>
         </span>
-	</div>
-</div>
\ No newline at end of file
+    </div>
+</div>
diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html
index f0e29c577f..7a00345fef 100644
--- a/platform/features/timeline/res/templates/timeline.html
+++ b/platform/features/timeline/res/templates/timeline.html
@@ -133,9 +133,9 @@
                                    'drop-after': swimlane.highlightBottom()
                                    }"
                          ng-click="selection.select(swimlane)"
-                         warp-swimlane-drop="swimlane">
+                         mct-swimlane-drop="swimlane">
 
-                        <mct-representation key="'warp.gantt'"
+                        <mct-representation key="'gantt'"
                                             mct-object="swimlane.domainObject"
                                             parameters="{
                                                         scroll: scroll,