diff --git a/apps/cuteness.io/main-page.xml b/apps/cuteness.io/main-page.xml
index 9fa47235d..47136ec76 100644
--- a/apps/cuteness.io/main-page.xml
+++ b/apps/cuteness.io/main-page.xml
@@ -1,8 +1,8 @@
 <Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded">
   <TabView>
     <TabView.items>
-      <TabEntry title="List">
-        <TabEntry.view>
+      <TabViewItem title="List">
+        <TabViewItem.view>
           <ListView items="{{ redditItems }}" isScrolling="{{ isScrolling }}" itemTap="listViewItemTap" loadMoreItems="listViewLoadMoreItems">
             <ListView.itemTemplate>
               <!-- Binding in template property of an component will use the bindingContext provided by the component. -->
@@ -15,16 +15,16 @@
               <!-- End of tempplate. -->
             </ListView.itemTemplate>
           </ListView>
-        </TabEntry.view>
-      </TabEntry>
-      <TabEntry title="About">
-        <TabEntry.view>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="About">
+        <TabViewItem.view>
           <StackLayout>
             <Image margin="10" url="~/app/res/telerik-logo.png" />
             <Label margin="10" textWrap="true" text="{{ aboutText }}" />
           </StackLayout>
-        </TabEntry.view>
-      </TabEntry>
+        </TabViewItem.view>
+      </TabViewItem>
     </TabView.items>
   </TabView>
 </Page>
\ No newline at end of file
diff --git a/apps/gallery-app/content/tab-view.xml b/apps/gallery-app/content/tab-view.xml
index 2e8222ead..f29aa83b5 100644
--- a/apps/gallery-app/content/tab-view.xml
+++ b/apps/gallery-app/content/tab-view.xml
@@ -2,20 +2,20 @@
 <Page>
   <TabView>
     <TabView.items>
-      <TabEntry title="First">
-        <TabEntry.view>
+      <TabViewItem title="First">
+        <TabViewItem.view>
           <GridLayout>
             <Label text="First Tab" verticalAlignment="center" horizontalAlignment="center"/>
           </GridLayout>
-        </TabEntry.view>
-      </TabEntry>
-      <TabEntry title="Second">
-        <TabEntry.view>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="Second">
+        <TabViewItem.view>
           <GridLayout>
             <Label text="Second Tab" verticalAlignment="center" horizontalAlignment="center"/>
           </GridLayout>
-        </TabEntry.view>
-      </TabEntry>
+        </TabViewItem.view>
+      </TabViewItem>
     </TabView.items>
   </TabView>
 </Page>
\ No newline at end of file
diff --git a/apps/template-tab-navigation/main-page.xml b/apps/template-tab-navigation/main-page.xml
index 615095aa2..08aa7e1a5 100644
--- a/apps/template-tab-navigation/main-page.xml
+++ b/apps/template-tab-navigation/main-page.xml
@@ -1,22 +1,22 @@
 <Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded">
   <TabView>
     <TabView.items>
-      <TabEntry title="First">
-        <TabEntry.view>
+      <TabViewItem title="First">
+        <TabViewItem.view>
           <StackLayout cssClass="tab-content">
             <Label text="First View" cssClass="title"/>
             <Label text="This is the content of the first tab." textWrap="true"/>
           </StackLayout>
-        </TabEntry.view>
-      </TabEntry>
-      <TabEntry title="Second">
-        <TabEntry.view>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="Second">
+        <TabViewItem.view>
           <StackLayout cssClass="tab-content">
             <Label text="Second View" cssClass="title"/>
             <Label text="This is the content of the second tab." textWrap="true"/>
           </StackLayout>
-        </TabEntry.view>
-      </TabEntry>
+        </TabViewItem.view>
+      </TabViewItem>
     </TabView.items>
   </TabView>
 </Page>
\ No newline at end of file
diff --git a/apps/tests/ui/tab-view/tab-view-tests.ts b/apps/tests/ui/tab-view/tab-view-tests.ts
index 5490c17d9..a3d73cc5c 100644
--- a/apps/tests/ui/tab-view/tab-view-tests.ts
+++ b/apps/tests/ui/tab-view/tab-view-tests.ts
@@ -17,16 +17,16 @@ import buttonModule = require("ui/button");
 // <Page>
 //  <TabView>
 //    <TabView.items>
-//      <TabEntry title="Tab 1">
-//        <TabEntry.view>
+//      <TabViewItem title="Tab 1">
+//        <TabViewItem.view>
 //           <Label text="Label in Tab1" />
-//        </TabEntry.view>
-//      </TabEntry>
-//      <TabEntry title="Tab 2">
-//        <TabEntry.view>
+//        </TabViewItem.view>
+//      </TabViewItem>
+//      <TabViewItem title="Tab 2">
+//        <TabViewItem.view>
 //           <Label text="Label in Tab2" />
-//        </TabEntry.view>
-//      </TabEntry>
+//        </TabViewItem.view>
+//      </TabViewItem>
 //    </TabView.items>
 //  </TabView>
 // </Page>
