             context("initialization") {
 
                 beforeEach {
-                    controller = OmnibarViewController()
+                    subject = OmnibarViewController()
                 }
 
                 it("can be instantiated") {
-                    controller = OmnibarViewController()
-                    expect(controller).notTo(beNil())
+                    subject = OmnibarViewController()
+                    expect(subject).notTo(beNil())
                 }
 
                 it("can be instantiated with a post") {
                     let post = Post.stub([
                         "author": User.stub(["username": "colinta"])
                         ])
-                    controller = OmnibarViewController(parentPost: post)
-                    expect(controller).notTo(beNil())
+                    subject = OmnibarViewController(parentPost: post)
+                    expect(subject).notTo(beNil())
                 }
 
                 it("is a BaseElloViewController") {
-                    expect(controller).to(beAKindOf(BaseElloViewController.self))
+                    expect(subject).to(beAKindOf(BaseElloViewController.self))
                 }
 
                 it("is a OmnibarViewController") {
-                    expect(controller).to(beAKindOf(OmnibarViewController.self))
+                    expect(subject).to(beAKindOf(OmnibarViewController.self))
                 }
             }
 
             context("setting up the Screen") {
 
                 beforeEach {
-                    controller = OmnibarViewController()
+                    subject = OmnibarViewController()
                     screen = OmnibarMockScreen()
-                    controller.screen = screen
-                    self.showController(controller)
+                    subject.screen = screen
+                    self.showController(subject)
                 }
 
                 it("assigns the currentUser.avatarURL to the screen") {

                    omnibarData.regions = [attributedString, image]
                    let data = NSKeyedArchiver.archivedDataWithRootObject(omnibarData)

                    controller = OmnibarViewController(parentPost: post)
                    if let fileName = controller.omnibarDataName() {
                        Tmp.write(data, to: fileName)
                    }

                    screen = OmnibarMockScreen()
                    controller.screen = screen
                    controller.beginAppearanceTransition(true, animated: false)
                    controller.endAppearanceTransition()
                }

                afterEach {
                    if let fileName = controller.omnibarDataName() {
                        Tmp.remove(fileName)
                    }
                }

                        "author": User.stub(["username": "colinta"])
                    ])

                    subject = OmnibarViewController(parentPost: post)
                    screen = OmnibarMockScreen()
                    subject.screen = screen
                    subject.beginAppearanceTransition(true, animated: false)
                    subject.endAppearanceTransition()

                    let image = UIImage.imageWithColor(.blackColor())
                    screen.regions = [
