diff --git a/Tests/Manual/ArrayController1/AppController.j b/Tests/Manual/ArrayController1/AppController.j
index a62ee2a6a..7e5e21268 100644
--- a/Tests/Manual/ArrayController1/AppController.j
+++ b/Tests/Manual/ArrayController1/AppController.j
@@ -68,7 +68,7 @@ CPLogRegister(CPLogConsole);
 
     //order front window
 
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
     [theWindow orderFront:self];
 }
 /*
diff --git a/Tests/Manual/CPOutlineViewCibTest/AppController.j b/Tests/Manual/CPOutlineViewCibTest/AppController.j
index e9274cf34..955d163dd 100644
--- a/Tests/Manual/CPOutlineViewCibTest/AppController.j
+++ b/Tests/Manual/CPOutlineViewCibTest/AppController.j
@@ -23,7 +23,7 @@
         connection = [CPURLConnection connectionWithRequest:request delegate:self];
 
     rootItem = nil;
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 
 }
 
@@ -38,9 +38,9 @@
     [outlineView reloadData];
 }
 
-// ========================== 
-// ! CPOutlineView Delegate   
-// ========================== 
+// ==========================
+// ! CPOutlineView Delegate
+// ==========================
 
 - (int)outlineView:(CPOutlineView)theOutlineView numberOfChildrenOfItem:(id)theItem
 {
diff --git a/Tests/Manual/CPPopUpButtonBindings/AppController.j b/Tests/Manual/CPPopUpButtonBindings/AppController.j
index f90914de8..b61e31dfc 100644
--- a/Tests/Manual/CPPopUpButtonBindings/AppController.j
+++ b/Tests/Manual/CPPopUpButtonBindings/AppController.j
@@ -29,7 +29,7 @@
     [array addObject:[CPDictionary dictionaryWithObjectsAndKeys:@"Barack",@"name",@"President",@"job",@"barack@whitehouse.gov",@"email", 1, @"tag", @"Resources/Jakabos4.jpg", @"image"]];
 
     [self setPeople:array];
-    
+
 // Setup tags for the second popup
     var items = [tagPopUp itemArray];
     [items enumerateObjectsUsingBlock:function(item, idx)
@@ -37,8 +37,8 @@
         [item setTag:idx];
         [item setTitle:([item title] + "    Tag:" + idx)];
     }];
-    
-    [mainWindow setFullBridge:YES];
+
+    [mainWindow setFullPlatformWindow:YES];
 
 }
 
@@ -53,4 +53,4 @@
     return "transformed " + aValue;
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/Manual/CPRuleEditorCibTest/AppController.j b/Tests/Manual/CPRuleEditorCibTest/AppController.j
index 710489b6a..6e07c1fd7 100644
--- a/Tests/Manual/CPRuleEditorCibTest/AppController.j
+++ b/Tests/Manual/CPRuleEditorCibTest/AppController.j
@@ -27,7 +27,7 @@ var THEME_ATTRIBUTES = [@"slice-top-border-color", @"slice-bottom-border-color",
 - (void)awakeFromCib
 {
     var contentView = [theWindow contentView];
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
     [contentView setBackgroundColor:[CPColor colorWithHexString:@"f3f4f5"]];
 
     var animationClass = (CPBrowserIsEngine(CPWebKitBrowserEngine)) ? [CPViewAnimationTransition class] : [CPViewAnimation class];
diff --git a/Tests/Manual/CPSearchField/AppController.j b/Tests/Manual/CPSearchField/AppController.j
index d34eeac2c..08796d492 100644
--- a/Tests/Manual/CPSearchField/AppController.j
+++ b/Tests/Manual/CPSearchField/AppController.j
@@ -88,7 +88,7 @@ var categories = ["firstName", "lastName"],
 - (void)awakeFromCib
 {
     [theWindow setBackgroundColor:[CPColor colorWithHexString:@"f3f4f5"]];
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 }
 
 - (IBAction)sendsWholeSearchString:(id)sender
diff --git a/Tests/Manual/CPTabViewNib/AppController.j b/Tests/Manual/CPTabViewNib/AppController.j
index 6767a0328..1cda4e413 100644
--- a/Tests/Manual/CPTabViewNib/AppController.j
+++ b/Tests/Manual/CPTabViewNib/AppController.j
@@ -28,13 +28,13 @@
 {
     var item = [[CPTabViewItem alloc] initWithIdentifier:@"item"],
         view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-        
+
     [item setView:view];
     [item setLabel:@"item"];
-    
+
     [nibTabViewEmpty addTabViewItem:item];
-    
-    [theWindow setFullBridge:YES];
+
+    [theWindow setFullPlatformWindow:YES];
 }
 
 - (void)tabView:(CPTabView)aTabView didSelectTabViewItem:(CPTabViewItem)tabViewItem
diff --git a/Tests/Manual/LongBindings/AppController.j b/Tests/Manual/LongBindings/AppController.j
index ecf30f71d..7f90da839 100644
--- a/Tests/Manual/LongBindings/AppController.j
+++ b/Tests/Manual/LongBindings/AppController.j
@@ -23,7 +23,7 @@
 
 - (void)awakeFromCib
 {
-    [[self mainWindow] setFullBridge:YES];
+    [[self mainWindow] setFullPlatformWindow:YES];
 
     orders = [];
     [orders addObject:[Order orderWithCustomer:[Customer customerWithName:@"Klaas Pieter" email:@"klaaspieter@madebysofa.com" job:@"Programmer"]]];
diff --git a/Tests/Manual/PlatformWindows/AppController.j b/Tests/Manual/PlatformWindows/AppController.j
index 5c4ba77ed..3d9a3a476 100644
--- a/Tests/Manual/PlatformWindows/AppController.j
+++ b/Tests/Manual/PlatformWindows/AppController.j
@@ -52,7 +52,7 @@
         [theWindow orderOut:self];
         [theWindow setPlatformWindow:platformWindow];
         [theWindow orderFront:self];
-        [theWindow setFullBridge:YES];
+        [theWindow setFullPlatformWindow:YES];
         var button = [[theWindow contentView] subviews][2];
 
         [button setTarget:self];
diff --git a/Tests/Manual/ScrollviewTheming/AppController.j b/Tests/Manual/ScrollviewTheming/AppController.j
index 1026c7663..925ae5b48 100644
--- a/Tests/Manual/ScrollviewTheming/AppController.j
+++ b/Tests/Manual/ScrollviewTheming/AppController.j
@@ -20,13 +20,13 @@
     var headerView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
     [headerView setBackgroundColor:[CPColor blueColor]];
 
-    [[self window] setFullBridge:YES];
+    [[self window] setFullPlatformWindow:YES];
 }
 
 - (@action)changeBorderType:(id)aSender
 {
     var borderType = CPNoBorder;
-    
+
     switch ([aSender title])
     {
         default:
@@ -37,11 +37,11 @@
         case @"CPLineBorder":
             borderType = CPLineBorder;
             break;
-        
+
         case @"CPBezelBorder":
             borderType = CPBezelBorder;
             break;
-        
+
         case @"CPGrooveBorder":
             borderType = CPGrooveBorder;
             break;
diff --git a/Tests/Manual/SmartFoldersDemo/AppController.j b/Tests/Manual/SmartFoldersDemo/AppController.j
index b9a4da2ab..45dcf399d 100644
--- a/Tests/Manual/SmartFoldersDemo/AppController.j
+++ b/Tests/Manual/SmartFoldersDemo/AppController.j
@@ -104,7 +104,7 @@ var rootItems = [CPArray arrayWithObject:[CPDictionary dictionaryWithObjectsAndK
     [buttonBar setButtons:[CPArray arrayWithObjects:plusButton, minusButton]];
     [superView addSubview:buttonBar];
 
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 }
 // Get the table data
 - (void)connection:(CPURLConnection)connection didReceiveData:(CPString)dataString
diff --git a/Tests/Manual/TableTest/TableBindings/AppController.j b/Tests/Manual/TableTest/TableBindings/AppController.j
index 424c21710..7eae4f723 100644
--- a/Tests/Manual/TableTest/TableBindings/AppController.j
+++ b/Tests/Manual/TableTest/TableBindings/AppController.j
@@ -33,7 +33,7 @@
         request = [CPURLRequest requestWithURL:path],
         connection = [CPURLConnection connectionWithRequest:request delegate:self];
 
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 }
 
 - (void)connection:(CPURLConnection)connection didReceiveData:(CPString)dataString
diff --git a/Tests/Manual/TableTest/TableCibTest/AppController.j b/Tests/Manual/TableTest/TableCibTest/AppController.j
index bb0eebbc4..e99ed7c94 100644
--- a/Tests/Manual/TableTest/TableCibTest/AppController.j
+++ b/Tests/Manual/TableTest/TableCibTest/AppController.j
@@ -28,7 +28,7 @@ CPLogRegister(CPLogConsole);
     // It's a useful hook for setting up current UI values, and other things.
 
     // In this case, we want the window from Cib to become our full browser window
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 }
 
 - (int)numberOfRowsInTableView:(CPTableView)tableView