@@ -47,8 +47,8 @@ function _createTabView(): tabViewModule.TabView {
     return tabView;
 }
 
-function _createItems(count: number): Array<tabViewModule.TabEntry> {
-    var items = new Array<tabViewModule.TabEntry>();
+function _createItems(count: number): Array<tabViewModule.TabViewItem> {
+    var items = new Array<tabViewModule.TabViewItem>();
     for (var i = 0; i < count; i++) {
         var label = new labelModule.Label();
         label.text = "Tab " + i;
@@ -263,7 +263,7 @@ export var testBindingToTabEntryWithUndefinedViewShouldThrow = function () {
         var tabView = <tabViewModule.TabView>views[0];
         TKUnit.assertThrows(function () {
             tabView.items = [{ title: "Tab 0", view: undefined }];
-        }, "Binding TabView to a TabEntry with undefined view should throw.");
+        }, "Binding TabView to a TabViewItem with undefined view should throw.");
     });
 }
 
@@ -273,7 +273,7 @@ export var testBindingToTabEntryWithNullViewShouldThrow = function () {
         var tabView = <tabViewModule.TabView>views[0];
         TKUnit.assertThrows(function () {
             tabView.items = [{ title: "Tab 0", view: null }];
-        }, "Binding TabView to a TabEntry with null view should throw.");
+        }, "Binding TabView to a TabViewItem with null view should throw.");
     });
 }
 
diff --git a/apps/tests/xml-declaration/mainPage.xml b/apps/tests/xml-declaration/mainPage.xml
index 240ea464a..6b9980562 100644
--- a/apps/tests/xml-declaration/mainPage.xml
+++ b/apps/tests/xml-declaration/mainPage.xml
@@ -3,8 +3,8 @@
       xmlns:customControls2="app/xml-declaration/mymodulewithxml">
   <TabView>
     <TabView.items>
-      <TabEntry title="Tab 1">
-        <TabEntry.view>
+      <TabViewItem title="Tab 1">
+        <TabViewItem.view>
           <StackLayout>
             
             <SegmentedBar selectedIndex="1" style="background-color: red; color: white" selectedBackgroundColor="green">
@@ -38,25 +38,25 @@
             <Button text="This is Button!" tap="buttonTap" />
             <customControls:MyControl />
           </StackLayout>
-        </TabEntry.view>
-      </TabEntry>
-      <TabEntry title="Tab 2">
-        <TabEntry.view>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="Tab 2">
+        <TabViewItem.view>
           <StackLayout>
             <customControls2:MyControl />
             <Label text="This is Label in Tab 2" />
           </StackLayout>
-        </TabEntry.view>
-      </TabEntry>
-      <TabEntry title="Tab 3">
-        <TabEntry.view>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="Tab 3">
+        <TabViewItem.view>
           <GridLayout columns="50, auto, *" rows="50, auto, *">
             <Label text="This is Label in Tab 3"  row="0" />
             <Label text="This is second Label in Tab 3" row="1" />
             <customControls:MyControl />
           </GridLayout>
-        </TabEntry.view>
-      </TabEntry>
+        </TabViewItem.view>
+      </TabViewItem>
     </TabView.items>
   </TabView>
 </Page>
\ No newline at end of file
diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts
index efe61f567..fa136035a 100644
--- a/ui/builder/component-builder.ts
+++ b/ui/builder/component-builder.ts
@@ -23,7 +23,7 @@ var MODULES = {
     "SearchBar": "ui/search-bar",
     "SlideOut": "ui/slide-out",
     "TabView": "ui/tab-view",
-    "TabEntry": "ui/tab-view",
+    "TabViewItem": "ui/tab-view",
     "TextField": "ui/text-field",
     "TextView": "ui/text-view",
     "FormattedString": "text/formatted-string",
diff --git a/ui/tab-view/tab-view-common.ts b/ui/tab-view/tab-view-common.ts
index 44f00a99c..832b1aa27 100644
--- a/ui/tab-view/tab-view-common.ts
+++ b/ui/tab-view/tab-view-common.ts
@@ -49,10 +49,10 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
         }
     }
 
-    get items(): Array<definition.TabEntry> {
+    get items(): Array<definition.TabViewItem> {
         return this._getValue(TabView.itemsProperty);
     }
-    set items(value: Array<definition.TabEntry>) {
+    set items(value: Array<definition.TabViewItem>) {
         this._setValue(TabView.itemsProperty, value);
     }
 
@@ -84,24 +84,24 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
         }
     }
 
