diff --git a/apps/tests/ui/layouts/wrap-layout-tests.ts b/apps/tests/ui/layouts/wrap-layout-tests.ts
index 784350ea0..0282da099 100644
--- a/apps/tests/ui/layouts/wrap-layout-tests.ts
+++ b/apps/tests/ui/layouts/wrap-layout-tests.ts
@@ -1,4 +1,4 @@
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import {Label} from "ui/label";
 import layoutHelper = require("./layout-helper");
 import testModule = require("../../ui-test");
diff --git a/apps/tests/ui/list-picker/list-picker-tests.ts b/apps/tests/ui/list-picker/list-picker-tests.ts
index 2bf605312..39a9c711f 100644
--- a/apps/tests/ui/list-picker/list-picker-tests.ts
+++ b/apps/tests/ui/list-picker/list-picker-tests.ts
@@ -4,9 +4,9 @@ import viewModule = require("ui/core/view");
 import listPickerTestsNative = require("./list-picker-tests-native");
 import application = require("application");
 
-// >> article-require-module
+// >> article-require-listpicker-module
 import listPickerModule = require("ui/list-picker");
-// << article-require-module
+// << article-require-listpicker-module
 
 function _createListPicker(): listPickerModule.ListPicker {
     // >> article-create-listpicker
@@ -227,4 +227,4 @@ export var test_Android_WhenSelectedIndexChangesEditTextIsUpdatedProperly = func
         var actualValue = (<any>listPicker)._editText.getText().toString();
         TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
     });
-}
\ No newline at end of file
+}
diff --git a/apps/tests/ui/list-picker/list-picker.md b/apps/tests/ui/list-picker/list-picker.md
index f44bde393..d4c12df02 100644
--- a/apps/tests/ui/list-picker/list-picker.md
+++ b/apps/tests/ui/list-picker/list-picker.md
@@ -5,7 +5,7 @@ description: "Examples for using ListPicker"
 ---
 # ListPicker
 Using a ListPicker requires the "ui/list-picker" module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-listpicker-module'/>
 ## Creating a ListPicker
 <snippet id='article-create-listpicker'/>
 ## Binding listPicker.items
diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index 107bf721f..c10376391 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -7,9 +7,9 @@ import platform = require("platform");
 import utils = require("utils/utils");
 import { Label } from "ui/label";
 
-// >> article-require-module
+// >> article-require-listview-module
 import listViewModule = require("ui/list-view");
-// << article-require-module
+// << article-require-listview-module
 
 // >> article-require-modules
 import observableArray = require("data/observable-array");
diff --git a/apps/tests/ui/list-view/list-view.md b/apps/tests/ui/list-view/list-view.md
index 4a775c21a..a4e4b3b8b 100644
--- a/apps/tests/ui/list-view/list-view.md
+++ b/apps/tests/ui/list-view/list-view.md
@@ -5,7 +5,7 @@ description: "Examples for using list-view"
 ---
 # ListView
 Using a ListView requires the ListView module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-listview-module'/>
 Other modules which will be used in the code samples in this article:
 <snippet id='article-require-modules'/>
 ### Binding the ListView items property to collection in the view-model.
diff --git a/apps/tests/ui/page/page-tests-common.ts b/apps/tests/ui/page/page-tests-common.ts
index effd343e6..1e5ab5088 100644
--- a/apps/tests/ui/page/page-tests-common.ts
+++ b/apps/tests/ui/page/page-tests-common.ts
@@ -1,8 +1,8 @@
-// >> article-require-module
+// >> article-require-page-module
 import pageModule = require("ui/page");
 //// FrameModule is needed in order to have an option to navigate to the new page.
 import frameModule = require("ui/frame");
