diff --git a/Tablet/TableRowBuilder.swift b/Tablet/TableRowBuilder.swift
index a49121a..7f7b6c1 100644
--- a/Tablet/TableRowBuilder.swift
+++ b/Tablet/TableRowBuilder.swift
@@ -154,7 +154,7 @@ public class TableRowBuilder<DataType, CellType: ConfigurableCell where CellType
     public init(items: [DataType]? = nil) {
         super.init(items: items, id: CellType.reusableIdentifier())
     }
-    
+
     public override func invoke(action action: ActionType, cell: UITableViewCell?, indexPath: NSIndexPath, itemIndex: Int, userInfo: [NSObject: AnyObject]?) -> AnyObject? {
         
         switch action {
diff --git a/Tests/TabletTests.swift b/Tests/TabletTests.swift
index b8d3e07..839fa6f 100644
--- a/Tests/TabletTests.swift
+++ b/Tests/TabletTests.swift
@@ -93,7 +93,7 @@ class TabletTests: XCTestCase {
 
         let source = ["1", "2", "3"]
 
-        let rows = TableRowBuilder<String, UITableViewCell>(items: source)
+        let rows = TableBaseRowBuilder<String, UITableViewCell>(items: source)
             .action(.configure) { data -> Void in
 
                 XCTAssertNotNil(data.cell, "Action should have a cell")
@@ -121,7 +121,7 @@ class TabletTests: XCTestCase {
         let testData = TestData(title: "title")
         
         testController.view.hidden = false
-        testController.tableDirector += TableConfigurableRowBuilder<TestData, TestTableViewCell>(item: testData)
+        testController.tableDirector += TableRowBuilder<TestData, TestTableViewCell>(item: testData)
         testController.tableView.reloadData()
 
         let cell = testController.tableView.cellForRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0)) as? TestTableViewCell
@@ -132,7 +132,7 @@ class TabletTests: XCTestCase {
 
     func testSectionBuilderCreatesSectionWithHeaderAndFooterTitles() {
 
-        let row = TableConfigurableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
+        let row = TableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
 
         let sectionHeaderTitle = "Header Title"
         let sectionFooterTitle = "Footer Title"
@@ -152,7 +152,7 @@ class TabletTests: XCTestCase {
     
     func testSectionBuilderCreatesSectionWithHeaderAndFooterViews() {
 
-        let row = TableConfigurableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
+        let row = TableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
         
         let sectionHeaderView = UIView()
         let sectionFooterView = UIView()
@@ -175,7 +175,7 @@ class TabletTests: XCTestCase {
 
         let expectation = expectationWithDescription("cell action")
 
-        let row = TableConfigurableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
+        let row = TableRowBuilder<TestData, TestTableViewCell>(items: [TestData(title: "title")])
             .action(TestTableViewCellOptions.CellAction) { data -> Void in
 
                 XCTAssertNotNil(data.cell, "Action data should have a cell")