-    public _removeTabs(oldItems: Array<definition.TabEntry>) {
+    public _removeTabs(oldItems: Array<definition.TabViewItem>) {
         //
     }
 
-    public _addTabs(newItems: Array<definition.TabEntry>) {
+    public _addTabs(newItems: Array<definition.TabViewItem>) {
         // Validate that all items are ok before the native _addTabs code runs.
         var i: number;
         var length = newItems.length;
-        var newItem: definition.TabEntry;
+        var newItem: definition.TabViewItem;
         for (i = 0; i < length; i++) {
             newItem = newItems[i];
 
             if (!newItem) {
-                throw new Error("TabEntry at index " + i + " is undefined.");
+                throw new Error("TabViewItem at index " + i + " is undefined.");
             }
 
             if (!newItem.view) {
-                throw new Error("TabEntry at index " + i + " does not have a view.");
+                throw new Error("TabViewItem at index " + i + " does not have a view.");
             }
         }
     }
@@ -163,7 +163,7 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
 
         var i;
         var length = _items.length;
-        var item: definition.TabEntry;
+        var item: definition.TabViewItem;
         var retVal: boolean;
 
         for (i = 0; i < length; i++) {
diff --git a/ui/tab-view/tab-view.android.ts b/ui/tab-view/tab-view.android.ts
index d45ea44a8..332ec7b29 100644
--- a/ui/tab-view/tab-view.android.ts
+++ b/ui/tab-view/tab-view.android.ts
@@ -326,7 +326,7 @@ export class TabView extends common.TabView {
         }
     }
 
-    public _addTabs(newItems: Array<definition.TabEntry>) {
+    public _addTabs(newItems: Array<definition.TabViewItem>) {
         trace.write("TabView._addTabs(" + newItems + ");", common.traceCategory);
         super._addTabs(newItems);
 
@@ -351,7 +351,7 @@ export class TabView extends common.TabView {
         // TODO: Where will be the support for more ActionBar settings like Title, Navigation buttons, etc.?
         var i: number = 0;
         var length = newItems.length;
-        var item: definition.TabEntry;
+        var item: definition.TabViewItem;
         var tab: android.app.ActionBar.Tab;
 
         for (i; i < length; i++) {
@@ -367,7 +367,7 @@ export class TabView extends common.TabView {
         }
     }
 
-    public _removeTabs(oldItems: Array<definition.TabEntry>) {
+    public _removeTabs(oldItems: Array<definition.TabViewItem>) {
         trace.write("TabView._removeTabs(" + oldItems + ");", common.traceCategory);
         super._removeTabs(oldItems);
 
diff --git a/ui/tab-view/tab-view.d.ts b/ui/tab-view/tab-view.d.ts
index 32312e9b0..2c689aa2e 100644
--- a/ui/tab-view/tab-view.d.ts
+++ b/ui/tab-view/tab-view.d.ts
@@ -8,14 +8,14 @@ declare module "ui/tab-view" {
     /**
      * Represents a tab view entry.
      */
-    interface TabEntry {
+    interface TabViewItem {
         /**
-         * Gets or sets the title of the TabEntry.
+         * Gets or sets the title of the TabViewItem.
          */
         title: string;
-        
+
         /**
-         * Gets or sets the view of the TabEntry.
+         * Gets or sets the view of the TabViewItem.
          */
         view: view.View;
     }
@@ -24,13 +24,13 @@ declare module "ui/tab-view" {
      * Represents a tab view.
      */
     class TabView extends view.View {
-        public static itemsProperty : dependencyObservable.Property;
-        public static selectedIndexProperty : dependencyObservable.Property;
+        public static itemsProperty: dependencyObservable.Property;
+        public static selectedIndexProperty: dependencyObservable.Property;
 
         /**
          * Gets or sets the items of the TabView.
          */
-        items: Array<TabEntry>;
+        items: Array<TabViewItem>;
 
         /**
          * Gets or sets the selectedIndex of the TabView.
diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts
index 35de1e688..8e15cbca2 100644
--- a/ui/tab-view/tab-view.ios.ts
+++ b/ui/tab-view/tab-view.ios.ts
@@ -117,13 +117,13 @@ export class TabView extends common.TabView {
         }
     }
 
-    public _removeTabs(oldItems: Array<definition.TabEntry>) {
+    public _removeTabs(oldItems: Array<definition.TabViewItem>) {
         trace.write("TabView._removeTabs(" + oldItems + ");", trace.categories.Debug);
         super._removeTabs(oldItems);
 
         var i: number;
         var length = oldItems.length;
-        var oldItem: definition.TabEntry;
+        var oldItem: definition.TabViewItem;
         for (i = 0; i < length; i++) {
             oldItem = oldItems[i];
             this._removeView(oldItem.view);
@@ -132,13 +132,13 @@ export class TabView extends common.TabView {
         this._ios.viewControllers = null;
     }
 
-    public _addTabs(newItems: Array<definition.TabEntry>) {
+    public _addTabs(newItems: Array<definition.TabViewItem>) {
         trace.write("TabView._addTabs(" + newItems + ");", trace.categories.Debug);
         super._addTabs(newItems);
 
         var i: number;
         var length = newItems.length;
-        var newItem: definition.TabEntry;
+        var newItem: definition.TabViewItem;
         var newControllers: NSMutableArray = NSMutableArray.alloc().initWithCapacity(length);
         var newController: UIViewController;