-// << article-require-module
+// << article-require-page-module
 
 // >> article-set-bindingcontext
 function pageLoaded(args) {
diff --git a/apps/tests/ui/page/page.md b/apps/tests/ui/page/page.md
index 85f9ec24e..e34e13ba6 100644
--- a/apps/tests/ui/page/page.md
+++ b/apps/tests/ui/page/page.md
@@ -5,7 +5,7 @@ description: "Examples for using Page"
 ---
 # Page
 Using a page requires the Page module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-page/module'/>
 ### Attaching event handler for the Page loaded event to set bindingContext.
 ``` XML
 <Page loaded="pageLoaded">
diff --git a/apps/tests/ui/placeholder/placeholder-tests.ts b/apps/tests/ui/placeholder/placeholder-tests.ts
index edf5fb380..9d725b361 100644
--- a/apps/tests/ui/placeholder/placeholder-tests.ts
+++ b/apps/tests/ui/placeholder/placeholder-tests.ts
@@ -6,9 +6,9 @@ import utils = require("utils/utils");
 import helper = require("../helper");
 import viewModule = require("ui/core/view");
 
-// >> article-require-module
+// >> article-require-placeholder-module
 import placeholderModule = require("ui/placeholder");
-// << article-require-module
+// << article-require-placeholder-module
 
 function creatingView(args) {
    var nativeView;
diff --git a/apps/tests/ui/placeholder/placeholder.md b/apps/tests/ui/placeholder/placeholder.md
index 1759b7433..7fc45811a 100644
--- a/apps/tests/ui/placeholder/placeholder.md
+++ b/apps/tests/ui/placeholder/placeholder.md
@@ -5,7 +5,7 @@ description: "Examples for using placeholder"
 ---
 # Placeholder
 Using the placeholder requires the Placeholder module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-placeholder-module'/>
 Creating native view for the Placeholder using creatingView event.
 ``` XML
 <Page>
diff --git a/apps/tests/ui/progress/progress-tests.ts b/apps/tests/ui/progress/progress-tests.ts
index 4fc192205..65990d006 100644
--- a/apps/tests/ui/progress/progress-tests.ts
+++ b/apps/tests/ui/progress/progress-tests.ts
@@ -5,9 +5,9 @@ import observable = require("data/observable");
 import color = require("color");
 import platform = require("platform");
 
-// >> article-require-module
+// >> article-require-progress-module
 import progressModule = require("ui/progress");
-// << article-require-module
+// << article-require-progress-module
 
 export function test_default_TNS_values() {
     // >> article-create-progress-view
diff --git a/apps/tests/ui/progress/progress.md b/apps/tests/ui/progress/progress.md
index 1bd09823a..c0331ecb5 100644
--- a/apps/tests/ui/progress/progress.md
+++ b/apps/tests/ui/progress/progress.md
@@ -5,7 +5,7 @@ description: "Examples for using progress"
 ---
 # Progress
 Using the progress view requires the Progress module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-progress-module'/>
 Binding the Progress value property to a view-model property.
 ``` XML
 <Page loaded="pageLoaded">
diff --git a/apps/tests/ui/repeater/repeater-tests.ts b/apps/tests/ui/repeater/repeater-tests.ts
index c192c0f9c..75297c114 100644
--- a/apps/tests/ui/repeater/repeater-tests.ts
+++ b/apps/tests/ui/repeater/repeater-tests.ts
@@ -10,9 +10,9 @@ import pageModule = require("ui/page");
 import gestureModule = require("ui/gestures");
 import { Label } from "ui/label";
 
-// >> article-require-module
+// >> article-require-repeater-module
 import repeaterModule = require("ui/repeater");
-// << article-require-module
+// << article-require-repeater-module
 
 // >> article-require-modules
 import observableArray = require("data/observable-array");
diff --git a/apps/tests/ui/repeater/repeater.md b/apps/tests/ui/repeater/repeater.md
index d2010c374..326a3ae71 100644
--- a/apps/tests/ui/repeater/repeater.md
+++ b/apps/tests/ui/repeater/repeater.md
@@ -5,7 +5,7 @@ description: "Examples for using repeater"
 ---
 # Repeater
 Using a Repeater requires the repeater module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-repeater-module'/>
 Other modules which will be used in the code samples in this article:
 <snippet id='article-require-modules'/>
 ### Binding the Repeater items property to collection in the view-model.
diff --git a/apps/tests/ui/scroll-view/scroll-view-tests.ts b/apps/tests/ui/scroll-view/scroll-view-tests.ts
index d8cea51d3..a23cb00c5 100644
--- a/apps/tests/ui/scroll-view/scroll-view-tests.ts
+++ b/apps/tests/ui/scroll-view/scroll-view-tests.ts
@@ -3,13 +3,13 @@ import app = require("application");
 import button = require("ui/button");
 import enums = require("ui/enums");
 import testModule = require("../../ui-test");
-import layoutHelper = require("../../layouts/layout-helper");
+import layoutHelper = require("../layouts/layout-helper");
 import {Page} from "ui/page";
 import * as frame from "ui/frame";
 
-// >> article-require-module
+// >> article-require-scrollview-module
 import scrollViewModule = require("ui/scroll-view");
-// << article-require-module
+// << article-require-scrollview-module
 
 class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
 
diff --git a/apps/tests/ui/scroll-view/scroll-view.md b/apps/tests/ui/scroll-view/scroll-view.md
index 586940315..bf2132dc8 100644
--- a/apps/tests/ui/scroll-view/scroll-view.md
+++ b/apps/tests/ui/scroll-view/scroll-view.md
@@ -5,7 +5,7 @@ description: "Examples for using scroll-view"
 ---
 # ScrollView
 Using a ScrollView requires the ScrollView module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-scrollview-module'/>
 ### Declaring the ScrollView.
 ``` XML
 <Page>
diff --git a/apps/tests/ui/search-bar/search-bar-tests.ts b/apps/tests/ui/search-bar/search-bar-tests.ts
index 9f459311c..b17a04ab6 100644
--- a/apps/tests/ui/search-bar/search-bar-tests.ts
+++ b/apps/tests/ui/search-bar/search-bar-tests.ts
@@ -4,9 +4,9 @@ import viewModule = require("ui/core/view");
 import searchBarTestsNative = require("./search-bar-tests-native");
 import colorModule = require("color");
 import observable = require("data/observable");
-// >> article-require-module
+// >> article-require-searchbar-module
 import searchBarModule = require("ui/search-bar");
-// << article-require-module
+// << article-require-searchbar-module
 
 // ### Declaring a SearchBar.
 //``` XML
diff --git a/apps/tests/ui/search-bar/search-bar.md b/apps/tests/ui/search-bar/search-bar.md
index a45dac0f7..daa2e65c7 100644
--- a/apps/tests/ui/search-bar/search-bar.md
+++ b/apps/tests/ui/search-bar/search-bar.md
@@ -5,7 +5,7 @@ description: "Examples for using search-bar"
 ---
 # SearchBar
 Using the SearchBar requires the "ui/search-bar" module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-searchbar-module'/>
 ### Creating a SearchBar
 <snippet id='article-creating-searchbar'/>
 ### Searching
diff --git a/apps/tests/ui/segmented-bar/segmented-bar-tests.ts b/apps/tests/ui/segmented-bar/segmented-bar-tests.ts
index 72997ba28..ccd4bd7c8 100644
--- a/apps/tests/ui/segmented-bar/segmented-bar-tests.ts
+++ b/apps/tests/ui/segmented-bar/segmented-bar-tests.ts
@@ -6,9 +6,9 @@ import bindable = require("ui/core/bindable");
 import observable = require("data/observable");
 import color = require("color");
 
-// >> article-require-module
+// >> article-require-segmentedbar-module
 import segmentedBarModule = require("ui/segmented-bar");
-// << article-require-module
+// << article-require-segmentedbar-module
 
 function _createSegmentedBar(): segmentedBarModule.SegmentedBar {
     // >> article-create-segmentedbar
diff --git a/apps/tests/ui/segmented-bar/segmented-bar.md b/apps/tests/ui/segmented-bar/segmented-bar.md
index b98baf47c..a4cb36ce1 100644
--- a/apps/tests/ui/segmented-bar/segmented-bar.md
+++ b/apps/tests/ui/segmented-bar/segmented-bar.md
@@ -5,7 +5,7 @@ description: "Examples for using SegmentedBar"
 ---
 # SegmentedBar
 Using a SegmentedBar requires the "ui/segmented-bar" module.
-<snippet id='article-require-module'/>
+<snippet id='article-require-segmentedbar-module'/>
 ## Creating a SegmentedBar
 <snippet id='article-create-segmentedbar'/>
 ``` XML